From: Peter Zijlstra <peterz@infradead.org>
To: Joan Bruguera <joanbrugueram@gmail.com>
Cc: linux-kernel@vger.kernel.org, x86@kernel.org,
Thomas Gleixner <tglx@linutronix.de>,
Andrew Cooper <Andrew.Cooper3@citrix.com>,
Juergen Gross <jgross@suse.com>,
"Rafael J. Wysocki" <rafael@kernel.org>
Subject: Re: Wake-up from suspend to RAM broken under `retbleed=stuff`
Date: Wed, 11 Jan 2023 12:20:14 +0100 [thread overview]
Message-ID: <Y76bbtJn+jIV3pOz@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20230109040531.7888-1-joanbrugueram@gmail.com>
On Mon, Jan 09, 2023 at 04:05:31AM +0000, Joan Bruguera wrote:
> This fixes wakeup for me on both QEMU and real HW
> (just a proof of concept, don't merge)
>
> diff --git a/arch/x86/kernel/callthunks.c b/arch/x86/kernel/callthunks.c
> index ffea98f9064b..8704bcc0ce32 100644
> --- a/arch/x86/kernel/callthunks.c
> +++ b/arch/x86/kernel/callthunks.c
> @@ -7,6 +7,7 @@
> #include <linux/memory.h>
> #include <linux/moduleloader.h>
> #include <linux/static_call.h>
> +#include <linux/suspend.h>
>
> #include <asm/alternative.h>
> #include <asm/asm-offsets.h>
> @@ -150,6 +151,10 @@ static bool skip_addr(void *dest)
> if (dest >= (void *)hypercall_page &&
> dest < (void*)hypercall_page + PAGE_SIZE)
> return true;
> +#endif
> +#ifdef CONFIG_PM_SLEEP
> + if (dest == restore_processor_state)
> + return true;
> #endif
> return false;
> }
> diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
> index 236447ee9beb..e667894936f7 100644
> --- a/arch/x86/power/cpu.c
> +++ b/arch/x86/power/cpu.c
> @@ -281,6 +281,9 @@ static void notrace __restore_processor_state(struct saved_context *ctxt)
> /* Needed by apm.c */
> void notrace restore_processor_state(void)
> {
> + /* Restore GS before calling anything to avoid crash on call depth accounting */
> + native_wrmsrl(MSR_GS_BASE, saved_context.kernelmode_gs_base);
> +
> __restore_processor_state(&saved_context);
> }
Yeah, I can see why, but I'm not really comfortable with this. TBH, I
don't see how the whole resume code is correct to begin with. At the
very least it needs a heavy dose of noinstr.
Rafael, what cr3 is active when we call restore_processor_state()?
Specifically, the problem is that I don't feel comfortable doing any
sort of weird code until all the CR and segment registers have been
restored, however, write_cr*() are paravirt functions that result in
CALL, which then gives us a bit of a checken and egg problem.
I'm also wondering how well retbleed=stuff works on Xen, if at all. If
we can ignore Xen, things are a little earier perhaps.
next prev parent reply other threads:[~2023-01-11 11:22 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-08 3:07 Wake-up from suspend to RAM broken under `retbleed=stuff` Joan Bruguera
2023-01-08 11:33 ` Borislav Petkov
2023-01-08 17:11 ` Joan Bruguera
2023-01-08 21:27 ` Borislav Petkov
2023-01-08 22:27 ` Joan Bruguera
2023-01-09 4:05 ` Joan Bruguera
2023-01-11 11:20 ` Peter Zijlstra [this message]
2023-01-11 11:39 ` Andrew Cooper
2023-01-11 11:45 ` Jan Beulich
2023-01-11 22:06 ` Andrew Cooper
2023-01-11 11:52 ` Juergen Gross
2023-01-11 12:59 ` Peter Zijlstra
2023-01-11 17:56 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y76bbtJn+jIV3pOz@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=Andrew.Cooper3@citrix.com \
--cc=jgross@suse.com \
--cc=joanbrugueram@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox