From nobody Thu Oct 26 19:07:46 2023 X-Original-To: dev-commits-src-branches@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 4SGb0M0wmqz4y9Mm; Thu, 26 Oct 2023 19:07:47 +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 4SGb0M09Dbz3LfT; Thu, 26 Oct 2023 19:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698347267; 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=9VD+gSndxr00YMoqBkCqMpXEQGcjRPTWV7mr8xQkggI=; b=GKRf3arhRqsaB2ssosKj30lg5NJLg+3u6oaj42hJrajYxafW94kCxdiGmvQULZGJh+J7Ru V5moOmp00G1Wot1AL+gxDi4Q1FVQKArXmiZCggHjC8aeXU/yUb7XNKX+9gwFgzn23A+96x hOHh1kF688DNLmSLm0+M/GhbDzt8qb6+7Qlj0w79RSceqkmy66W2z7ciRRTpKCwuWRiRIr ZonGAo3HVqSTbBNjj/d1yRBWKydMUn2l2YtkrIdvlgTEzsAPI3zpFXd3kkRovcssVnOyWu CPHke3jL6TrsO9ZiEVwhwpfPnUXoerzZKC/PgdArZOfkEl8a32Bnw//KEVxnhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698347267; 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=9VD+gSndxr00YMoqBkCqMpXEQGcjRPTWV7mr8xQkggI=; b=Jlp20l28i+/DB0COYplvvQqhPnYIn4IUwGRB/gXfUbcwkU/D0xaX+1OpP1H3MpcMwahHGb IIY7g40iLyhm7YgvVEAWy0b26uGf672elQZV8c2DnbzjdpDVkxVNWzovsebWh57/XQC66y 9Rc/KSLn5O29iGceTE/yrIwgeE5StNepbtZ3Bf1GnlL4UYHNudvWUXlyyOUp4as4NjXJbc K3MUdmPtnZY2U8XpYoaookr/Kfj1ZzqDbGQvm0rG8a9+VdRyGP2yC2qLfcncrU2DIoBjup 2SICr896ofKHiqhVj8I+d9C43SLJhqEtg+C0J/oghH8EdLfivC21caAnhURdpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698347267; a=rsa-sha256; cv=none; b=gx74Nr9v0x3nk5DsQEjIK+R5Dk6yix4B94ER9M+wU+RTPJFE5iXRfRoocZ1zWNNPQmVFVb iZsHr1TrCkmwJdL6RA6UE+iWdfqNeDf/KFX27lOsIzCa4nWr9Vtxeky/An+DnrdJ1Ulo/Z CGV3dBBpqXK5KDdvVDU1XAaSvERN8nQYazA34dBXj/0IvsKYCiFw54bpfijN/pxlnxoMV4 wJgyhZhOf/Lj3bTypacuKiWPyT/OAOK0kY+NvH3dBtOBuXldMo+kIxJDmTAmexdfXBlXh4 LP1EHrNe34ATyEFWBA9l/MJYDaQQ3EN66UbXaDiCL5hGV+gd1pZ7Dl30eCqFQA== 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 4SGb0L6LjQzjGP; Thu, 26 Oct 2023 19:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39QJ7kNg041026; Thu, 26 Oct 2023 19:07:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39QJ7k5t041023; Thu, 26 Oct 2023 19:07:46 GMT (envelope-from git) Date: Thu, 26 Oct 2023 19:07:46 GMT Message-Id: <202310261907.39QJ7k5t041023@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 27272d3d97c8 - stable/13 - add pmap_active_cpus() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 27272d3d97c8e363e3f454f1de3b1be307c8a033 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=27272d3d97c8e363e3f454f1de3b1be307c8a033 commit 27272d3d97c8e363e3f454f1de3b1be307c8a033 Author: Konstantin Belousov AuthorDate: 2021-10-07 22:25:54 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-26 04:07:29 +0000 add pmap_active_cpus() (cherry picked from commit 8882b7852acf2588d87ccb6d4c6bf7694511fc56) --- sys/amd64/amd64/pmap.c | 6 ++++++ sys/arm/arm/pmap-v6.c | 6 ++++++ sys/arm64/include/pmap.h | 2 ++ sys/i386/i386/pmap_base.c | 6 ++++++ sys/powerpc/powerpc/pmap_dispatch.c | 6 ++++++ sys/riscv/riscv/pmap.c | 6 ++++++ sys/vm/pmap.h | 2 ++ sys/vm/vm_kern.c | 26 ++++++++++++++++++++++++++ 8 files changed, 60 insertions(+) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 4fba61269352..8f1541bc8637 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -10000,6 +10000,12 @@ pmap_activate_boot(pmap_t pmap) PCPU_SET(ucr3, PMAP_NO_CR3); } +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + *res = pmap->pm_active; +} + void pmap_sync_icache(pmap_t pm, vm_offset_t va, vm_size_t sz) { diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index f00589a75c6d..0446a67bdbcf 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -6212,6 +6212,12 @@ pmap_activate(struct thread *td) critical_exit(); } +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + *res = pmap->pm_active; +} + /* * Perform the pmap work for mincore(2). If the page is not both referenced and * modified by this pmap, returns its physical address so that the caller can diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index 7305b8d32e87..a8e1041163be 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -149,6 +149,8 @@ extern struct pmap kernel_pmap_store; (uint64_t)(asid) << TTBR_ASID_SHIFT; \ }) +#define PMAP_WANT_ACTIVE_CPUS_NAIVE + extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; diff --git a/sys/i386/i386/pmap_base.c b/sys/i386/i386/pmap_base.c index cc840865218f..8e2403682a78 100644 --- a/sys/i386/i386/pmap_base.c +++ b/sys/i386/i386/pmap_base.c @@ -944,6 +944,12 @@ pmap_kremove(vm_offset_t va) pmap_methods_ptr->pm_kremove(va); } +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + *res = pmap->pm_active; +} + extern struct pmap_methods pmap_pae_methods, pmap_nopae_methods; int pae_mode; SYSCTL_INT(_vm_pmap, OID_AUTO, pae_mode, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, diff --git a/sys/powerpc/powerpc/pmap_dispatch.c b/sys/powerpc/powerpc/pmap_dispatch.c index 0b899a8e6020..2e7539cf09cb 100644 --- a/sys/powerpc/powerpc/pmap_dispatch.c +++ b/sys/powerpc/powerpc/pmap_dispatch.c @@ -253,3 +253,9 @@ pmap_is_valid_memattr(pmap_t pmap __unused, vm_memattr_t mode) return (FALSE); } } + +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + *res = pmap->pm_active; +} diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 665d257fe6c5..d1996dabbc2c 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -4693,6 +4693,12 @@ pmap_activate_boot(pmap_t pmap) PCPU_SET(curpmap, pmap); } +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + *res = pmap->pm_active; +} + void pmap_sync_icache(pmap_t pmap, vm_offset_t va, vm_size_t sz) { diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h index 7272882132e0..65e909df9b8f 100644 --- a/sys/vm/pmap.h +++ b/sys/vm/pmap.h @@ -90,6 +90,7 @@ typedef struct pmap_statistics *pmap_statistics_t; #include #ifdef _KERNEL +#include struct thread; /* @@ -118,6 +119,7 @@ extern vm_offset_t kernel_vm_end; #define PMAP_TS_REFERENCED_MAX 5 void pmap_activate(struct thread *td); +void pmap_active_cpus(pmap_t pmap, cpuset_t *res); void pmap_advise(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, int advice); void pmap_align_superpage(vm_object_t, vm_ooffset_t, vm_offset_t *, diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index 4c50d32a1e33..2d5d20d931d3 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -77,6 +77,7 @@ #include #include #include +#include #include #include #include @@ -883,6 +884,31 @@ kmem_bootstrap_free(vm_offset_t start, vm_size_t size) #endif } +#ifdef PMAP_WANT_ACTIVE_CPUS_NAIVE +void +pmap_active_cpus(pmap_t pmap, cpuset_t *res) +{ + struct thread *td; + struct proc *p; + struct vmspace *vm; + int c; + + CPU_ZERO(res); + CPU_FOREACH(c) { + td = cpuid_to_pcpu[c]->pc_curthread; + p = td->td_proc; + if (p == NULL) + continue; + vm = vmspace_acquire_ref(p); + if (vm == NULL) + continue; + if (pmap == vmspace_pmap(vm)) + CPU_SET(c, res); + vmspace_free(vm); + } +} +#endif + /* * Allow userspace to directly trigger the VM drain routine for testing * purposes.