Skip to content

Commit eb54c2a

Browse files
ardbiesheuvelIngo Molnar
authored andcommitted
x86/boot/64: Use RIP_REL_REF() to access early page tables
The early statically allocated page tables are populated from code that executes from a 1:1 mapping so it cannot use plain accesses 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-23-ardb+git@google.com
1 parent 4f8b6cf commit eb54c2a

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

arch/x86/kernel/head64.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,11 @@ unsigned long __head __startup_64(unsigned long physaddr,
215215
p4d[511] += load_delta;
216216
}
217217

218-
pud = fixup_pointer(level3_kernel_pgt, physaddr);
219-
pud[510] += load_delta;
220-
pud[511] += load_delta;
218+
RIP_REL_REF(level3_kernel_pgt)[PTRS_PER_PUD - 2].pud += load_delta;
219+
RIP_REL_REF(level3_kernel_pgt)[PTRS_PER_PUD - 1].pud += load_delta;
221220

222-
pmd = fixup_pointer(level2_fixmap_pgt, physaddr);
223221
for (i = FIXMAP_PMD_TOP; i > FIXMAP_PMD_TOP - FIXMAP_PMD_NUM; i--)
224-
pmd[i] += load_delta;
222+
RIP_REL_REF(level2_fixmap_pgt)[i].pmd += load_delta;
225223

226224
/*
227225
* Set up the identity mapping for the switchover. These
@@ -284,7 +282,7 @@ unsigned long __head __startup_64(unsigned long physaddr,
284282
* error, causing the BIOS to halt the system.
285283
*/
286284

287-
pmd = fixup_pointer(level2_kernel_pgt, physaddr);
285+
pmd = &RIP_REL_REF(level2_kernel_pgt)->pmd;
288286

289287
/* invalidate pages before the kernel image */
290288
for (i = 0; i < pmd_index((unsigned long)_text); i++)

0 commit comments

Comments
 (0)