Commit 21cf2372 authored by Joerg Roedel's avatar Joerg Roedel Committed by Borislav Petkov

x86/boot/compressed/64: Change add_identity_map() to take start and end

Changing the function to take start and end as parameters instead of
start and size simplifies the callers which don't need to calculate the
size if they already have start and end.
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lkml.kernel.org/r/20200907131613.12703-19-joro@8bytes.org
parent 8570978e
...@@ -89,10 +89,8 @@ static struct x86_mapping_info mapping_info; ...@@ -89,10 +89,8 @@ static struct x86_mapping_info mapping_info;
/* /*
* Adds the specified range to the identity mappings. * Adds the specified range to the identity mappings.
*/ */
static void add_identity_map(unsigned long start, unsigned long size) static void add_identity_map(unsigned long start, unsigned long end)
{ {
unsigned long end = start + size;
/* Align boundary to 2M. */ /* Align boundary to 2M. */
start = round_down(start, PMD_SIZE); start = round_down(start, PMD_SIZE);
end = round_up(end, PMD_SIZE); end = round_up(end, PMD_SIZE);
...@@ -107,8 +105,6 @@ static void add_identity_map(unsigned long start, unsigned long size) ...@@ -107,8 +105,6 @@ static void add_identity_map(unsigned long start, unsigned long size)
/* Locates and clears a region for a new top level page table. */ /* Locates and clears a region for a new top level page table. */
void initialize_identity_maps(void) void initialize_identity_maps(void)
{ {
unsigned long start, size;
/* If running as an SEV guest, the encryption mask is required. */ /* If running as an SEV guest, the encryption mask is required. */
set_sev_encryption_mask(); set_sev_encryption_mask();
...@@ -155,9 +151,7 @@ void initialize_identity_maps(void) ...@@ -155,9 +151,7 @@ void initialize_identity_maps(void)
* New page-table is set up - map the kernel image and load it * New page-table is set up - map the kernel image and load it
* into cr3. * into cr3.
*/ */
start = (unsigned long)_head; add_identity_map((unsigned long)_head, (unsigned long)_end);
size = _end - _head;
add_identity_map(start, size);
write_cr3(top_level_pgt); write_cr3(top_level_pgt);
} }
...@@ -189,7 +183,8 @@ static void do_pf_error(const char *msg, unsigned long error_code, ...@@ -189,7 +183,8 @@ static void do_pf_error(const char *msg, unsigned long error_code,
void do_boot_page_fault(struct pt_regs *regs, unsigned long error_code) void do_boot_page_fault(struct pt_regs *regs, unsigned long error_code)
{ {
unsigned long address = native_read_cr2(); unsigned long address = native_read_cr2() & PMD_MASK;
unsigned long end = address + PMD_SIZE;
/* /*
* Check for unexpected error codes. Unexpected are: * Check for unexpected error codes. Unexpected are:
...@@ -204,5 +199,5 @@ void do_boot_page_fault(struct pt_regs *regs, unsigned long error_code) ...@@ -204,5 +199,5 @@ void do_boot_page_fault(struct pt_regs *regs, unsigned long error_code)
* Error code is sane - now identity map the 2M region around * Error code is sane - now identity map the 2M region around
* the faulting address. * the faulting address.
*/ */
add_identity_map(address & PMD_MASK, PMD_SIZE); add_identity_map(address, end);
} }
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