From nobody Thu Jun 06 05:15:13 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 4VvswK5PQ0z5N8sp; Thu, 06 Jun 2024 05:15:13 +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 4VvswK3FpTz4sTk; Thu, 6 Jun 2024 05:15:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717650913; 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=3qn057cKIdKszlee69Ul854DelqENKPEcGjWfkrOQE8=; b=Zknyi9uRYySM+dwyEfVaZJS1sl3a/ywh3slnVXwO/NRK4376QLC/Ci16RWgFjJot5RHIUv 8/3fSZt1K1lX2uy/r8sQ4L89Fda6y65GA8FkVQ8oVNJ+O/3TPYjihL6/4EJxGgZR4fYI4o 09hi+KoVj7JWDpN+18QHT0lbfCRF+YSypfY1UAI8RrxAkYXoNtgC51vqvq3x/+J56fVWhp SSolo4YE52FTZzqmAJ70ZCs/OJT4GxjkSw4DNoDinoKmBoviwTpJHXkQc55eX5+3r7pIdz ZvaKf2JAY4TnteurQh0jUflxtSFjD/rlmFZ6R5xk20FYQJPkY7tg6Fb7cPdsVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717650913; a=rsa-sha256; cv=none; b=shIxo4wEa9/KbY60taLfmtsVM311vmhbBNxSO2AtMIaS/LaSWH8VpWKTvKfbZKSL6q69Fg OVZomXFCMKvwS2ixwuzFBIGZFx6zpYXG6vkHIbsl/UHN/l85+O/LZQC6kNLqPg+OclCEOY 3ZRDgYLVlKj00pxvVxnGfif7CCPTOaoZ5gFC4wqp+UeUrafrwcAr5oep26wqGvWgAOmgzx VQ8SxdTTA7aljSd0gk002IvxLIlZE/mmhfBrVQy16UYiLUcFn61xiD4GLp5hoYB2MK62yj nXAI1CWPb30hO7dJ1MEEMH3/0YHDcQRpxEK4OVWH99QaI4J4S8If8t3ooBBXgg== 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=1717650913; 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=3qn057cKIdKszlee69Ul854DelqENKPEcGjWfkrOQE8=; b=yNl0Gw/gTbimVgkfSLTR41+FRoenzREkLJuKcnqIjGm0b/YotfidWV79OBukD3CgVDUtnc V1RAOZWmGq8XqTcPzs7q8CiGZgSmTu4ADFp0E9tK1D0yvNBvXRzzLMlPy0tSEmmPP3Tdt/ 5LbIm25iTNYoHyEEB2FVI03L2M8hJ5ljAaab3mTtZs5uEZwnhRK5s+pAftk7d8THJ5mXtG I9Ichk4G31bTydFLzbrhTpL1t2IU7Eyby5kPG0ol+vCztMhsKmyiDLitiX83F2qtysaXhM YVUKFMODBPMe+i9/SRiDQumOzFcXUZ6Gul8Pc/vwY4NCaLktPPRS//IPFdNirQ== 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 4VvswK2nVczY3s; Thu, 6 Jun 2024 05:15:13 +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 4565FD2w042123; Thu, 6 Jun 2024 05:15:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4565FDRl042120; Thu, 6 Jun 2024 05:15:13 GMT (envelope-from git) Date: Thu, 6 Jun 2024 05:15:13 GMT Message-Id: <202406060515.4565FDRl042120@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9c5d7e4a0c02 - main - pmap: move the smp_targeted_tlb_shutdown pointer stuff to amd64 pmap.h 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c5d7e4a0c02bc45b61f565586da2abcc65d70fa Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9c5d7e4a0c02bc45b61f565586da2abcc65d70fa commit 9c5d7e4a0c02bc45b61f565586da2abcc65d70fa Author: Konstantin Belousov AuthorDate: 2024-06-06 05:03:14 +0000 Commit: Konstantin Belousov CommitDate: 2024-06-06 05:15:08 +0000 pmap: move the smp_targeted_tlb_shutdown pointer stuff to amd64 pmap.h Fixes: bec000c9c1ef409989685bb03ff0532907befb4aESC Sponsored by: The FreeBSD Foundation --- sys/amd64/include/pmap.h | 27 +++++++++++++++++++++++++++ sys/vm/pmap.h | 27 --------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h index 591244e19b7c..273693e1f782 100644 --- a/sys/amd64/include/pmap.h +++ b/sys/amd64/include/pmap.h @@ -542,6 +542,33 @@ pmap_get_pcid(pmap_t pmap) } #endif /* sys/pcpu.h */ +/* + * Invalidation request. PCPU pc_smp_tlb_op uses u_int instead of the + * enum to avoid both namespace and ABI issues (with enums). + */ +enum invl_op_codes { + INVL_OP_TLB = 1, + INVL_OP_TLB_INVPCID = 2, + INVL_OP_TLB_INVPCID_PTI = 3, + INVL_OP_TLB_PCID = 4, + INVL_OP_PGRNG = 5, + INVL_OP_PGRNG_INVPCID = 6, + INVL_OP_PGRNG_PCID = 7, + INVL_OP_PG = 8, + INVL_OP_PG_INVPCID = 9, + INVL_OP_PG_PCID = 10, + INVL_OP_CACHE = 11, +}; + +typedef void (*smp_invl_local_cb_t)(struct pmap *, vm_offset_t addr1, + vm_offset_t addr2); +typedef void (*smp_targeted_tlb_shootdown_t)(pmap_t, vm_offset_t, vm_offset_t, + smp_invl_local_cb_t, enum invl_op_codes); + +void smp_targeted_tlb_shootdown_native(pmap_t, vm_offset_t, vm_offset_t, + smp_invl_local_cb_t, enum invl_op_codes); +extern smp_targeted_tlb_shootdown_t smp_targeted_tlb_shootdown; + #endif /* _KERNEL */ /* Return various clipped indexes for a given VA */ diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h index c8ca6279031c..9101201287b2 100644 --- a/sys/vm/pmap.h +++ b/sys/vm/pmap.h @@ -167,33 +167,6 @@ void pmap_unwire(pmap_t pmap, vm_offset_t start, vm_offset_t end); void pmap_zero_page(vm_page_t); void pmap_zero_page_area(vm_page_t, int off, int size); -/* - * Invalidation request. PCPU pc_smp_tlb_op uses u_int instead of the - * enum to avoid both namespace and ABI issues (with enums). - */ -enum invl_op_codes { - INVL_OP_TLB = 1, - INVL_OP_TLB_INVPCID = 2, - INVL_OP_TLB_INVPCID_PTI = 3, - INVL_OP_TLB_PCID = 4, - INVL_OP_PGRNG = 5, - INVL_OP_PGRNG_INVPCID = 6, - INVL_OP_PGRNG_PCID = 7, - INVL_OP_PG = 8, - INVL_OP_PG_INVPCID = 9, - INVL_OP_PG_PCID = 10, - INVL_OP_CACHE = 11, -}; -typedef void (*smp_invl_local_cb_t)(struct pmap *, vm_offset_t addr1, - vm_offset_t addr2); -typedef void (*smp_targeted_tlb_shootdown_t)(pmap_t, vm_offset_t, vm_offset_t, - smp_invl_local_cb_t, enum invl_op_codes); - -extern void -smp_targeted_tlb_shootdown_native(pmap_t, vm_offset_t, vm_offset_t, - smp_invl_local_cb_t, enum invl_op_codes); -extern smp_targeted_tlb_shootdown_t smp_targeted_tlb_shootdown; - #define pmap_resident_count(pm) ((pm)->pm_stats.resident_count) #define pmap_wired_count(pm) ((pm)->pm_stats.wired_count)