Commit b0fe5fb6 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar

x86/boot/64: Use RIP_REL_REF() to access early_dynamic_pgts[]

early_dynamic_pgts[] and next_early_pgt are accessed from code that
executes from a 1:1 mapping so it cannot use a plain access from C.
Replace the use of fixup_pointer() with RIP_REL_REF(), which is better
and simpler.
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20240221113506.2565718-21-ardb+git@google.com
parent d9ec1158
...@@ -170,6 +170,7 @@ static unsigned long __head sme_postprocess_startup(struct boot_params *bp, pmdv ...@@ -170,6 +170,7 @@ static unsigned long __head sme_postprocess_startup(struct boot_params *bp, pmdv
unsigned long __head __startup_64(unsigned long physaddr, unsigned long __head __startup_64(unsigned long physaddr,
struct boot_params *bp) struct boot_params *bp)
{ {
pmd_t (*early_pgts)[PTRS_PER_PMD] = RIP_REL_REF(early_dynamic_pgts);
unsigned long load_delta, *p; unsigned long load_delta, *p;
unsigned long pgtable_flags; unsigned long pgtable_flags;
pgdval_t *pgd; pgdval_t *pgd;
...@@ -179,7 +180,6 @@ unsigned long __head __startup_64(unsigned long physaddr, ...@@ -179,7 +180,6 @@ unsigned long __head __startup_64(unsigned long physaddr,
pteval_t *mask_ptr; pteval_t *mask_ptr;
bool la57; bool la57;
int i; int i;
unsigned int *next_pgt_ptr;
la57 = check_la57_support(physaddr); la57 = check_la57_support(physaddr);
...@@ -231,15 +231,14 @@ unsigned long __head __startup_64(unsigned long physaddr, ...@@ -231,15 +231,14 @@ unsigned long __head __startup_64(unsigned long physaddr,
* it avoids problems around wraparound. * it avoids problems around wraparound.
*/ */
next_pgt_ptr = fixup_pointer(&next_early_pgt, physaddr); pud = &early_pgts[0]->pmd;
pud = fixup_pointer(early_dynamic_pgts[(*next_pgt_ptr)++], physaddr); pmd = &early_pgts[1]->pmd;
pmd = fixup_pointer(early_dynamic_pgts[(*next_pgt_ptr)++], physaddr); RIP_REL_REF(next_early_pgt) = 2;
pgtable_flags = _KERNPG_TABLE_NOENC + sme_get_me_mask(); pgtable_flags = _KERNPG_TABLE_NOENC + sme_get_me_mask();
if (la57) { if (la57) {
p4d = fixup_pointer(early_dynamic_pgts[(*next_pgt_ptr)++], p4d = &early_pgts[RIP_REL_REF(next_early_pgt)++]->pmd;
physaddr);
i = (physaddr >> PGDIR_SHIFT) % PTRS_PER_PGD; i = (physaddr >> PGDIR_SHIFT) % PTRS_PER_PGD;
pgd[i + 0] = (pgdval_t)p4d + pgtable_flags; pgd[i + 0] = (pgdval_t)p4d + pgtable_flags;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment