From nobody Tue Jul 09 18:48:23 2024 X-Original-To: dev-commits-src-all@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 4WJVPN2JQCz5Qt5K; Tue, 09 Jul 2024 18:48:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WJVPN0vXlz4m1v; Tue, 9 Jul 2024 18:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720550904; 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=W83/udct03V7yPMczfOGVM4PqQ9UbNopr4vc7hGn94Q=; b=Ue2+9gmJDFZ+0ar27+AWySD5NpTmY2pMsCrKqeaDHT1CAHNX/p2mtqO2yZFAZmLBwLg2XF TGOmEfblgvS+6/jJqFLBwOip8SMXFsUBiZZm4o0owzImFKZz4tazHJNGQi9WciJU+bm5Qi Ocr3/8XT+BVWtScIHK37tnutXpV77zA7mnIalZUjENe14R6tgOJgdHjXHf7Ms4wfk2h6z8 41TQkWEnqmJZuqSvDc6KVCN8qnKUp+UUZpQWl2g1npd2qfTQu4R1UFa9ikg/OIbWWJdPT2 1zw3HIJBinbYBYzge3Hr0Ou2sCQ/B+6kbrVP+8O5IyEUZMHXyqfhi2CW3Ob13A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720550904; a=rsa-sha256; cv=none; b=I6dpAMgZP6sKPfKdxQv0XrQT1rr/8BfFxPgMWq+qIi14EyUeQm70CuqV3gsC23F4SF2pS7 D9vtHgBG2HRvs7iCv2K6bnNIfRYmhb8xX9yYHc0iXkQVZD6FA7SvOht76as74lEqeSJdFD DaLJJSuHQQK1PktwneF2eqOrO0mncyIZShFyTYm5rT6ZGjrUf1yQf1O3F1OFVJx0onhX3L v5eav7132M1MQyj16YdKmYCBl1mpJzTE5NXTMwMIPVLIKGRAsUZg9o0S+DbMPZPT8cxjKq OEGZErmfBw2P+DdPos2O+bDdcccJWxiYMH4F8nrRASG8GmKQnOctAO5OBegtNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720550904; 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=W83/udct03V7yPMczfOGVM4PqQ9UbNopr4vc7hGn94Q=; b=l6byXCYJbnRhzGDPdWdM+c6y9BDVqIyIVqsByW1Lb+JZ3gQtAZugNlqt/W36iqBxpqQFXF F2R7FhIW/ZmnXUdpg+lzdbMt+wtWm/baEy2yUMBaLY2YAEmpRcrdHGwySqDR1G2dXWjFmR aOfWup7MPe1wFjV5UH25Z0017aW+ZsMVqPdvxAHCDh0Un57s4Cbs/DfQNNYTA/rzV+Wnyz NwJAC07ghAQ30qpNl4fd2bBmngYjjx91v78uLlrIxL6BrJVR6ggZ/FjY4DINFj0FZmAO0Q +txwmAlzFFtALY61uUpI/9L4pJKcrFznhoSsQJNd4ORhhkyv+hIY9WeXFfXfAw== 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 4WJVPN0VzbzmFF; Tue, 9 Jul 2024 18:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 469ImNEe088316; Tue, 9 Jul 2024 18:48:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 469ImNHX088313; Tue, 9 Jul 2024 18:48:23 GMT (envelope-from git) Date: Tue, 9 Jul 2024 18:48:23 GMT Message-Id: <202407091848.469ImNHX088313@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: e7f849e25bbc - main - amd64: use pc_is_full() helper function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7f849e25bbca9a74c9d3a5b633f9cd01ba95a55 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=e7f849e25bbca9a74c9d3a5b633f9cd01ba95a55 commit e7f849e25bbca9a74c9d3a5b633f9cd01ba95a55 Author: Mitchell Horne AuthorDate: 2024-07-09 18:43:33 +0000 Commit: Mitchell Horne CommitDate: 2024-07-09 18:46:16 +0000 amd64: use pc_is_full() helper function This seems to have been missed in a few places. No functional change intended. Reviewed by: kib MFC after: 1 week Fixes: 4d90a5afc51b ("sys: Consolidate common implementation details...") Differential Revision: https://reviews.freebsd.org/D45920 --- sys/amd64/amd64/pmap.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 2bcf671be243..9f85e903cd74 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -5595,8 +5595,7 @@ retry: pv = &pc->pc_pventry[field * 64 + bit]; pc->pc_map[field] &= ~(1ul << bit); /* If this was the last item, move it to tail */ - if (pc->pc_map[0] == 0 && pc->pc_map[1] == 0 && - pc->pc_map[2] == 0) { + if (pc_is_full(pc)) { TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); TAILQ_INSERT_TAIL(&pmap->pm_pvchunk, pc, pc_list); @@ -5807,8 +5806,7 @@ pmap_pv_demote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa, va_last = va + NBPDR - PAGE_SIZE; for (;;) { pc = TAILQ_FIRST(&pmap->pm_pvchunk); - KASSERT(pc->pc_map[0] != 0 || pc->pc_map[1] != 0 || - pc->pc_map[2] != 0, ("pmap_pv_demote_pde: missing spare")); + KASSERT(!pc_is_full(pc), ("pmap_pv_demote_pde: missing spare")); for (field = 0; field < _NPCM; field++) { while (pc->pc_map[field]) { bit = bsfq(pc->pc_map[field]); @@ -5829,7 +5827,7 @@ pmap_pv_demote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa, TAILQ_INSERT_TAIL(&pmap->pm_pvchunk, pc, pc_list); } out: - if (pc->pc_map[0] == 0 && pc->pc_map[1] == 0 && pc->pc_map[2] == 0) { + if (pc_is_full(pc)) { TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); TAILQ_INSERT_TAIL(&pmap->pm_pvchunk, pc, pc_list); }