Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 13 Jul 2022 09:27:03 -0700
From:   Nathan Chancellor <nathan@kernel.org>
To:     Peter Zijlstra <peterz@infradead.org>
Cc:     Linus Torvalds <torvalds@linux-foundation.org>, x86@kernel.org,
        Nick Desaulniers <ndesaulniers@google.com>,
        Josh Poimboeuf <jpoimboe@kernel.org>,
        linux-kernel@vger.kernel.org, llvm@lists.linux.dev,
        stable@vger.kernel.org, kernel test robot <lkp@intel.com>
Subject: Re: [PATCH v2] x86/speculation: Use DECLARE_PER_CPU for
 x86_spec_ctrl_current
Message-ID: <Ys7yV0VGXyxX3VWj@dev-arch.thelio-3990X>
References: <20220713152436.2294819-1-nathan@kernel.org>
 <Ys7xUVjpNyXY0nXf@hirez.programming.kicks-ass.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <Ys7xUVjpNyXY0nXf@hirez.programming.kicks-ass.net>
Precedence: bulk

On Wed, Jul 13, 2022 at 06:22:41PM +0200, Peter Zijlstra wrote:
> On Wed, Jul 13, 2022 at 08:24:37AM -0700, Nathan Chancellor wrote:
> > Clang warns:
> > 
> >   arch/x86/kernel/cpu/bugs.c:58:21: error: section attribute is specified on redeclared variable [-Werror,-Wsection]
> >   DEFINE_PER_CPU(u64, x86_spec_ctrl_current);
> >                       ^
> >   arch/x86/include/asm/nospec-branch.h:283:12: note: previous declaration is here
> >   extern u64 x86_spec_ctrl_current;
> >              ^
> >   1 error generated.
> > 
> > The declaration should be using DECLARE_PER_CPU instead so all
> > attributes stay in sync.
> > 
> > Cc: stable@vger.kernel.org
> > Fixes: fc02735b14ff ("KVM: VMX: Prevent guest RSB poisoning attacks with eIBRS")
> > Reported-by: kernel test robot <lkp@intel.com>
> > Signed-off-by: Nathan Chancellor <nathan@kernel.org>
> > ---
> > 
> > v1 -> v2: https://lore.kernel.org/20220713152222.1697913-1-nathan@kernel.org/
> > 
> > * Use asm/percpu.h instead of linux/percpu.h to avoid static call
> >   include errors.
> > 
> >  arch/x86/include/asm/nospec-branch.h | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
> > index bb05ed4f46bd..10a3bfc1eb23 100644
> > --- a/arch/x86/include/asm/nospec-branch.h
> > +++ b/arch/x86/include/asm/nospec-branch.h
> > @@ -11,6 +11,7 @@
> >  #include <asm/cpufeatures.h>
> >  #include <asm/msr-index.h>
> >  #include <asm/unwind_hints.h>
> > +#include <asm/percpu.h>
> >  
> >  #define RETPOLINE_THUNK_SIZE	32
> >  
> 
> When I tried this earlier today I ran into cyclic headers, you sure this
> works?

Yes, I did my regular set of x86 builds with clang and they all passed.

Cheers,
Nathan