x86/pat: Restructure _lookup_address_cpa()

[ Upstream commit 02eac06b820c3eae73e5736ae62f986d37fed991 ]

Modify _lookup_address_cpa() to no longer use lookup_address(), but
only lookup_address_in_pgd().

This is done in preparation of using lookup_address_in_pgd_attr().

No functional change intended.

Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20240412151258.9171-4-jgross@suse.com
Stable-dep-of: 5bc8b0f5dac0 ("x86/pat: Fix W^X violation false-positives when running as Xen PV guest")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c
index cd09ddd34eff8dc414b5f727ff284d7da4dcc332..9c1dccfd1f67f0b0c85d78079d75e9c1ef88b838 100644 (file)
--- a/arch/x86/mm/pat/set_memory.c
+++ b/arch/x86/mm/pat/set_memory.c
@@ -744,11 +744,14 @@ EXPORT_SYMBOL_GPL(lookup_address);
 static pte_t *_lookup_address_cpa(struct cpa_data *cpa, unsigned long address,
                                  unsigned int *level)
 {
-       if (cpa->pgd)
-               return lookup_address_in_pgd(cpa->pgd + pgd_index(address),
-                                              address, level);
+       pgd_t *pgd;
+
+       if (!cpa->pgd)
+               pgd = pgd_offset_k(address);
+       else
+               pgd = cpa->pgd + pgd_index(address);
 
-       return lookup_address(address, level);
+       return lookup_address_in_pgd(pgd, address, level);
 }
 
 /*