Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 18 Sep 2018 15:00:58 +0200
From:   Peter Zijlstra <peterz@infradead.org>
To:     Zhenzhong Duan <zhenzhong.duan@oracle.com>
Cc:     linux-kernel@vger.kernel.org, mingo@redhat.com,
        konrad.wilk@oracle.com, x86@kernel.org, dwmw@amazon.co.uk,
        tglx@linutronix.de, Srinivas REDDY Eeda <srinivas.eeda@oracle.com>,
        bp@suse.de, hpa@zytor.com, dhaval.giani@oracle.com
Subject: Re: [PATCH] x86/speculation: Use AMD specific retpoline for inline
 asm on AMD
Message-ID: <20180918130058.GM24106@hirez.programming.kicks-ass.net>
References: <87411705-893f-46d3-b899-b09ed9fa8d1b@default>
 <20180918095015.GE19234@hirez.programming.kicks-ass.net>
 <3fcc1453-1618-9a79-71c9-5eede0023775@oracle.com>
 <20180918105939.GK24106@hirez.programming.kicks-ass.net>
 <1c6ca05f-094e-03e9-b21a-866aaf80cebb@oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1c6ca05f-094e-03e9-b21a-866aaf80cebb@oracle.com>
User-Agent: Mutt/1.10.0 (2018-05-17)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Tue, Sep 18, 2018 at 08:04:44PM +0800, Zhenzhong Duan wrote:
> On 2018/9/18 18:59, Peter Zijlstra wrote:
> > On Tue, Sep 18, 2018 at 06:31:07PM +0800, Zhenzhong Duan wrote:
> > > On 2018/9/18 17:50, Peter Zijlstra wrote:
> > > > On Mon, Sep 17, 2018 at 10:17:30PM -0700, Zhenzhong Duan wrote:
> > > > > -#elif defined(CONFIG_X86_32) && defined(CONFIG_RETPOLINE)
> > > > > +#elif defined(CONFIG_RETPOLINE)
> > > > 
> > > > This doesn't make any sense..
> > > This change is used for x86_64 to have minimal Retpoline support when
> > > CONFIG_RETPOLINE is defined but RETPOLINE isn't defined, or I missed
> > > something?
> > 
> > No it doesn't.
> > 
> > #if defined(X86_64) && defined(RETPOLINE)
> > 
> >   /* x86_64 retpoline goes here */
> > 
> > #elif defined(RETPOLINE)
> > 
> >   /* !x86_64 retpoline goes here */
> > 
> > #else
> > 
> >   /* !retpoline goes here
> > 
> > #endif
> 
> Sorry, but I am confused.
> So where is 'if defined(x86_64) && !defined(RETPOLINE) &&
> defined(CONFIG_RETPOLINE)' go?

Argh, CONFIG_RETPOLINE vs RETPOLINE :/

The thing is, the one you modify has a comment on that explains why it
is i386 only. CET and retpolines don't like one another much.

And the x86_64 version uses %V which requires new GCC.

So I'm all for fixing the RETPOLINE_AMD thing, but at this point nobody
should use the minimal stuff, that's just delusional.

> In original code, it will go to "call *%[thunk_target]\n" while
> we have set SPECTRE_V2_RETPOLINE_MINIMAL or
> SPECTRE_V2_RETPOLINE_MINIMAL_AMD. Is this expected?

Yes, that is exactly right -- it does that with or without your change
though.