2019-06-01 11:08:44 +03:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0-only */
|
2008-02-10 01:24:09 +03:00
|
|
|
/*
|
|
|
|
|
* Hibernation support for x86-64
|
2005-04-17 02:20:36 +04:00
|
|
|
*
|
2008-02-10 01:24:09 +03:00
|
|
|
* Copyright 2007 Rafael J. Wysocki <rjw@sisk.pl>
|
|
|
|
|
* Copyright 2005 Andi Kleen <ak@suse.de>
|
|
|
|
|
* Copyright 2004 Pavel Machek <pavel@suse.cz>
|
|
|
|
|
*
|
2007-10-18 14:04:53 +04:00
|
|
|
* swsusp_arch_resume must not use any stack or any nonlocal variables while
|
|
|
|
|
* copying pages:
|
2005-04-17 02:20:36 +04:00
|
|
|
*
|
|
|
|
|
* Its rewriting one kernel image with another. What is stack in "old"
|
|
|
|
|
* image could very well be data page in "new" image, and overwriting
|
|
|
|
|
* your own stack under you is bad idea.
|
|
|
|
|
*/
|
2008-02-10 01:24:09 +03:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
.text
|
|
|
|
|
#include <linux/linkage.h>
|
|
|
|
|
#include <asm/segment.h>
|
2009-02-13 22:14:01 +03:00
|
|
|
#include <asm/page_types.h>
|
2005-09-09 23:28:48 +04:00
|
|
|
#include <asm/asm-offsets.h>
|
2008-02-09 00:49:13 +03:00
|
|
|
#include <asm/processor-flags.h>
|
2016-01-22 01:49:24 +03:00
|
|
|
#include <asm/frame.h>
|
2021-01-22 00:29:34 +03:00
|
|
|
#include <asm/nospec-branch.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2021-01-22 00:29:35 +03:00
|
|
|
/* code below belongs to the image kernel */
|
|
|
|
|
.align PAGE_SIZE
|
|
|
|
|
SYM_FUNC_START(restore_registers)
|
|
|
|
|
/* go back to the original page tables */
|
|
|
|
|
movq %r9, %cr3
|
|
|
|
|
|
|
|
|
|
/* Flush TLB, including "global" things (vmalloc) */
|
|
|
|
|
movq mmu_cr4_features(%rip), %rax
|
|
|
|
|
movq %rax, %rdx
|
|
|
|
|
andq $~(X86_CR4_PGE), %rdx
|
|
|
|
|
movq %rdx, %cr4; # turn off PGE
|
|
|
|
|
movq %cr3, %rcx; # flush TLB
|
|
|
|
|
movq %rcx, %cr3
|
|
|
|
|
movq %rax, %cr4; # turn PGE back on
|
|
|
|
|
|
|
|
|
|
/* We don't restore %rax, it must be 0 anyway */
|
|
|
|
|
movq $saved_context, %rax
|
|
|
|
|
movq pt_regs_sp(%rax), %rsp
|
|
|
|
|
movq pt_regs_bp(%rax), %rbp
|
|
|
|
|
movq pt_regs_si(%rax), %rsi
|
|
|
|
|
movq pt_regs_di(%rax), %rdi
|
|
|
|
|
movq pt_regs_bx(%rax), %rbx
|
|
|
|
|
movq pt_regs_cx(%rax), %rcx
|
|
|
|
|
movq pt_regs_dx(%rax), %rdx
|
|
|
|
|
movq pt_regs_r8(%rax), %r8
|
|
|
|
|
movq pt_regs_r9(%rax), %r9
|
|
|
|
|
movq pt_regs_r10(%rax), %r10
|
|
|
|
|
movq pt_regs_r11(%rax), %r11
|
|
|
|
|
movq pt_regs_r12(%rax), %r12
|
|
|
|
|
movq pt_regs_r13(%rax), %r13
|
|
|
|
|
movq pt_regs_r14(%rax), %r14
|
|
|
|
|
movq pt_regs_r15(%rax), %r15
|
|
|
|
|
pushq pt_regs_flags(%rax)
|
|
|
|
|
popfq
|
|
|
|
|
|
|
|
|
|
/* Saved in save_processor_state. */
|
|
|
|
|
lgdt saved_context_gdt_desc(%rax)
|
|
|
|
|
|
|
|
|
|
xorl %eax, %eax
|
|
|
|
|
|
|
|
|
|
/* tell the hibernation core that we've just restored the memory */
|
|
|
|
|
movq %rax, in_suspend(%rip)
|
|
|
|
|
|
|
|
|
|
ret
|
|
|
|
|
SYM_FUNC_END(restore_registers)
|
|
|
|
|
|
2019-10-11 14:51:04 +03:00
|
|
|
SYM_FUNC_START(swsusp_arch_suspend)
|
2007-10-24 00:37:24 +04:00
|
|
|
movq $saved_context, %rax
|
2008-01-30 15:30:56 +03:00
|
|
|
movq %rsp, pt_regs_sp(%rax)
|
|
|
|
|
movq %rbp, pt_regs_bp(%rax)
|
|
|
|
|
movq %rsi, pt_regs_si(%rax)
|
|
|
|
|
movq %rdi, pt_regs_di(%rax)
|
|
|
|
|
movq %rbx, pt_regs_bx(%rax)
|
|
|
|
|
movq %rcx, pt_regs_cx(%rax)
|
|
|
|
|
movq %rdx, pt_regs_dx(%rax)
|
2007-10-24 00:37:24 +04:00
|
|
|
movq %r8, pt_regs_r8(%rax)
|
|
|
|
|
movq %r9, pt_regs_r9(%rax)
|
|
|
|
|
movq %r10, pt_regs_r10(%rax)
|
|
|
|
|
movq %r11, pt_regs_r11(%rax)
|
|
|
|
|
movq %r12, pt_regs_r12(%rax)
|
|
|
|
|
movq %r13, pt_regs_r13(%rax)
|
|
|
|
|
movq %r14, pt_regs_r14(%rax)
|
|
|
|
|
movq %r15, pt_regs_r15(%rax)
|
|
|
|
|
pushfq
|
2008-01-30 15:30:56 +03:00
|
|
|
popq pt_regs_flags(%rax)
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2007-10-18 14:04:54 +04:00
|
|
|
/* save cr3 */
|
|
|
|
|
movq %cr3, %rax
|
|
|
|
|
movq %rax, restore_cr3(%rip)
|
2007-10-18 14:04:53 +04:00
|
|
|
|
x86/power/64: Fix hibernation return address corruption
In kernel bug 150021, a kernel panic was reported when restoring a
hibernate image. Only a picture of the oops was reported, so I can't
paste the whole thing here. But here are the most interesting parts:
kernel tried to execute NX-protected page - exploit attempt? (uid: 0)
BUG: unable to handle kernel paging request at ffff8804615cfd78
...
RIP: ffff8804615cfd78
RSP: ffff8804615f0000
RBP: ffff8804615cfdc0
...
Call Trace:
do_signal+0x23
exit_to_usermode_loop+0x64
...
The RIP is on the same page as RBP, so it apparently started executing
on the stack.
The bug was bisected to commit ef0f3ed5a4ac (x86/asm/power: Create
stack frames in hibernate_asm_64.S), which in retrospect seems quite
dangerous, since that code saves and restores the stack pointer from a
global variable ('saved_context').
There are a lot of moving parts in the hibernate save and restore paths,
so I don't know exactly what caused the panic. Presumably, a FRAME_END
was executed without the corresponding FRAME_BEGIN, or vice versa. That
would corrupt the return address on the stack and would be consistent
with the details of the above panic.
[ rjw: One major problem is that by the time the FRAME_BEGIN in
restore_registers() is executed, the stack pointer value may not
be valid any more. Namely, the stack area pointed to by it
previously may have been overwritten by some image memory contents
and that page frame may now be used for whatever different purpose
it had been allocated for before hibernation. In that case, the
FRAME_BEGIN will corrupt that memory. ]
Instead of doing the frame pointer save/restore around the bounds of the
affected functions, just do it around the call to swsusp_save().
That has the same effect of ensuring that if swsusp_save() sleeps, the
frame pointers will be correct. It's also a much more obviously safe
way to do it than the original patch. And objtool still doesn't report
any warnings.
Fixes: ef0f3ed5a4ac (x86/asm/power: Create stack frames in hibernate_asm_64.S)
Link: https://bugzilla.kernel.org/show_bug.cgi?id=150021
Cc: 4.6+ <stable@vger.kernel.org> # 4.6+
Reported-by: Andre Reinke <andre.reinke@mailbox.org>
Tested-by: Andre Reinke <andre.reinke@mailbox.org>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2016-07-29 00:15:21 +03:00
|
|
|
FRAME_BEGIN
|
2005-04-17 02:20:36 +04:00
|
|
|
call swsusp_save
|
2016-01-22 01:49:24 +03:00
|
|
|
FRAME_END
|
2005-04-17 02:20:36 +04:00
|
|
|
ret
|
2019-10-11 14:51:04 +03:00
|
|
|
SYM_FUNC_END(swsusp_arch_suspend)
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2021-01-22 00:29:36 +03:00
|
|
|
SYM_FUNC_START(restore_image)
|
2007-10-18 14:04:53 +04:00
|
|
|
/* prepare to jump to the image kernel */
|
x86/power/64: Fix kernel text mapping corruption during image restoration
Logan Gunthorpe reports that hibernation stopped working reliably for
him after commit ab76f7b4ab23 (x86/mm: Set NX on gap between __ex_table
and rodata).
That turns out to be a consequence of a long-standing issue with the
64-bit image restoration code on x86, which is that the temporary
page tables set up by it to avoid page tables corruption when the
last bits of the image kernel's memory contents are copied into
their original page frames re-use the boot kernel's text mapping,
but that mapping may very well get corrupted just like any other
part of the page tables. Of course, if that happens, the final
jump to the image kernel's entry point will go to nowhere.
The exact reason why commit ab76f7b4ab23 matters here is that it
sometimes causes a PMD of a large page to be split into PTEs
that are allocated dynamically and get corrupted during image
restoration as described above.
To fix that issue note that the code copying the last bits of the
image kernel's memory contents to the page frames occupied by them
previoulsy doesn't use the kernel text mapping, because it runs from
a special page covered by the identity mapping set up for that code
from scratch. Hence, the kernel text mapping is only needed before
that code starts to run and then it will only be used just for the
final jump to the image kernel's entry point.
Accordingly, the temporary page tables set up in swsusp_arch_resume()
on x86-64 need to contain the kernel text mapping too. That mapping
is only going to be used for the final jump to the image kernel, so
it only needs to cover the image kernel's entry point, because the
first thing the image kernel does after getting control back is to
switch over to its own original page tables. Moreover, the virtual
address of the image kernel's entry point in that mapping has to be
the same as the one mapped by the image kernel's page tables.
With that in mind, modify the x86-64's arch_hibernation_header_save()
and arch_hibernation_header_restore() routines to pass the physical
address of the image kernel's entry point (in addition to its virtual
address) to the boot kernel (a small piece of assembly code involved
in passing the entry point's virtual address to the image kernel is
not necessary any more after that, so drop it). Update RESTORE_MAGIC
too to reflect the image header format change.
Next, in set_up_temporary_mappings(), use the physical and virtual
addresses of the image kernel's entry point passed in the image
header to set up a minimum kernel text mapping (using memory pages
that won't be overwritten by the image kernel's memory contents) that
will map those addresses to each other as appropriate.
This makes the concern about the possible corruption of the original
boot kernel text mapping go away and if the the minimum kernel text
mapping used for the final jump marks the image kernel's entry point
memory as executable, the jump to it is guaraneed to succeed.
Fixes: ab76f7b4ab23 (x86/mm: Set NX on gap between __ex_table and rodata)
Link: http://marc.info/?l=linux-pm&m=146372852823760&w=2
Reported-by: Logan Gunthorpe <logang@deltatee.com>
Reported-and-tested-by: Borislav Petkov <bp@suse.de>
Tested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2016-06-30 19:11:41 +03:00
|
|
|
movq restore_jump_address(%rip), %r8
|
|
|
|
|
movq restore_cr3(%rip), %r9
|
|
|
|
|
|
|
|
|
|
/* prepare to switch to temporary page tables */
|
2018-09-21 09:27:40 +03:00
|
|
|
movq temp_pgt(%rip), %rax
|
x86/power/64: Fix kernel text mapping corruption during image restoration
Logan Gunthorpe reports that hibernation stopped working reliably for
him after commit ab76f7b4ab23 (x86/mm: Set NX on gap between __ex_table
and rodata).
That turns out to be a consequence of a long-standing issue with the
64-bit image restoration code on x86, which is that the temporary
page tables set up by it to avoid page tables corruption when the
last bits of the image kernel's memory contents are copied into
their original page frames re-use the boot kernel's text mapping,
but that mapping may very well get corrupted just like any other
part of the page tables. Of course, if that happens, the final
jump to the image kernel's entry point will go to nowhere.
The exact reason why commit ab76f7b4ab23 matters here is that it
sometimes causes a PMD of a large page to be split into PTEs
that are allocated dynamically and get corrupted during image
restoration as described above.
To fix that issue note that the code copying the last bits of the
image kernel's memory contents to the page frames occupied by them
previoulsy doesn't use the kernel text mapping, because it runs from
a special page covered by the identity mapping set up for that code
from scratch. Hence, the kernel text mapping is only needed before
that code starts to run and then it will only be used just for the
final jump to the image kernel's entry point.
Accordingly, the temporary page tables set up in swsusp_arch_resume()
on x86-64 need to contain the kernel text mapping too. That mapping
is only going to be used for the final jump to the image kernel, so
it only needs to cover the image kernel's entry point, because the
first thing the image kernel does after getting control back is to
switch over to its own original page tables. Moreover, the virtual
address of the image kernel's entry point in that mapping has to be
the same as the one mapped by the image kernel's page tables.
With that in mind, modify the x86-64's arch_hibernation_header_save()
and arch_hibernation_header_restore() routines to pass the physical
address of the image kernel's entry point (in addition to its virtual
address) to the boot kernel (a small piece of assembly code involved
in passing the entry point's virtual address to the image kernel is
not necessary any more after that, so drop it). Update RESTORE_MAGIC
too to reflect the image header format change.
Next, in set_up_temporary_mappings(), use the physical and virtual
addresses of the image kernel's entry point passed in the image
header to set up a minimum kernel text mapping (using memory pages
that won't be overwritten by the image kernel's memory contents) that
will map those addresses to each other as appropriate.
This makes the concern about the possible corruption of the original
boot kernel text mapping go away and if the the minimum kernel text
mapping used for the final jump marks the image kernel's entry point
memory as executable, the jump to it is guaraneed to succeed.
Fixes: ab76f7b4ab23 (x86/mm: Set NX on gap between __ex_table and rodata)
Link: http://marc.info/?l=linux-pm&m=146372852823760&w=2
Reported-by: Logan Gunthorpe <logang@deltatee.com>
Reported-and-tested-by: Borislav Petkov <bp@suse.de>
Tested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2016-06-30 19:11:41 +03:00
|
|
|
movq mmu_cr4_features(%rip), %rbx
|
2007-10-18 14:04:53 +04:00
|
|
|
|
|
|
|
|
/* prepare to copy image data to their original locations */
|
2006-09-26 10:32:52 +04:00
|
|
|
movq restore_pblist(%rip), %rdx
|
x86/power/64: Fix kernel text mapping corruption during image restoration
Logan Gunthorpe reports that hibernation stopped working reliably for
him after commit ab76f7b4ab23 (x86/mm: Set NX on gap between __ex_table
and rodata).
That turns out to be a consequence of a long-standing issue with the
64-bit image restoration code on x86, which is that the temporary
page tables set up by it to avoid page tables corruption when the
last bits of the image kernel's memory contents are copied into
their original page frames re-use the boot kernel's text mapping,
but that mapping may very well get corrupted just like any other
part of the page tables. Of course, if that happens, the final
jump to the image kernel's entry point will go to nowhere.
The exact reason why commit ab76f7b4ab23 matters here is that it
sometimes causes a PMD of a large page to be split into PTEs
that are allocated dynamically and get corrupted during image
restoration as described above.
To fix that issue note that the code copying the last bits of the
image kernel's memory contents to the page frames occupied by them
previoulsy doesn't use the kernel text mapping, because it runs from
a special page covered by the identity mapping set up for that code
from scratch. Hence, the kernel text mapping is only needed before
that code starts to run and then it will only be used just for the
final jump to the image kernel's entry point.
Accordingly, the temporary page tables set up in swsusp_arch_resume()
on x86-64 need to contain the kernel text mapping too. That mapping
is only going to be used for the final jump to the image kernel, so
it only needs to cover the image kernel's entry point, because the
first thing the image kernel does after getting control back is to
switch over to its own original page tables. Moreover, the virtual
address of the image kernel's entry point in that mapping has to be
the same as the one mapped by the image kernel's page tables.
With that in mind, modify the x86-64's arch_hibernation_header_save()
and arch_hibernation_header_restore() routines to pass the physical
address of the image kernel's entry point (in addition to its virtual
address) to the boot kernel (a small piece of assembly code involved
in passing the entry point's virtual address to the image kernel is
not necessary any more after that, so drop it). Update RESTORE_MAGIC
too to reflect the image header format change.
Next, in set_up_temporary_mappings(), use the physical and virtual
addresses of the image kernel's entry point passed in the image
header to set up a minimum kernel text mapping (using memory pages
that won't be overwritten by the image kernel's memory contents) that
will map those addresses to each other as appropriate.
This makes the concern about the possible corruption of the original
boot kernel text mapping go away and if the the minimum kernel text
mapping used for the final jump marks the image kernel's entry point
memory as executable, the jump to it is guaraneed to succeed.
Fixes: ab76f7b4ab23 (x86/mm: Set NX on gap between __ex_table and rodata)
Link: http://marc.info/?l=linux-pm&m=146372852823760&w=2
Reported-by: Logan Gunthorpe <logang@deltatee.com>
Reported-and-tested-by: Borislav Petkov <bp@suse.de>
Tested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2016-06-30 19:11:41 +03:00
|
|
|
|
|
|
|
|
/* jump to relocated restore code */
|
2007-10-18 14:04:53 +04:00
|
|
|
movq relocated_restore_code(%rip), %rcx
|
2021-01-22 00:29:34 +03:00
|
|
|
ANNOTATE_RETPOLINE_SAFE
|
2007-10-18 14:04:53 +04:00
|
|
|
jmpq *%rcx
|
2021-01-22 00:29:36 +03:00
|
|
|
SYM_FUNC_END(restore_image)
|
2007-10-18 14:04:53 +04:00
|
|
|
|
|
|
|
|
/* code below has been relocated to a safe page */
|
2021-01-22 00:29:36 +03:00
|
|
|
SYM_FUNC_START(core_restore_code)
|
x86/power/64: Fix kernel text mapping corruption during image restoration
Logan Gunthorpe reports that hibernation stopped working reliably for
him after commit ab76f7b4ab23 (x86/mm: Set NX on gap between __ex_table
and rodata).
That turns out to be a consequence of a long-standing issue with the
64-bit image restoration code on x86, which is that the temporary
page tables set up by it to avoid page tables corruption when the
last bits of the image kernel's memory contents are copied into
their original page frames re-use the boot kernel's text mapping,
but that mapping may very well get corrupted just like any other
part of the page tables. Of course, if that happens, the final
jump to the image kernel's entry point will go to nowhere.
The exact reason why commit ab76f7b4ab23 matters here is that it
sometimes causes a PMD of a large page to be split into PTEs
that are allocated dynamically and get corrupted during image
restoration as described above.
To fix that issue note that the code copying the last bits of the
image kernel's memory contents to the page frames occupied by them
previoulsy doesn't use the kernel text mapping, because it runs from
a special page covered by the identity mapping set up for that code
from scratch. Hence, the kernel text mapping is only needed before
that code starts to run and then it will only be used just for the
final jump to the image kernel's entry point.
Accordingly, the temporary page tables set up in swsusp_arch_resume()
on x86-64 need to contain the kernel text mapping too. That mapping
is only going to be used for the final jump to the image kernel, so
it only needs to cover the image kernel's entry point, because the
first thing the image kernel does after getting control back is to
switch over to its own original page tables. Moreover, the virtual
address of the image kernel's entry point in that mapping has to be
the same as the one mapped by the image kernel's page tables.
With that in mind, modify the x86-64's arch_hibernation_header_save()
and arch_hibernation_header_restore() routines to pass the physical
address of the image kernel's entry point (in addition to its virtual
address) to the boot kernel (a small piece of assembly code involved
in passing the entry point's virtual address to the image kernel is
not necessary any more after that, so drop it). Update RESTORE_MAGIC
too to reflect the image header format change.
Next, in set_up_temporary_mappings(), use the physical and virtual
addresses of the image kernel's entry point passed in the image
header to set up a minimum kernel text mapping (using memory pages
that won't be overwritten by the image kernel's memory contents) that
will map those addresses to each other as appropriate.
This makes the concern about the possible corruption of the original
boot kernel text mapping go away and if the the minimum kernel text
mapping used for the final jump marks the image kernel's entry point
memory as executable, the jump to it is guaraneed to succeed.
Fixes: ab76f7b4ab23 (x86/mm: Set NX on gap between __ex_table and rodata)
Link: http://marc.info/?l=linux-pm&m=146372852823760&w=2
Reported-by: Logan Gunthorpe <logang@deltatee.com>
Reported-and-tested-by: Borislav Petkov <bp@suse.de>
Tested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2016-06-30 19:11:41 +03:00
|
|
|
/* switch to temporary page tables */
|
|
|
|
|
movq %rax, %cr3
|
|
|
|
|
/* flush TLB */
|
|
|
|
|
movq %rbx, %rcx
|
|
|
|
|
andq $~(X86_CR4_PGE), %rcx
|
|
|
|
|
movq %rcx, %cr4; # turn off PGE
|
|
|
|
|
movq %cr3, %rcx; # flush TLB
|
|
|
|
|
movq %rcx, %cr3;
|
|
|
|
|
movq %rbx, %cr4; # turn PGE back on
|
2015-04-12 22:45:06 +03:00
|
|
|
.Lloop:
|
2005-04-17 02:20:36 +04:00
|
|
|
testq %rdx, %rdx
|
2015-04-12 22:45:06 +03:00
|
|
|
jz .Ldone
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
|
/* get addresses from the pbe and copy the page */
|
|
|
|
|
movq pbe_address(%rdx), %rsi
|
|
|
|
|
movq pbe_orig_address(%rdx), %rdi
|
2007-10-18 14:04:53 +04:00
|
|
|
movq $(PAGE_SIZE >> 3), %rcx
|
2005-04-17 02:20:36 +04:00
|
|
|
rep
|
|
|
|
|
movsq
|
|
|
|
|
|
|
|
|
|
/* progress to the next pbe */
|
|
|
|
|
movq pbe_next(%rdx), %rdx
|
2015-04-12 22:45:06 +03:00
|
|
|
jmp .Lloop
|
x86/power/64: Fix kernel text mapping corruption during image restoration
Logan Gunthorpe reports that hibernation stopped working reliably for
him after commit ab76f7b4ab23 (x86/mm: Set NX on gap between __ex_table
and rodata).
That turns out to be a consequence of a long-standing issue with the
64-bit image restoration code on x86, which is that the temporary
page tables set up by it to avoid page tables corruption when the
last bits of the image kernel's memory contents are copied into
their original page frames re-use the boot kernel's text mapping,
but that mapping may very well get corrupted just like any other
part of the page tables. Of course, if that happens, the final
jump to the image kernel's entry point will go to nowhere.
The exact reason why commit ab76f7b4ab23 matters here is that it
sometimes causes a PMD of a large page to be split into PTEs
that are allocated dynamically and get corrupted during image
restoration as described above.
To fix that issue note that the code copying the last bits of the
image kernel's memory contents to the page frames occupied by them
previoulsy doesn't use the kernel text mapping, because it runs from
a special page covered by the identity mapping set up for that code
from scratch. Hence, the kernel text mapping is only needed before
that code starts to run and then it will only be used just for the
final jump to the image kernel's entry point.
Accordingly, the temporary page tables set up in swsusp_arch_resume()
on x86-64 need to contain the kernel text mapping too. That mapping
is only going to be used for the final jump to the image kernel, so
it only needs to cover the image kernel's entry point, because the
first thing the image kernel does after getting control back is to
switch over to its own original page tables. Moreover, the virtual
address of the image kernel's entry point in that mapping has to be
the same as the one mapped by the image kernel's page tables.
With that in mind, modify the x86-64's arch_hibernation_header_save()
and arch_hibernation_header_restore() routines to pass the physical
address of the image kernel's entry point (in addition to its virtual
address) to the boot kernel (a small piece of assembly code involved
in passing the entry point's virtual address to the image kernel is
not necessary any more after that, so drop it). Update RESTORE_MAGIC
too to reflect the image header format change.
Next, in set_up_temporary_mappings(), use the physical and virtual
addresses of the image kernel's entry point passed in the image
header to set up a minimum kernel text mapping (using memory pages
that won't be overwritten by the image kernel's memory contents) that
will map those addresses to each other as appropriate.
This makes the concern about the possible corruption of the original
boot kernel text mapping go away and if the the minimum kernel text
mapping used for the final jump marks the image kernel's entry point
memory as executable, the jump to it is guaraneed to succeed.
Fixes: ab76f7b4ab23 (x86/mm: Set NX on gap between __ex_table and rodata)
Link: http://marc.info/?l=linux-pm&m=146372852823760&w=2
Reported-by: Logan Gunthorpe <logang@deltatee.com>
Reported-and-tested-by: Borislav Petkov <bp@suse.de>
Tested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2016-06-30 19:11:41 +03:00
|
|
|
|
2015-04-12 22:45:06 +03:00
|
|
|
.Ldone:
|
2007-10-18 14:04:53 +04:00
|
|
|
/* jump to the restore_registers address from the image header */
|
2021-01-22 00:29:34 +03:00
|
|
|
ANNOTATE_RETPOLINE_SAFE
|
x86/power/64: Fix kernel text mapping corruption during image restoration
Logan Gunthorpe reports that hibernation stopped working reliably for
him after commit ab76f7b4ab23 (x86/mm: Set NX on gap between __ex_table
and rodata).
That turns out to be a consequence of a long-standing issue with the
64-bit image restoration code on x86, which is that the temporary
page tables set up by it to avoid page tables corruption when the
last bits of the image kernel's memory contents are copied into
their original page frames re-use the boot kernel's text mapping,
but that mapping may very well get corrupted just like any other
part of the page tables. Of course, if that happens, the final
jump to the image kernel's entry point will go to nowhere.
The exact reason why commit ab76f7b4ab23 matters here is that it
sometimes causes a PMD of a large page to be split into PTEs
that are allocated dynamically and get corrupted during image
restoration as described above.
To fix that issue note that the code copying the last bits of the
image kernel's memory contents to the page frames occupied by them
previoulsy doesn't use the kernel text mapping, because it runs from
a special page covered by the identity mapping set up for that code
from scratch. Hence, the kernel text mapping is only needed before
that code starts to run and then it will only be used just for the
final jump to the image kernel's entry point.
Accordingly, the temporary page tables set up in swsusp_arch_resume()
on x86-64 need to contain the kernel text mapping too. That mapping
is only going to be used for the final jump to the image kernel, so
it only needs to cover the image kernel's entry point, because the
first thing the image kernel does after getting control back is to
switch over to its own original page tables. Moreover, the virtual
address of the image kernel's entry point in that mapping has to be
the same as the one mapped by the image kernel's page tables.
With that in mind, modify the x86-64's arch_hibernation_header_save()
and arch_hibernation_header_restore() routines to pass the physical
address of the image kernel's entry point (in addition to its virtual
address) to the boot kernel (a small piece of assembly code involved
in passing the entry point's virtual address to the image kernel is
not necessary any more after that, so drop it). Update RESTORE_MAGIC
too to reflect the image header format change.
Next, in set_up_temporary_mappings(), use the physical and virtual
addresses of the image kernel's entry point passed in the image
header to set up a minimum kernel text mapping (using memory pages
that won't be overwritten by the image kernel's memory contents) that
will map those addresses to each other as appropriate.
This makes the concern about the possible corruption of the original
boot kernel text mapping go away and if the the minimum kernel text
mapping used for the final jump marks the image kernel's entry point
memory as executable, the jump to it is guaraneed to succeed.
Fixes: ab76f7b4ab23 (x86/mm: Set NX on gap between __ex_table and rodata)
Link: http://marc.info/?l=linux-pm&m=146372852823760&w=2
Reported-by: Logan Gunthorpe <logang@deltatee.com>
Reported-and-tested-by: Borislav Petkov <bp@suse.de>
Tested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2016-06-30 19:11:41 +03:00
|
|
|
jmpq *%r8
|
2021-01-22 00:29:36 +03:00
|
|
|
SYM_FUNC_END(core_restore_code)
|
