Skip to content

Commit

Permalink
x86/boot/64: Use RIP_REL_REF() to access early page tables
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Ard Biesheuvel authored and Ingo Molnar committed Feb 26, 2024
1 parent 4f8b6cf commit eb54c2a
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions arch/x86/kernel/head64.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,13 +215,11 @@ unsigned long __head __startup_64(unsigned long physaddr,
p4d[511] += load_delta;
}

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

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

/*
* Set up the identity mapping for the switchover. These
Expand Down Expand Up @@ -284,7 +282,7 @@ unsigned long __head __startup_64(unsigned long physaddr,
* error, causing the BIOS to halt the system.
*/

pmd = fixup_pointer(level2_kernel_pgt, physaddr);
pmd = &RIP_REL_REF(level2_kernel_pgt)->pmd;

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

0 comments on commit eb54c2a

Please sign in to comment.