From nobody Wed Aug 28 00:40:27 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 4Wtltz2sP3z5MS8l; Wed, 28 Aug 2024 00:40:27 +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 4Wtltz1QzRz47mq; Wed, 28 Aug 2024 00:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724805627; 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=TDO5C0ysbjDP8fQBntCvTLc6U4PMoxs7ch2eV8AWjfs=; b=rPrOXsaFpXXIogwc32PmRchxbg/oTQOGlypFk9yAJCI2AqvhrP1LW0rhqZOWKXGnCy2bvG lnwoy4d2EQqfy3GWww9jfIA+XwKfGSE0wtjWxuVqvIV7ZAoCKMmeOPk1Sol8FHnQU7mzgt tdSUEGvJPRYQS5iRTDznnVm8a4zQssVT0XbuRE22r3tV9FPt8YCD4QB0avhMAsBiUo3Z3m Gs/lB5HLVmZNKGUVoHcBpRgYghC+F2vWtKn2oV2SFhvbSH2Enu4D7G4mMJarZci0ygFOCH 9w6DyLkFllRiKY0WFGReN8Z+BQZASrER1mzHh3fUbipuX9hRUUEYrgDILnfWcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724805627; a=rsa-sha256; cv=none; b=C5pW9+GWcFEIXFwfkUcecJkZjRhzTUYXNPQX+K9HihyPnbnoUnT+auZokRr6FaQ3sUeXQv jwILPzWS+Y4sW9/DI2Dm7Um1PZCdYBvUePckyLl+wf5eU3bBgzlioxwjm1/um3zuwxzsUb UQ4S+9jh7KYYtk83sbbDwC/GGHKhjeGjPsRlRq9/aynRUbOxxgGuNtnmEBPC46jvj+9HuE E3rZYYdIZthe7hakQvGNkGgTi1NptkI6BpcjX1O5hbmsvq5I8t3GrKxI4h5GIkr+zUVnhH cvCHB/tMZ/a77Ru+rC7GGpdNT0w38hIpxo3krocqpOmmnrO0ytyerZANGXaecA== 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=1724805627; 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=TDO5C0ysbjDP8fQBntCvTLc6U4PMoxs7ch2eV8AWjfs=; b=IAJqa3PhaHCnfRSi7zZer5At01eBq1pe8C/WzF7/wFJ6zC41yoLv6N3aXhzVrBRcOHdE+o Elll4Vxl5wq4DHmrZv3a75cR3bVcEa78/GbpGaVdVpKDkcfhSfoo5UjbzKpIGF67TKl6BF TDszjYQtHcLuZQxe27d0BDX8iVKTKPCjrdEerJAww+FxUWNdG59tmCNdZtuh8HuYQ2hBvc a5lLj60PdLlhXQmgvNFVVffE+a9qehgiY8bbuWHEZnEO9TALyUFo4Vmq5sC0sDuhLD263Z zq+Yxb6Mq2cM8xEal1GPqNl8TAE2lwH5rWu+/g2VgqtPEcqjA5kfafww1tEgxw== 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 4Wtltz0lcWz1Bf8; Wed, 28 Aug 2024 00:40:27 +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 47S0eRRi064721; Wed, 28 Aug 2024 00:40:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47S0eRUl064718; Wed, 28 Aug 2024 00:40:27 GMT (envelope-from git) Date: Wed, 28 Aug 2024 00:40:27 GMT Message-Id: <202408280040.47S0eRUl064718@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: 43605618aafa - stable/14 - amd64: use INVLPGB for kernel pmap invalidations 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 43605618aafa834cbd18f91f19f2565584a7fa5f Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=43605618aafa834cbd18f91f19f2565584a7fa5f commit 43605618aafa834cbd18f91f19f2565584a7fa5f Author: Konstantin Belousov AuthorDate: 2024-05-13 22:42:08 +0000 Commit: Konstantin Belousov CommitDate: 2024-08-28 00:26:34 +0000 amd64: use INVLPGB for kernel pmap invalidations (cherry picked from commit 47656cc1ef1cac307f24de88a4fe23a1389af44e) --- sys/amd64/amd64/mp_machdep.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 91737637b714..12abb8b6bf8b 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -679,6 +679,20 @@ local_cb: void smp_masked_invltlb(pmap_t pmap, smp_invl_cb_t curcpu_cb) { + if (invlpgb_works && pmap == kernel_pmap) { + invlpgb(INVLPGB_GLOB, 0, 0); + + /* + * TLBSYNC syncs only against INVLPGB executed on the + * same CPU. Since current thread is pinned by + * caller, we do not need to enter critical section to + * prevent migration. + */ + tlbsync(); + sched_unpin(); + return; + } + smp_targeted_tlb_shootdown(pmap, 0, 0, curcpu_cb, invl_op_tlb); #ifdef COUNT_XINVLTLB_HITS ipi_global++; @@ -688,6 +702,13 @@ smp_masked_invltlb(pmap_t pmap, smp_invl_cb_t curcpu_cb) void smp_masked_invlpg(vm_offset_t addr, pmap_t pmap, smp_invl_cb_t curcpu_cb) { + if (invlpgb_works && pmap == kernel_pmap) { + invlpgb(INVLPGB_GLOB | INVLPGB_VA | trunc_page(addr), 0, 0); + tlbsync(); + sched_unpin(); + return; + } + smp_targeted_tlb_shootdown(pmap, addr, 0, curcpu_cb, invl_op_pg); #ifdef COUNT_XINVLTLB_HITS ipi_page++; @@ -698,6 +719,39 @@ void smp_masked_invlpg_range(vm_offset_t addr1, vm_offset_t addr2, pmap_t pmap, smp_invl_cb_t curcpu_cb) { + if (invlpgb_works && pmap == kernel_pmap) { + vm_offset_t va; + uint64_t cnt, total; + + addr1 = trunc_page(addr1); + addr2 = round_page(addr2); + total = atop(addr2 - addr1); + for (va = addr1; total > 0;) { + if ((va & PDRMASK) != 0 || total < NPDEPG) { + cnt = atop(NBPDR - (va & PDRMASK)); + if (cnt > total) + cnt = total; + if (cnt > invlpgb_maxcnt + 1) + cnt = invlpgb_maxcnt + 1; + invlpgb(INVLPGB_GLOB | INVLPGB_VA | va, 0, + cnt - 1); + va += ptoa(cnt); + total -= cnt; + } else { + cnt = total / NPTEPG; + if (cnt > invlpgb_maxcnt + 1) + cnt = invlpgb_maxcnt + 1; + invlpgb(INVLPGB_GLOB | INVLPGB_VA | va, 0, + INVLPGB_2M_CNT | (cnt - 1)); + va += cnt << PDRSHIFT; + total -= cnt * NPTEPG; + } + } + tlbsync(); + sched_unpin(); + return; + } + smp_targeted_tlb_shootdown(pmap, addr1, addr2, curcpu_cb, invl_op_pgrng); #ifdef COUNT_XINVLTLB_HITS