* [PATCH fsgsbase v2 4/4] x86/fsgsbase: Fix Xen PV support
[not found] <cover.1593192140.git.luto@kernel.org>
@ 2020-06-26 17:24 ` Andy Lutomirski
2020-06-29 5:17 ` Jürgen Groß
0 siblings, 1 reply; 3+ messages in thread
From: Andy Lutomirski @ 2020-06-26 17:24 UTC (permalink / raw)
To: x86
Cc: Sasha Levin, Juergen Gross, Stefano Stabellini, Andrew Cooper,
linux-kernel, Andy Lutomirski, xen-devel, Boris Ostrovsky
On Xen PV, SWAPGS doesn't work. Teach __rdfsbase_inactive() and
__wrgsbase_inactive() to use rdmsrl()/wrmsrl() on Xen PV. The Xen
pvop code will understand this and issue the correct hypercalls.
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: xen-devel@lists.xenproject.org
Signed-off-by: Andy Lutomirski <luto@kernel.org>
---
arch/x86/kernel/process_64.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index cb8e37d3acaa..457d02aa10d8 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -163,9 +163,13 @@ static noinstr unsigned long __rdgsbase_inactive(void)
lockdep_assert_irqs_disabled();
- native_swapgs();
- gsbase = rdgsbase();
- native_swapgs();
+ if (!static_cpu_has(X86_FEATURE_XENPV)) {
+ native_swapgs();
+ gsbase = rdgsbase();
+ native_swapgs();
+ } else {
+ rdmsrl(MSR_KERNEL_GS_BASE, gsbase);
+ }
return gsbase;
}
@@ -182,9 +186,13 @@ static noinstr void __wrgsbase_inactive(unsigned long gsbase)
{
lockdep_assert_irqs_disabled();
- native_swapgs();
- wrgsbase(gsbase);
- native_swapgs();
+ if (!static_cpu_has(X86_FEATURE_XENPV)) {
+ native_swapgs();
+ wrgsbase(gsbase);
+ native_swapgs();
+ } else {
+ wrmsrl(MSR_KERNEL_GS_BASE, gsbase);
+ }
}
/*
--
2.25.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH fsgsbase v2 4/4] x86/fsgsbase: Fix Xen PV support
2020-06-26 17:24 ` [PATCH fsgsbase v2 4/4] x86/fsgsbase: Fix Xen PV support Andy Lutomirski
@ 2020-06-29 5:17 ` Jürgen Groß
2020-06-29 11:07 ` Andrew Cooper
0 siblings, 1 reply; 3+ messages in thread
From: Jürgen Groß @ 2020-06-29 5:17 UTC (permalink / raw)
To: Andy Lutomirski, x86
Cc: Sasha Levin, Stefano Stabellini, Andrew Cooper, linux-kernel,
xen-devel, Boris Ostrovsky
On 26.06.20 19:24, Andy Lutomirski wrote:
> On Xen PV, SWAPGS doesn't work. Teach __rdfsbase_inactive() and
> __wrgsbase_inactive() to use rdmsrl()/wrmsrl() on Xen PV. The Xen
> pvop code will understand this and issue the correct hypercalls.
>
> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> Cc: Juergen Gross <jgross@suse.com>
> Cc: Stefano Stabellini <sstabellini@kernel.org>
> Cc: xen-devel@lists.xenproject.org
> Signed-off-by: Andy Lutomirski <luto@kernel.org>
> ---
> arch/x86/kernel/process_64.c | 20 ++++++++++++++------
> 1 file changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
> index cb8e37d3acaa..457d02aa10d8 100644
> --- a/arch/x86/kernel/process_64.c
> +++ b/arch/x86/kernel/process_64.c
> @@ -163,9 +163,13 @@ static noinstr unsigned long __rdgsbase_inactive(void)
>
> lockdep_assert_irqs_disabled();
>
> - native_swapgs();
> - gsbase = rdgsbase();
> - native_swapgs();
> + if (!static_cpu_has(X86_FEATURE_XENPV)) {
> + native_swapgs();
> + gsbase = rdgsbase();
> + native_swapgs();
> + } else {
> + rdmsrl(MSR_KERNEL_GS_BASE, gsbase);
> + }
>
> return gsbase;
> }
> @@ -182,9 +186,13 @@ static noinstr void __wrgsbase_inactive(unsigned long gsbase)
> {
> lockdep_assert_irqs_disabled();
>
> - native_swapgs();
> - wrgsbase(gsbase);
> - native_swapgs();
> + if (!static_cpu_has(X86_FEATURE_XENPV)) {
> + native_swapgs();
> + wrgsbase(gsbase);
> + native_swapgs();
> + } else {
> + wrmsrl(MSR_KERNEL_GS_BASE, gsbase);
> + }
> }
>
> /*
>
Another possibility would be to just do (I'm fine either way):
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c
index acc49fa6a097..b78dd373adbf 100644
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@ -318,6 +318,8 @@ static void __init xen_init_capabilities(void)
setup_clear_cpu_cap(X86_FEATURE_XSAVE);
setup_clear_cpu_cap(X86_FEATURE_OSXSAVE);
}
+
+ setup_clear_cpu_cap(X86_FEATURE_FSGSBASE);
}
static void xen_set_debugreg(int reg, unsigned long val)
Juergen
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH fsgsbase v2 4/4] x86/fsgsbase: Fix Xen PV support
2020-06-29 5:17 ` Jürgen Groß
@ 2020-06-29 11:07 ` Andrew Cooper
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Cooper @ 2020-06-29 11:07 UTC (permalink / raw)
To: Jürgen Groß, Andy Lutomirski, x86
Cc: Sasha Levin, xen-devel, Boris Ostrovsky, Stefano Stabellini,
linux-kernel
On 29/06/2020 06:17, Jürgen Groß wrote:
> On 26.06.20 19:24, Andy Lutomirski wrote:
>> On Xen PV, SWAPGS doesn't work. Teach __rdfsbase_inactive() and
>> __wrgsbase_inactive() to use rdmsrl()/wrmsrl() on Xen PV. The Xen
>> pvop code will understand this and issue the correct hypercalls.
>>
>> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
>> Cc: Juergen Gross <jgross@suse.com>
>> Cc: Stefano Stabellini <sstabellini@kernel.org>
>> Cc: xen-devel@lists.xenproject.org
>> Signed-off-by: Andy Lutomirski <luto@kernel.org>
>> ---
>> arch/x86/kernel/process_64.c | 20 ++++++++++++++------
>> 1 file changed, 14 insertions(+), 6 deletions(-)
>>
>> diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
>> index cb8e37d3acaa..457d02aa10d8 100644
>> --- a/arch/x86/kernel/process_64.c
>> +++ b/arch/x86/kernel/process_64.c
>> @@ -163,9 +163,13 @@ static noinstr unsigned long
>> __rdgsbase_inactive(void)
>> lockdep_assert_irqs_disabled();
>> - native_swapgs();
>> - gsbase = rdgsbase();
>> - native_swapgs();
>> + if (!static_cpu_has(X86_FEATURE_XENPV)) {
>> + native_swapgs();
>> + gsbase = rdgsbase();
>> + native_swapgs();
>> + } else {
>> + rdmsrl(MSR_KERNEL_GS_BASE, gsbase);
>> + }
>> return gsbase;
>> }
>> @@ -182,9 +186,13 @@ static noinstr void __wrgsbase_inactive(unsigned
>> long gsbase)
>> {
>> lockdep_assert_irqs_disabled();
>> - native_swapgs();
>> - wrgsbase(gsbase);
>> - native_swapgs();
>> + if (!static_cpu_has(X86_FEATURE_XENPV)) {
>> + native_swapgs();
>> + wrgsbase(gsbase);
>> + native_swapgs();
>> + } else {
>> + wrmsrl(MSR_KERNEL_GS_BASE, gsbase);
>> + }
>> }
>> /*
>>
>
> Another possibility would be to just do (I'm fine either way):
>
> diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c
> index acc49fa6a097..b78dd373adbf 100644
> --- a/arch/x86/xen/enlighten_pv.c
> +++ b/arch/x86/xen/enlighten_pv.c
> @@ -318,6 +318,8 @@ static void __init xen_init_capabilities(void)
> setup_clear_cpu_cap(X86_FEATURE_XSAVE);
> setup_clear_cpu_cap(X86_FEATURE_OSXSAVE);
> }
> +
> + setup_clear_cpu_cap(X86_FEATURE_FSGSBASE);
That will stop both userspace and Xen (side effect of the guest kernel's
CR4 choice) from using the instructions.
Even when the kernel is using the paravirt fastpath, its still Xen
actually taking the hit. MSR_{FS,GS}_BASE/SHADOW are thousands of
cycles to access, whereas {RD,WR}{FS,GS}BASE are a handful.
~Andrew
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-29 11:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <cover.1593192140.git.luto@kernel.org>
2020-06-26 17:24 ` [PATCH fsgsbase v2 4/4] x86/fsgsbase: Fix Xen PV support Andy Lutomirski
2020-06-29 5:17 ` Jürgen Groß
2020-06-29 11:07 ` Andrew Cooper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).