Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200902132549.496605622@infradead.org> <20200902133200.666781610@infradead.org>
 <CAMzpN2i9C5Sj-M0b9Y7VtOphDJs2Z9NPux9Dg347PSeNBaXRMQ@mail.gmail.com>
 <c6915915-1c94-70cf-453d-861a4ca2da4c@suse.com> <20200902163115.GM1362448@hirez.programming.kicks-ass.net>
In-Reply-To: <20200902163115.GM1362448@hirez.programming.kicks-ass.net>
From:   Brian Gerst <brgerst@gmail.com>
Date:   Wed, 2 Sep 2020 13:02:07 -0400
Message-ID: <CAMzpN2hRrx2R_wLT4imB3w9RApL1XK5SYcyXk5Cbp9fkY_s-Dg@mail.gmail.com>
Subject: Re: [PATCH 01/13] x86/entry: Fix AC assertion
To:     Peter Zijlstra <peterz@infradead.org>
Cc:     =?UTF-8?B?SsO8cmdlbiBHcm/Dnw==?= <jgross@suse.com>,
        "the arch/x86 maintainers" <x86@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Kyle Huey <me@kylehuey.com>,
        Alexandre Chartre <alexandre.chartre@oracle.com>,
        "Robert O'Callahan" <rocallahan@gmail.com>,
        "Paul E. McKenney" <paulmck@kernel.org>,
        Frederic Weisbecker <frederic@kernel.org>,
        Paolo Bonzini <pbonzini@redhat.com>,
        Sean Christopherson <sean.j.christopherson@intel.com>,
        Masami Hiramatsu <mhiramat@kernel.org>,
        Petr Mladek <pmladek@suse.com>,
        Steven Rostedt <rostedt@goodmis.org>,
        Joel Fernandes <joel@joelfernandes.org>,
        Boris Ostrovsky <boris.ostrovsky@oracle.com>,
        Andy Lutomirski <luto@kernel.org>,
        Josh Poimboeuf <jpoimboe@redhat.com>,
        Daniel Thompson <daniel.thompson@linaro.org>,
        Andrew Cooper <Andrew.Cooper3@citrix.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Wed, Sep 2, 2020 at 12:31 PM <peterz@infradead.org> wrote:
>
> On Wed, Sep 02, 2020 at 06:24:27PM +0200, J=C3=BCrgen Gro=C3=9F wrote:
> > On 02.09.20 17:58, Brian Gerst wrote:
> > > On Wed, Sep 2, 2020 at 9:38 AM Peter Zijlstra <peterz@infradead.org> =
wrote:
> > > >
> > > > From: Peter Zijlstra <peterz@infradead.org>
> > > >
> > > > The WARN added in commit 3c73b81a9164 ("x86/entry, selftests: Furth=
er
> > > > improve user entry sanity checks") unconditionally triggers on my I=
VB
> > > > machine because it does not support SMAP.
> > > >
> > > > For !SMAP hardware we patch out CLAC/STAC instructions and thus if
> > > > userspace sets AC, we'll still have it set after entry.
> > > >
> > > > Fixes: 3c73b81a9164 ("x86/entry, selftests: Further improve user en=
try sanity checks")
> > > > Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> > > > Acked-by: Andy Lutomirski <luto@kernel.org>
> > > > ---
> > > >   arch/x86/include/asm/entry-common.h |   11 +++++++++--
> > > >   1 file changed, 9 insertions(+), 2 deletions(-)
> > > >
> > > > --- a/arch/x86/include/asm/entry-common.h
> > > > +++ b/arch/x86/include/asm/entry-common.h
> > > > @@ -18,8 +18,16 @@ static __always_inline void arch_check_u
> > > >                   * state, not the interrupt state as imagined by X=
en.
> > > >                   */
> > > >                  unsigned long flags =3D native_save_fl();
> > > > -               WARN_ON_ONCE(flags & (X86_EFLAGS_AC | X86_EFLAGS_DF=
 |
> > > > -                                     X86_EFLAGS_NT));
> > > > +               unsigned long mask =3D X86_EFLAGS_DF | X86_EFLAGS_N=
T;
> > > > +
> > > > +               /*
> > > > +                * For !SMAP hardware we patch out CLAC on entry.
> > > > +                */
> > > > +               if (boot_cpu_has(X86_FEATURE_SMAP) ||
> > > > +                   (IS_ENABLED(CONFIG_64_BIT) && boot_cpu_has(X86_=
FEATURE_XENPV)))
> > > > +                       mask |=3D X86_EFLAGS_AC;
> > >
> > > Is the explicit Xen check necessary?  IIRC the Xen hypervisor will
> > > filter out the SMAP bit in the cpuid pvop.
> >
> > Right, and this test will nevertheless result in setting AC in the mask=
.
> > IIRC this was the main objective here.
>
> Correct, this asserts that 64bit Xen-PV will never have AC set; it had
> better not have it set since it runs in ring 3.

Ok.  That should be added to the comment to avoid confusion.

--
Brian Gerst