From nobody Tue Jun 27 17:01:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qr9wv732tz4kkDm; Tue, 27 Jun 2023 17:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qr9wv6Zdvz3F0g; Tue, 27 Jun 2023 17:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687885311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yjg3jvbVF8Kt3F9wXdd9tCCuP2/kcTvLrWQRikf6+EE=; b=gOqhJYA+dnHFicQE4TgT4NjhL7iJ5UF4oR2qENeoT68AZT8x7cXcn9V+iKkKE04JGYzNko BDw3yId0pS9Zf60oJrSKNvSHiF4WNnJtlAe6C/GpdgJ06/HIKF/ScYnSGyCyLqFeqZn7mY PQvYjAR7OoM34Zt1Yjrn4KUUGL9wWtNSX7w1jNRB6gq/uLUvzSz2mEEpM4SXm72qdMMkqr OUtBVrASy+UCbTxihj5gm+3/FhfiJ9VLTEJ1UTtDwwlooerTK2LrFufWwRmd1G6QjLT3gi 16SYxkbsoK6NZ4UgflLKNHgQgE2auiFDVpLWFbqdAEwDwBZk/6goE418BVkl1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687885311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yjg3jvbVF8Kt3F9wXdd9tCCuP2/kcTvLrWQRikf6+EE=; b=Liy8AOQ0JE4AaDIkjd7VS6qDXCZe65PUbs/g83yzwd02AyvhR77xClybQWije/z2H3fWDw YEuuOLrmsLmuEawK4R9ZQFcPqtcdOOAyBGqH3GZIrCAowKRUAw8LDsKo2P8S/Y2S2QRx1a 404Tfx2pMB3uEXsQGjKkUTigZBIXK4FBzV+zx+KAp7wY4HRLXpy09XDw1mRfHwc5WSc8B8 zWC/67aEq3YZ7432Xv808YrRVhqBfNBiNg4w6rNdVRw55X7VZMp73lxNKw3H+ZLgiIPO94 Zun5Z+z7owKpALZ97Yk5ShMTSVus0ysdUYRCXGrfSpMJXavio2mvi+r0uZIizw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687885311; a=rsa-sha256; cv=none; b=JweSmQDsOfyRKIAHI39/0Dr2PwYipByfx73TYVKC7rSWg2TG/YkkAYoZPxtZEiun4vz0yS gb9NwjEn4C6IsooN5xFvV/7I6DOQRRdu9Wk0UiLqtZf6o47qBx07WD31YX4nxdgx80g1Tx Q7LF/A8quheiqhZOrcPglJhlmTLO+8kj5rOlZqghzTjV5OFyM5cwT0GhFjtfsMXAXfD27S xxTdvosjzfW8wS+qx/smgwW4DVgsJcwOXVZ94o9jGW1ftsDjKmi9G7j2IYPpuIc2NTpdA5 cT+agp7ac3JlPFIXj1y4sUZAymy18OJ4m96YRnv4hUFbbf0KqwHwEsrCp+ZnWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qr9wv5dKYz10kl; Tue, 27 Jun 2023 17:01:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35RH1pPV085969; Tue, 27 Jun 2023 17:01:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35RH1pgF085968; Tue, 27 Jun 2023 17:01:51 GMT (envelope-from git) Date: Tue, 27 Jun 2023 17:01:51 GMT Message-Id: <202306271701.35RH1pgF085968@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 9cfed089ac48 - main - radix_trie: clean up overlong lines List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9cfed089ac4820b95457818f1aa1bd199535ddca Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=9cfed089ac4820b95457818f1aa1bd199535ddca commit 9cfed089ac4820b95457818f1aa1bd199535ddca Author: Doug Moore AuthorDate: 2023-06-27 16:59:12 +0000 Commit: Doug Moore CommitDate: 2023-06-27 17:01:33 +0000 radix_trie: clean up overlong lines This is purely a cosmetic change. vm_radix.c has lines that reach past column 80 and this change cleans that up. The associated changes to subr_pctrie.c are just to keep mirroring vm_radix.c. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D40764 --- sys/kern/subr_pctrie.c | 13 +++++++++++-- sys/vm/vm_radix.c | 31 ++++++++++++++++++++----------- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index d9269bfb3885..b5dee2163a40 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -228,6 +228,15 @@ pctrie_isleaf(struct pctrie_node *node) return (((uintptr_t)node & PCTRIE_ISLEAF) != 0); } +/* + * Returns val with leaf bit set. + */ +static __inline void * +pctrie_toleaf(uint64_t *val) +{ + return ((void *)((uintptr_t)val | PCTRIE_ISLEAF)); +} + /* * Returns the associated val extracted from node. */ @@ -249,7 +258,7 @@ pctrie_addval(struct pctrie_node *node, uint64_t index, uint16_t clev, slot = pctrie_slot(index, clev); pctrie_node_store(&node->pn_child[slot], - (void *)((uintptr_t)val | PCTRIE_ISLEAF), access); + pctrie_toleaf(val), access); } /* @@ -356,7 +365,7 @@ pctrie_insert(struct pctrie *ptree, uint64_t *val, pctrie_alloc_t allocfn) */ node = pctrie_root_load(ptree, NULL, PCTRIE_LOCKED); if (node == NULL) { - ptree->pt_root = (uintptr_t)val | PCTRIE_ISLEAF; + ptree->pt_root = (uintptr_t)pctrie_toleaf(val); return (0); } parentp = (smr_pctnode_t *)&ptree->pt_root; diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c index 9c8ba5287d4e..a34de9e6ff92 100644 --- a/sys/vm/vm_radix.c +++ b/sys/vm/vm_radix.c @@ -254,6 +254,15 @@ vm_radix_isleaf(struct vm_radix_node *rnode) return (((uintptr_t)rnode & VM_RADIX_ISLEAF) != 0); } +/* + * Returns page cast to radix node with leaf bit set. + */ +static __inline struct vm_radix_node * +vm_radix_toleaf(vm_page_t page) +{ + return ((struct vm_radix_node *)((uintptr_t)page | VM_RADIX_ISLEAF)); +} + /* * Returns the associated page extracted from rnode. */ @@ -275,7 +284,7 @@ vm_radix_addpage(struct vm_radix_node *rnode, vm_pindex_t index, uint16_t clev, slot = vm_radix_slot(index, clev); vm_radix_node_store(&rnode->rn_child[slot], - (struct vm_radix_node *)((uintptr_t)page | VM_RADIX_ISLEAF), access); + vm_radix_toleaf(page), access); } /* @@ -325,7 +334,8 @@ vm_radix_reclaim_allnodes_int(struct vm_radix_node *rnode) KASSERT(rnode->rn_count <= VM_RADIX_COUNT, ("vm_radix_reclaim_allnodes_int: bad count in rnode %p", rnode)); for (slot = 0; rnode->rn_count != 0; slot++) { - child = vm_radix_node_load(&rnode->rn_child[slot], UNSERIALIZED); + child = vm_radix_node_load(&rnode->rn_child[slot], + UNSERIALIZED); if (child == NULL) continue; if (!vm_radix_isleaf(child)) @@ -395,7 +405,7 @@ vm_radix_insert(struct vm_radix *rtree, vm_page_t page) */ rnode = vm_radix_root_load(rtree, LOCKED); if (rnode == NULL) { - rtree->rt_root = (uintptr_t)page | VM_RADIX_ISLEAF; + rtree->rt_root = (uintptr_t)vm_radix_toleaf(page); return (0); } parentp = (smrnode_t *)&rtree->rt_root; @@ -764,7 +774,8 @@ vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index) m = vm_radix_topage(tmp); if (m->pindex != index) return (NULL); - vm_radix_node_store(&rnode->rn_child[slot], NULL, LOCKED); + vm_radix_node_store( + &rnode->rn_child[slot], NULL, LOCKED); rnode->rn_count--; if (rnode->rn_count > 1) return (m); @@ -838,7 +849,7 @@ vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage) if (m->pindex != index) panic("%s: original replacing root key not found", __func__); - rtree->rt_root = (uintptr_t)newpage | VM_RADIX_ISLEAF; + rtree->rt_root = (uintptr_t)vm_radix_toleaf(newpage); return (m); } for (;;) { @@ -846,13 +857,11 @@ vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage) tmp = vm_radix_node_load(&rnode->rn_child[slot], LOCKED); if (vm_radix_isleaf(tmp)) { m = vm_radix_topage(tmp); - if (m->pindex == index) { - vm_radix_node_store(&rnode->rn_child[slot], - (struct vm_radix_node *)((uintptr_t)newpage | - VM_RADIX_ISLEAF), LOCKED); - return (m); - } else + if (m->pindex != index) break; + vm_radix_node_store(&rnode->rn_child[slot], + vm_radix_toleaf(newpage), LOCKED); + return (m); } else if (tmp == NULL || vm_radix_keybarr(tmp, index)) break; rnode = tmp;