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;
Reply-To: zhenzhong.duan@oracle.com
Subject: Re: [PATCH] x86/speculation: Use AMD specific retpoline for inline
 asm on AMD
To:     Peter Zijlstra <peterz@infradead.org>
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
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>
From:   Zhenzhong Duan <zhenzhong.duan@oracle.com>
Organization: Oracle
Message-ID: <1c6ca05f-094e-03e9-b21a-866aaf80cebb@oracle.com>
Date:   Tue, 18 Sep 2018 20:04:44 +0800
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101
 Thunderbird/52.9.1
MIME-Version: 1.0
In-Reply-To: <20180918105939.GK24106@hirez.programming.kicks-ass.net>
Content-Type: text/plain; charset=gbk; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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?
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?

Thanks
Zhenzhong