Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 31 Aug 2021 19:09:53 GMT
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 1fe88bc8512b - stable/13 - amd64: Eliminate a redundant test from pmap_enter_object()
Message-ID:  <202108311909.17VJ9rsm074373@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=1fe88bc8512b8444a31534f4b196a1d62af7df33

commit 1fe88bc8512b8444a31534f4b196a1d62af7df33
Author:     Alan Cox <alc@FreeBSD.org>
AuthorDate: 2021-07-24 03:50:10 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2021-08-31 19:09:24 +0000

    amd64: Eliminate a redundant test from pmap_enter_object()
    
    The call to pmap_allow_2m_x_page() in pmap_enter_object() is redundant.
    Specifically, even without the call to pmap_allow_2m_x_page() in
    pmap_enter_object(), pmap_allow_2m_x_page() is eventually called by
    pmap_enter_pde(), so the outcome will be the same.  Essentially,
    calling pmap_allow_2m_x_page() in pmap_enter_object() amounts to
    "optimizing" for the unexpected case.
    
    Reviewed by:    kib
    
    (cherry picked from commit b7de535288362b072cf2801007e4d7e0e903d467)
---
 sys/amd64/amd64/pmap.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 9122a368823b..705bbe712bff 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -7222,7 +7222,6 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end,
 		va = start + ptoa(diff);
 		if ((va & PDRMASK) == 0 && va + NBPDR <= end &&
 		    m->psind == 1 && pmap_ps_enabled(pmap) &&
-		    pmap_allow_2m_x_page(pmap, (prot & VM_PROT_EXECUTE) != 0) &&
 		    pmap_enter_2mpage(pmap, va, m, prot, &lock))
 			m = &m[NBPDR / PAGE_SIZE - 1];
 		else



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108311909.17VJ9rsm074373>