Skip to content

Commit b0fe5fb

Browse files
ardbiesheuvelIngo Molnar
authored andcommitted
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: Ard Biesheuvel <ardb@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Link: https://lore.kernel.org/r/20240221113506.2565718-21-ardb+git@google.com
1 parent d9ec115 commit b0fe5fb

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

arch/x86/kernel/head64.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ static unsigned long __head sme_postprocess_startup(struct boot_params *bp, pmdv
170170
unsigned long __head __startup_64(unsigned long physaddr,
171171
struct boot_params *bp)
172172
{
173+
pmd_t (*early_pgts)[PTRS_PER_PMD] = RIP_REL_REF(early_dynamic_pgts);
173174
unsigned long load_delta, *p;
174175
unsigned long pgtable_flags;
175176
pgdval_t *pgd;
@@ -179,7 +180,6 @@ unsigned long __head __startup_64(unsigned long physaddr,
179180
pteval_t *mask_ptr;
180181
bool la57;
181182
int i;
182-
unsigned int *next_pgt_ptr;
183183

184184
la57 = check_la57_support(physaddr);
185185

@@ -231,15 +231,14 @@ unsigned long __head __startup_64(unsigned long physaddr,
231231
* it avoids problems around wraparound.
232232
*/
233233

234-
next_pgt_ptr = fixup_pointer(&next_early_pgt, physaddr);
235-
pud = fixup_pointer(early_dynamic_pgts[(*next_pgt_ptr)++], physaddr);
236-
pmd = fixup_pointer(early_dynamic_pgts[(*next_pgt_ptr)++], physaddr);
234+
pud = &early_pgts[0]->pmd;
235+
pmd = &early_pgts[1]->pmd;
236+
RIP_REL_REF(next_early_pgt) = 2;
237237

238238
pgtable_flags = _KERNPG_TABLE_NOENC + sme_get_me_mask();
239239

240240
if (la57) {
241-
p4d = fixup_pointer(early_dynamic_pgts[(*next_pgt_ptr)++],
242-
physaddr);
241+
p4d = &early_pgts[RIP_REL_REF(next_early_pgt)++]->pmd;
243242

244243
i = (physaddr >> PGDIR_SHIFT) % PTRS_PER_PGD;
245244
pgd[i + 0] = (pgdval_t)p4d + pgtable_flags;

0 commit comments

Comments
 (0)