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;
Date:   Thu, 20 Aug 2020 17:08:41 +0200
From:   peterz@infradead.org
To:     Brian Gerst <brgerst@gmail.com>
Cc:     "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>,
        Juergen Gross <jgross@suse.com>,
        Andy Lutomirski <luto@kernel.org>,
        Josh Poimboeuf <jpoimboe@redhat.com>
Subject: Re: [RFC][PATCH 4/7] x86/debug: Move historical SYSENTER junk into
 exc_debug_kernel()
Message-ID: <20200820150841.GB1362448@hirez.programming.kicks-ass.net>
References: <20200820103832.486877479@infradead.org>
 <20200820104905.294802764@infradead.org>
 <CAMzpN2gmCu0q_8gLAOcSuLjpKF+rNj=wiCFsGZXgNwz000HCvg@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAMzpN2gmCu0q_8gLAOcSuLjpKF+rNj=wiCFsGZXgNwz000HCvg@mail.gmail.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Thu, Aug 20, 2020 at 10:45:12AM -0400, Brian Gerst wrote:
> On Thu, Aug 20, 2020 at 6:53 AM Peter Zijlstra <peterz@infradead.org> wrote:
> >
> >
> > Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> > ---
> >  arch/x86/kernel/traps.c |   24 ++++++++++++------------
> >  1 file changed, 12 insertions(+), 12 deletions(-)
> >
> > --- a/arch/x86/kernel/traps.c
> > +++ b/arch/x86/kernel/traps.c
> > @@ -820,18 +820,6 @@ static void handle_debug(struct pt_regs
> >                 goto out;
> >         }
> >
> > -       if (WARN_ON_ONCE((dr6 & DR_STEP) && !user_mode(regs))) {
> > -               /*
> > -                * Historical junk that used to handle SYSENTER single-stepping.
> > -                * This should be unreachable now.  If we survive for a while
> > -                * without anyone hitting this warning, we'll turn this into
> > -                * an oops.
> > -                */
> > -               tsk->thread.debugreg6 &= ~DR_STEP;
> > -               set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
> > -               regs->flags &= ~X86_EFLAGS_TF;
> > -       }
> > -
> >         si_code = get_si_code(tsk->thread.debugreg6);
> >         if (tsk->thread.debugreg6 & (DR_STEP | DR_TRAP_BITS) || user_icebp)
> >                 send_sigtrap(regs, 0, si_code);
> > @@ -874,6 +862,18 @@ static __always_inline void exc_debug_ke
> >         if (kprobe_debug_handler(regs))
> >                 goto out;
> >
> > +       if (WARN_ON_ONCE(dr6 & DR_STEP)) {
> > +               /*
> > +                * Historical junk that used to handle SYSENTER single-stepping.
> > +                * This should be unreachable now.  If we survive for a while
> > +                * without anyone hitting this warning, we'll turn this into
> > +                * an oops.
> > +                */
> > +               dr6 &= ~DR_STEP;
> > +               set_thread_flag(TIF_SINGLESTEP);
> > +               regs->flags &= ~X86_EFLAGS_TF;
> > +       }
> > +
> >         handle_debug(regs, dr6, false);
> >
> >  out:
> 
> Can this be removed or changed to a BUG()?  The warning has been there
> since 2016 and nobody has apparently complained about it.

Something like:

	/*
	 * The kernel doesn't do TF outside of Kprobes, so if we get
	 * here, something's fishy.
	 */
	BUG_ON(dr6 & DR_STEP);

?