From: Ashish Kalra <Ashish.Kalra@amd.com>
To: <dave.hansen@linux.intel.com>, <luto@kernel.org>,
<peterz@infradead.org>, <tglx@linutronix.de>, <mingo@redhat.com>,
<bp@alien8.de>
Cc: <x86@kernel.org>, <hpa@zytor.com>,
<kirill.shutemov@linux.intel.com>, <rick.p.edgecombe@intel.com>,
<mhklinux@outlook.com>, <peterx@redhat.com>, <jgross@suse.com>,
<linux-kernel@vger.kernel.org>, <thomas.lendacky@amd.com>,
<linux-coco@lists.linux.dev>, <jroedel@suse.de>
Subject: [PATCH] x86/mm: fix lookup_address() to handle physical memory holes in direct mapping
Date: Fri, 28 Jun 2024 20:52:29 +0000 [thread overview]
Message-ID: <20240628205229.193800-1-Ashish.Kalra@amd.com> (raw)
From: Ashish Kalra <ashish.kalra@amd.com>
lookup_address_in_pgd_attr() at pte level it is simply returning
pte_offset_kernel() and there does not seem to be a check for
returning NULL if pte_none().
Fix lookup_address_in_pgd_attr() to add check for pte_none()
after pte_offset_kernel() and return NULL if it is true.
Signed-off-by: Ashish Kalra <ashish.kalra@amd.com>
---
arch/x86/mm/pat/set_memory.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c
index 443a97e515c0..be8b5bf3bc3f 100644
--- a/arch/x86/mm/pat/set_memory.c
+++ b/arch/x86/mm/pat/set_memory.c
@@ -672,6 +672,7 @@ pte_t *lookup_address_in_pgd_attr(pgd_t *pgd, unsigned long address,
p4d_t *p4d;
pud_t *pud;
pmd_t *pmd;
+ pte_t *pte;
*level = PG_LEVEL_256T;
*nx = false;
@@ -717,7 +718,11 @@ pte_t *lookup_address_in_pgd_attr(pgd_t *pgd, unsigned long address,
*nx |= pmd_flags(*pmd) & _PAGE_NX;
*rw &= pmd_flags(*pmd) & _PAGE_RW;
- return pte_offset_kernel(pmd, address);
+ pte = pte_offset_kernel(pmd, address);
+ if (pte_none(*pte))
+ return NULL;
+
+ return pte;
}
/*
--
2.34.1
next reply other threads:[~2024-06-28 20:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-28 20:52 Ashish Kalra [this message]
2024-06-28 20:58 ` Edgecombe, Rick P
2024-06-28 21:22 ` Kalra, Ashish
2024-06-28 21:33 ` Edgecombe, Rick P
2024-06-28 21:36 ` Tom Lendacky
2024-06-28 21:31 ` Tom Lendacky
2024-06-29 10:20 ` Jürgen Groß
2024-06-29 15:16 ` Tom Lendacky
2024-06-29 16:50 ` Jürgen Groß
2024-07-01 17:57 ` Kalra, Ashish
2024-07-01 18:38 ` Jürgen Groß
2024-07-01 18:59 ` Kalra, Ashish
2024-07-01 19:13 ` Edgecombe, Rick P
2024-07-01 19:39 ` Kalra, Ashish
2024-07-02 5:29 ` Jürgen Groß
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=20240628205229.193800-1-Ashish.Kalra@amd.com \
--to=ashish.kalra@amd.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=jroedel@suse.de \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-coco@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mhklinux@outlook.com \
--cc=mingo@redhat.com \
--cc=peterx@redhat.com \
--cc=peterz@infradead.org \
--cc=rick.p.edgecombe@intel.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=x86@kernel.org \
/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
all inboxes | Powered by JetHome®