From nobody Fri Jun 13 18:24:16 2025 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 4bJnq43BCTz50vPY; Fri, 13 Jun 2025 18:24:16 +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 4bJnq424Jnz3wMw; Fri, 13 Jun 2025 18:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749839056; 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=2m8MZZ7e4KXDfJAancU4X31B71Aqbz/5ce+icMkLdpQ=; b=vLAVKHaD9QIR5ZYFk0N3hWOdXdO2AuLW1oFBYtI0RdCTw/qeca5xsmdGKBpY/Q5+3xcKzC ukW20wkGF26epcXkyQFLlk4bMfXaDgINq2tv8x5PSgH1vk7wEgRmGxnFxHJaDKh/Y6b1Gd //FC1P8lNxAl7eFlqFAywRTYmsmGf/TleksGjDe7QdwXOgfdPUw+AlHFiX3cuCGTPyVm3N IycFo8551LjxSJHYnxlOvxHFRg5Vs6u5Ic/qVSsd8W42/sLFLGJHv8XkyFp7DPvp+2CIvx CeRALume4YQVvswc1xGeqcsFcN1rn/0eKrwXM6F9Exh2MVke8AgU8ybEjg2CAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749839056; 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=2m8MZZ7e4KXDfJAancU4X31B71Aqbz/5ce+icMkLdpQ=; b=cZerHqU14GpUBxwNhDuo24vFn/PTJPaE7yQVRIUfulfHfv5Ln9kqy/DX7hcfSJb8/E7IvV xEMarHfFXMrkwgmyx9Os1AT0ZqtwfLwpSth5nCruF8BE1aXSR/M6WFDqGR1qy6RNrRAZR7 Xu4KuB4dwxhwI1rqX/PRDiaf0ByPjvzYrFig5m9A81Y4fV20rwv+DVUsHFaV6Me6bd6crf qLktV2+KtKJXhTprFRk7BP+/Jh9YgDsdzGWtpBOZLm6oPmpBEqQ08wKeGXKcwy9+5OFMjN uHbj7FLIYEfmRbc98/Wy5suv1Qp0uRNjItDLnGzPWXk8psdnvN3hYo6Y60w+xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749839056; a=rsa-sha256; cv=none; b=TI9pZZMo6XCpWbJskTSrEtQoKx26KYQbkwb6cZPWQzCGK43KArdV8slR8U+BL4aAqkeAaS PDKbhJezkD2V+nW+GE3999s5NwcVB3QiUNBF/K6sRsd/5/R+q2X+XNZiKAAEL9tRSwLK3a FEoxxP/2wWe5FwdWVpGSTt6yvJ/PsWoN7Y4q8eEJ79YJTYZmJNnXxwcewwy8GSTAzVSywh 09Er4ibC4pnf8+zUuFDVIFR9l7fq/+rUAFlg0+EZRHHpVqn7xMoM1i4h31inOEsmkch5w3 Ytwa8Nl7RxRrXOK1/cxS6K3cL2WDlYYN9+mxV8CN9ZLAj+GLKbWM2UEqFcvyJQ== 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 4bJnq41N0Mz17qJ; Fri, 13 Jun 2025 18:24:16 +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 55DIOG75004148; Fri, 13 Jun 2025 18:24:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55DIOGon004145; Fri, 13 Jun 2025 18:24:16 GMT (envelope-from git) Date: Fri, 13 Jun 2025 18:24:16 GMT Message-Id: <202506131824.55DIOGon004145@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: 330b17e1cf5c - main - vm: remove pa_index from the machine-independent layer 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: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 330b17e1cf5c2e259f99ad6ac21eda6bd92a0836 Auto-Submitted: auto-generated The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=330b17e1cf5c2e259f99ad6ac21eda6bd92a0836 commit 330b17e1cf5c2e259f99ad6ac21eda6bd92a0836 Author: Alan Cox AuthorDate: 2025-06-12 20:12:36 +0000 Commit: Alan Cox CommitDate: 2025-06-13 18:23:28 +0000 vm: remove pa_index from the machine-independent layer After the demise of vm_page_lock(), the only remaining uses of pa_index() are in various pmap implementations. In many cases, e.g., amd64, the pmap implementations already provided their own definitions, often identical to the machine-independent one. For those that didn't provide one, this change adds it. Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D50823 --- sys/amd64/amd64/pmap.c | 1 - sys/powerpc/aim/mmu_oea64.c | 5 ++++- sys/riscv/riscv/pmap.c | 3 ++- sys/vm/vm_page.h | 8 -------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 4ad1335329da..2962f2823596 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -342,7 +342,6 @@ safe_to_clear_referenced(pmap_t pmap, pt_entry_t pte) #define PV_STAT(x) do { } while (0) #endif -#undef pa_index #ifdef NUMA #define pa_index(pa) ({ \ KASSERT((pa) <= vm_phys_segs[vm_phys_nsegs - 1].end, \ diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c index 40dd232f47c1..79cea408bb5f 100644 --- a/sys/powerpc/aim/mmu_oea64.c +++ b/sys/powerpc/aim/mmu_oea64.c @@ -125,6 +125,9 @@ uintptr_t moea64_get_unique_vsid(void); #define PV_LOCK_COUNT MAXCPU static struct mtx_padalign pv_lock[PV_LOCK_COUNT]; +#define PV_LOCK_SHIFT 21 +#define pa_index(pa) ((pa) >> PV_LOCK_SHIFT) + /* * Cheap NUMA-izing of the pv locks, to reduce contention across domains. * NUMA domains on POWER9 appear to be indexed as sparse memory spaces, with the @@ -145,7 +148,7 @@ static struct mtx_padalign pv_lock[PV_LOCK_COUNT]; /* Superpage PV lock */ -#define PV_LOCK_SIZE (1<> L1_SHIFT)) #define pmap_l2_pindex(v) ((v) >> L2_SHIFT) +#define pa_index(pa) ((pa) >> L2_SHIFT) #define pa_to_pvh(pa) (&pv_table[pa_index(pa)]) #define NPV_LIST_LOCKS MAXCPU #define PHYS_TO_PV_LIST_LOCK(pa) \ - (&pv_list_locks[pmap_l2_pindex(pa) % NPV_LIST_LOCKS]) + (&pv_list_locks[pa_index(pa) % NPV_LIST_LOCKS]) #define CHANGE_PV_LIST_LOCK_TO_PHYS(lockp, pa) do { \ struct rwlock **_lockp = (lockp); \ diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index 062cf00b5b33..ba3f88864661 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -336,14 +336,6 @@ SLIST_HEAD(spglist, vm_page); extern vm_page_t bogus_page; #endif /* _KERNEL */ -#if defined(__arm__) -#define PDRSHIFT PDR_SHIFT -#elif !defined(PDRSHIFT) -#define PDRSHIFT 21 -#endif - -#define pa_index(pa) ((pa) >> PDRSHIFT) - /* * The vm_page's aflags are updated using atomic operations. To set or clear * these flags, the functions vm_page_aflag_set() and vm_page_aflag_clear()