3.18.y missing "x86/cpu: Fix SMAP check in PVOPS environments"

3.18.y missing "x86/cpu: Fix SMAP check in PVOPS environments"

[Ian Jackson]

Hi.  It appears that 3.18.y is lacking 581b7f158fe0 "x86/cpu: Fix SMAP
check in PVOPS environments".  Without this, it crashes when booting
under Xen PVOPS on processors with the new SMAP feature.

Andrew Cooper tells me this bug is definitely present in 3.18.y.

Would you please consider applying this commit to 3.18 ?  It appears
to apply cleanly.

Thanks,
Ian.

>From 581b7f158fe0383b492acd1ce3fb4e99d4e57808 Mon Sep 17 00:00:00 2001
From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Wed, 3 Jun 2015 10:31:14 +0100
Subject: [PATCH] x86/cpu: Fix SMAP check in PVOPS environments

There appears to be no formal statement of what pv_irq_ops.save_fl() is
supposed to return precisely.  Native returns the full flags, while lguest and
Xen only return the Interrupt Flag, and both have comments by the
implementations stating that only the Interrupt Flag is looked at.  This may
have been true when initially implemented, but no longer is.

To make matters worse, the Xen PVOP leaves the upper bits undefined, making
the BUG_ON() undefined behaviour.  Experimentally, this now trips for 32bit PV
guests on Broadwell hardware.  The BUG_ON() is consistent for an individual
build, but not consistent for all builds.  It has also been a sitting timebomb
since SMAP support was introduced.

