From: Peter Xu <peterx@redhat.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: "Kirill A . Shutemov" <kirill@shutemov.name>,
Nicholas Piggin <npiggin@gmail.com>,
David Hildenbrand <david@redhat.com>,
Matthew Wilcox <willy@infradead.org>,
Andrew Morton <akpm@linux-foundation.org>,
James Houghton <jthoughton@google.com>,
Huang Ying <ying.huang@intel.com>,
"Aneesh Kumar K . V" <aneesh.kumar@linux.ibm.com>,
peterx@redhat.com, Vlastimil Babka <vbabka@suse.cz>,
Rick P Edgecombe <rick.p.edgecombe@intel.com>,
Hugh Dickins <hughd@google.com>, Borislav Petkov <bp@alien8.de>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Michael Ellerman <mpe@ellerman.id.au>,
Rik van Riel <riel@surriel.com>,
Dan Williams <dan.j.williams@intel.com>,
Mel Gorman <mgorman@techsingularity.net>,
x86@kernel.org, Ingo Molnar <mingo@redhat.com>,
linuxppc-dev@lists.ozlabs.org,
Dave Hansen <dave.hansen@linux.intel.com>,
Dave Jiang <dave.jiang@intel.com>,
Oscar Salvador <osalvador@suse.de>,
Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH v5 4/7] mm/x86: Make pud_leaf() only care about PSE bit
Date: Mon, 12 Aug 2024 14:12:22 -0400 [thread overview]
Message-ID: <20240812181225.1360970-5-peterx@redhat.com> (raw)
In-Reply-To: <20240812181225.1360970-1-peterx@redhat.com>
When working on mprotect() on 1G dax entries, I hit an zap bad pud
error when zapping a huge pud that is with PROT_NONE permission.
Here the problem is x86's pud_leaf() requires both PRESENT and PSE bits
set to report a pud entry as a leaf, but that doesn't look right, as
it's not following the pXd_leaf() definition that we stick with so far,
where PROT_NONE entries should be reported as leaves.
To fix it, change x86's pud_leaf() implementation to only check against
PSE bit to report a leaf, irrelevant of whether PRESENT bit is set.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: x86@kernel.org
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
arch/x86/include/asm/pgtable.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index e39311a89bf4..a2a3bd4c1bda 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -1078,8 +1078,7 @@ static inline pmd_t *pud_pgtable(pud_t pud)
#define pud_leaf pud_leaf
static inline bool pud_leaf(pud_t pud)
{
- return (pud_val(pud) & (_PAGE_PSE | _PAGE_PRESENT)) ==
- (_PAGE_PSE | _PAGE_PRESENT);
+ return pud_val(pud) & _PAGE_PSE;
}
static inline int pud_bad(pud_t pud)
--
2.45.0
next prev parent reply other threads:[~2024-08-12 18:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-12 18:12 [PATCH v5 0/7] mm/mprotect: Fix dax puds Peter Xu
2024-08-12 18:12 ` [PATCH v5 1/7] mm/dax: Dump start address in fault handler Peter Xu
2024-08-12 18:12 ` [PATCH v5 2/7] mm/mprotect: Push mmu notifier to PUDs Peter Xu
2024-08-12 18:12 ` [PATCH v5 3/7] mm/powerpc: Add missing pud helpers Peter Xu
2024-08-12 18:12 ` Peter Xu [this message]
2024-08-12 18:12 ` [PATCH v5 5/7] mm/x86: Implement arch_check_zapped_pud() Peter Xu
2024-08-12 18:12 ` [PATCH v5 6/7] mm/x86: Add missing pud helpers Peter Xu
2024-08-12 18:12 ` [PATCH v5 7/7] mm/mprotect: fix dax pud handlings Peter Xu
2024-08-13 12:50 ` [PATCH v5 0/7] mm/mprotect: Fix dax puds Michael Ellerman
2024-08-13 16:06 ` Peter Xu
2024-11-11 21:20 ` Jann Horn
2024-11-13 16:39 ` Peter Xu
2024-11-13 16:42 ` David Hildenbrand
2024-11-13 17:56 ` Peter Xu
2024-11-13 18:45 ` David Hildenbrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240812181225.1360970-5-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.ibm.com \
--cc=bp@alien8.de \
--cc=christophe.leroy@csgroup.eu \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=dave.jiang@intel.com \
--cc=david@redhat.com \
--cc=hughd@google.com \
--cc=jthoughton@google.com \
--cc=kirill@shutemov.name \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mgorman@techsingularity.net \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=osalvador@suse.de \
--cc=rick.p.edgecombe@intel.com \
--cc=riel@surriel.com \
--cc=tglx@linutronix.de \
--cc=vbabka@suse.cz \
--cc=willy@infradead.org \
--cc=x86@kernel.org \
--cc=ying.huang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox