From nobody Mon Jul 01 13:17:46 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 4WCRRb4Cy5z5Mrwn; Mon, 01 Jul 2024 13:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WCRRb0TyWz4kYy; Mon, 1 Jul 2024 13:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719839867; 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=FrNtVCfSpSlH7YIZcA+s8BodQaR7uNQu55yX+00J0OM=; b=dpntpUaonEj6tkCYoLPouC0AKAgO7KgZ/AHo+skJmVZcp9220NAX1d2rWMUzoiGDJT6T67 gKypbIyKZ3Zv9WvZv011Or0S/p0CtDlAfelnyPXKQM63TUmKDmMeVj1fC2UwNQVZ0lRJJD caXXMtToUPeruHoDFEUdwCNIcsdqXAzUe4AgAV3sG/j/fDlLJjHs8gbczd2/VEM+qs2eVF vdqtg9fOGM20ZgtNwG5Ac8IiMSUuwa9UUEGIj+JcKPuH13HOoX8LnlV0zY2SjVILal+3LR +PDDU7ZwsKHujDPnJEGzzxTwqXyZiLnO10RdfjNQHXKYxaKD9DPuNerQ+rbyjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719839867; a=rsa-sha256; cv=none; b=xhaxTir7HJE1d/aSBzDYCuoczElkDHYqx4m+CjzG2qKoU6TolJCkHr28GxQBRlOMKld7pa iXmVdqix2JIh7vk+/FOK+xRGr+KiEzS9jlWaE6VdxhnDmt35WJXgONRljeSE9d206DhRpl bPeVK/kVlTukqvCSwkGm2oeeLI9uNoq2pxURZnUcd15tBoTlBvsX1MIahtIJatb1ziVd3M Id9S7/oi/pJtQrpZKbQ0w54Wv38/NDJ4wgpAs7sKuB04kzuXoGoy97rzx1/5zW2sivwO0i PCFJapA3G7LkF2/VfbVRSn1LJf+ETRPCnHc3oxLtK+Ss4Eh48YA5nYbYPOMQfA== 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=1719839867; 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=FrNtVCfSpSlH7YIZcA+s8BodQaR7uNQu55yX+00J0OM=; b=S+9hEgkUbHSDd/m9KW0Vas28WmQtCjyy4w3PPZYE+vm150FqpT1tGvxbhwpJjvv6WcAG9V jzxdfnyNXDGnCl1MO8iswR9aK4+VSZ93F4yyz44NxFyUazJ5REemWtPTS7XPjWREtomPi3 5tMGPNqPUZjIOX3Qc/kEjQfs7XVxv71uXYDyR0yap7mBy9LJI5UYSMy95Hlgy95lsFCfuW hWUHiVx4J2pF/lGnTAxjPu873D+61smMqJVelBg8YO9qn48k4m/xfiIWv36GnCAySo+HzL KwlwkX57VrTqyzrSjxmwsn4C6FHPbBa2elJs+c7Rj+rpyel4oSPHlCSqelJAMw== 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 4WCRRb05C9z15lj; Mon, 1 Jul 2024 13:17:47 +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 461DHkD4076950; Mon, 1 Jul 2024 13:17:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 461DHk4U076947; Mon, 1 Jul 2024 13:17:46 GMT (envelope-from git) Date: Mon, 1 Jul 2024 13:17:46 GMT Message-Id: <202407011317.461DHk4U076947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: 7a3d7aec415e - stable/14 - 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: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7a3d7aec415e1850b1d459e86d381051cdb1315e Auto-Submitted: auto-generated The branch stable/14 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=7a3d7aec415e1850b1d459e86d381051cdb1315e commit 7a3d7aec415e1850b1d459e86d381051cdb1315e Author: Konstantin Belousov AuthorDate: 2024-06-06 05:03:14 +0000 Commit: Wei Hu CommitDate: 2024-07-01 13:07:38 +0000 pmap: move the smp_targeted_tlb_shutdown pointer stuff to amd64 pmap.h Fixes: bec000c9c1ef409989685bb03ff0532907befb4aESC Sponsored by: The FreeBSD Foundation (cherry picked from commit 9c5d7e4a0c02bc45b61f565586da2abcc65d70fa) --- 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 bf531ab6ae56..506b28562bcc 100644 --- a/sys/amd64/include/pmap.h +++ b/sys/amd64/include/pmap.h @@ -545,6 +545,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 f438a1bd0883..65e909df9b8f 100644 --- a/sys/vm/pmap.h +++ b/sys/vm/pmap.h @@ -169,33 +169,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)