Use native_save_fl() instead, which will obtain an accurate view of the AC
flag.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: David Vrabel <david.vrabel@citrix.com>
Tested-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: <lguest@lists.ozlabs.org>
Cc: Xen-devel <xen-devel@lists.xen.org>
CC: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/1433323874-6927-1-git-send-email-andrew.cooper3@citrix.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/x86/kernel/cpu/common.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 4ddd780..c2b7522 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -273,10 +273,9 @@ __setup("nosmap", setup_disable_smap);
 
 static __always_inline void setup_smap(struct cpuinfo_x86 *c)
 {
-	unsigned long eflags;
+	unsigned long eflags = native_save_fl();
 
 	/* This should have been cleared long ago */
-	raw_local_save_flags(eflags);
 	BUG_ON(eflags & X86_EFLAGS_AC);
 
 	if (cpu_has(c, X86_FEATURE_SMAP)) {
-- 
2.1.4

Re: 3.18.y missing "x86/cpu: Fix SMAP check in PVOPS environments"

[Levin, Alexander]

On Tue, Oct 18, 2016 at 12:46:31PM -0400, Ian Jackson wrote:
> Hi.  It appears that 3.18.y is lacking 581b7f158fe0 "x86/cpu: Fix SMAP
> check in PVOPS environments".  Without this, it crashes when booting
> under Xen PVOPS on processors with the new SMAP feature.
> 
> Andrew Cooper tells me this bug is definitely present in 3.18.y.
> 
> Would you please consider applying this commit to 3.18 ?  It appears
> to apply cleanly.

Added, thanks!

-- 

Thanks,
Sasha

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: 3.18.y missing "x86/cpu: Fix SMAP check in PVOPS environments"

[Ian Jackson]

Levin, Alexander writes ("Re: 3.18.y missing "x86/cpu: Fix SMAP check in PVOPS environments""):
> On Tue, Oct 18, 2016 at 12:46:31PM -0400, Ian Jackson wrote:
> > Hi.  It appears that 3.18.y is lacking 581b7f158fe0 "x86/cpu: Fix SMAP
> > check in PVOPS environments".  Without this, it crashes when booting
> > under Xen PVOPS on processors with the new SMAP feature.
> > 
> > Andrew Cooper tells me this bug is definitely present in 3.18.y.
> > 
> > Would you please consider applying this commit to 3.18 ?  It appears
> > to apply cleanly.
> 
> Added, thanks!

Thanks for your attention.

Forgive me if I'm missing something obvious, but: I just fetched
  git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable
and there the ref stable/linux-3.18.y was not updated and remains at
3cab355c2ff3a781b6ebe9d1a25bd4ebc1207430 aka v3.18.43.

When you say "added", do you mean it is in some branch of yours which
will be pushed later ?

(I tried to find the answer to my question by typing random junk into
general web search engines, but without success.)

Thanks,
Ian.

Re: 3.18.y missing "x86/cpu: Fix SMAP check in PVOPS environments"

[Ian Jackson]

Levin, Alexander writes ("Re: 3.18.y missing "x86/cpu: Fix SMAP check in PVOPS environments""):
> On Tue, Oct 18, 2016 at 12:46:31PM -0400, Ian Jackson wrote:
> > Hi.  It appears that 3.18.y is lacking 581b7f158fe0 "x86/cpu: Fix SMAP
> > check in PVOPS environments".  Without this, it crashes when booting
> > under Xen PVOPS on processors with the new SMAP feature.
> > 
> > Andrew Cooper tells me this bug is definitely present in 3.18.y.
> > 
> > Would you please consider applying this commit to 3.18 ?  It appears
> > to apply cleanly.
> 
> Added, thanks!

Thanks for your attention.

Forgive me if I'm missing something obvious, but: I just fetched
  git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable
and there the ref stable/linux-3.18.y was not updated and remains at
3cab355c2ff3a781b6ebe9d1a25bd4ebc1207430 aka v3.18.43.

When you say "added", do you mean it is in some branch of yours which
will be pushed later ?

(I tried to find the answer to my question by typing random junk into
general web search engines, but without success.)

Thanks,
Ian.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [Xen-devel] 3.18.y missing "x86/cpu: Fix SMAP check in PVOPS environments"

[Pasi Kärkkäinen]

On Mon, Oct 24, 2016 at 11:37:14AM +0100, Ian Jackson wrote:
> Levin, Alexander writes ("Re: 3.18.y missing "x86/cpu: Fix SMAP check in PVOPS environments""):
> > On Tue, Oct 18, 2016 at 12:46:31PM -0400, Ian Jackson wrote:
> > > Hi.  It appears that 3.18.y is lacking 581b7f158fe0 "x86/cpu: Fix SMAP
> > > check in PVOPS environments".  Without this, it crashes when booting
> > > under Xen PVOPS on processors with the new SMAP feature.
> > > 
> > > Andrew Cooper tells me this bug is definitely present in 3.18.y.
> > > 
> > > Would you please consider applying this commit to 3.18 ?  It appears
> > > to apply cleanly.
> > 
> > Added, thanks!
> 
> Thanks for your attention.
> 
> Forgive me if I'm missing something obvious, but: I just fetched
>   git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable
> and there the ref stable/linux-3.18.y was not updated and remains at
> 3cab355c2ff3a781b6ebe9d1a25bd4ebc1207430 aka v3.18.43.
> 
> When you say "added", do you mean it is in some branch of yours which
> will be pushed later ?
> 
> (I tried to find the answer to my question by typing random junk into
> general web search engines, but without success.)
> 

I can see Linux 3.18.44 at least here:
https://kernel.googlesource.com/pub/scm/linux/kernel/git/sashal/linux-stable/+/linux-3.18.y-queue

With the SMAP/PVOPS fix included:
https://kernel.googlesource.com/pub/scm/linux/kernel/git/sashal/linux-stable/+log/linux-3.18.y-queue


> Thanks,
> Ian.
> 


-- Pasi

Re: 3.18.y missing "x86/cpu: Fix SMAP check in PVOPS environments"

[Pasi Kärkkäinen]

On Mon, Oct 24, 2016 at 11:37:14AM +0100, Ian Jackson wrote:
> Levin, Alexander writes ("Re: 3.18.y missing "x86/cpu: Fix SMAP check in PVOPS environments""):
> > On Tue, Oct 18, 2016 at 12:46:31PM -0400, Ian Jackson wrote:
> > > Hi.  It appears that 3.18.y is lacking 581b7f158fe0 "x86/cpu: Fix SMAP
> > > check in PVOPS environments".  Without this, it crashes when booting
> > > under Xen PVOPS on processors with the new SMAP feature.
> > > 
> > > Andrew Cooper tells me this bug is definitely present in 3.18.y.
> > > 
> > > Would you please consider applying this commit to 3.18 ?  It appears
> > > to apply cleanly.
> > 
> > Added, thanks!
> 
> Thanks for your attention.
> 
> Forgive me if I'm missing something obvious, but: I just fetched
>   git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable
> and there the ref stable/linux-3.18.y was not updated and remains at
> 3cab355c2ff3a781b6ebe9d1a25bd4ebc1207430 aka v3.18.43.
> 
> When you say "added", do you mean it is in some branch of yours which
> will be pushed later ?
> 
> (I tried to find the answer to my question by typing random junk into
> general web search engines, but without success.)
> 

I can see Linux 3.18.44 at least here:
https://kernel.googlesource.com/pub/scm/linux/kernel/git/sashal/linux-stable/+/linux-3.18.y-queue

With the SMAP/PVOPS fix included:
https://kernel.googlesource.com/pub/scm/linux/kernel/git/sashal/linux-stable/+log/linux-3.18.y-queue


> Thanks,
> Ian.
> 


-- Pasi


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: 3.18.y missing "x86/cpu: Fix SMAP check in PVOPS environments"

[Levin, Alexander]

On Mon, Oct 24, 2016 at 06:37:14AM -0400, Ian Jackson wrote:
> Levin, Alexander writes ("Re: 3.18.y missing "x86/cpu: Fix SMAP check in PVOPS environments""):
> > On Tue, Oct 18, 2016 at 12:46:31PM -0400, Ian Jackson wrote:
> > > Hi.  It appears that 3.18.y is lacking 581b7f158fe0 "x86/cpu: Fix SMAP
> > > check in PVOPS environments".  Without this, it crashes when booting
> > > under Xen PVOPS on processors with the new SMAP feature.
> > > 
> > > Andrew Cooper tells me this bug is definitely present in 3.18.y.
> > > 
> > > Would you please consider applying this commit to 3.18 ?  It appears
> > > to apply cleanly.
> > 
> > Added, thanks!
> 
> Thanks for your attention.
> 
> Forgive me if I'm missing something obvious, but: I just fetched
>   git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable
> and there the ref stable/linux-3.18.y was not updated and remains at
> 3cab355c2ff3a781b6ebe9d1a25bd4ebc1207430 aka v3.18.43.
> 
> When you say "added", do you mean it is in some branch of yours which
> will be pushed later ?
> 
> (I tried to find the answer to my question by typing random junk into
> general web search engines, but without success.)

"added" as in added to the queue. If you fetch that tree again you should see it in now.

-- 

Thanks,
Sasha

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: 3.18.y missing "x86/cpu: Fix SMAP check in PVOPS environments"

[Ian Jackson]

Levin, Alexander writes ("Re: 3.18.y missing "x86/cpu: Fix SMAP check in PVOPS environments""):
> On Mon, Oct 24, 2016 at 06:37:14AM -0400, Ian Jackson wrote:
> > When you say "added", do you mean it is in some branch of yours which
> > will be pushed later ?
> > 
> > (I tried to find the answer to my question by typing random junk into
> > general web search engines, but without success.)
> 
> "added" as in added to the queue. If you fetch that tree again you should see it in now.

Great.  Indeed I can.  Thank you very much.

Regards,
Ian.

Re: 3.18.y missing "x86/cpu: Fix SMAP check in PVOPS environments"

[Ian Jackson]

Levin, Alexander writes ("Re: 3.18.y missing "x86/cpu: Fix SMAP check in PVOPS environments""):
> On Mon, Oct 24, 2016 at 06:37:14AM -0400, Ian Jackson wrote:
> > When you say "added", do you mean it is in some branch of yours which
> > will be pushed later ?
> > 
> > (I tried to find the answer to my question by typing random junk into
> > general web search engines, but without success.)
> 
> "added" as in added to the queue. If you fetch that tree again you should see it in now.

Great.  Indeed I can.  Thank you very much.

Regards,
Ian.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel