From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161100AbbBCTzT (ORCPT ); Tue, 3 Feb 2015 14:55:19 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:53643 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161078AbbBCTzO (ORCPT ); Tue, 3 Feb 2015 14:55:14 -0500 Message-ID: <54D1279F.5030705@amacapital.net> Date: Tue, 03 Feb 2015 11:55:11 -0800 From: Andy Lutomirski User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Borislav Petkov , X86 ML CC: LKML , Richard Weinberger Subject: Re: [PATCH v1 11/12] x86, alternative: Use alternative_2 in rdtsc_barrier References: <1422987390-17878-1-git-send-email-bp@alien8.de> <1422987390-17878-12-git-send-email-bp@alien8.de> In-Reply-To: <1422987390-17878-12-git-send-email-bp@alien8.de> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/03/2015 10:16 AM, Borislav Petkov wrote: > From: Borislav Petkov > > ... now that we have it. Hallelujah! Acked-by: Andy Lutomirski > > Cc: Richard Weinberger > Signed-off-by: Borislav Petkov > --- > arch/x86/include/asm/barrier.h | 6 ++---- > arch/x86/um/asm/barrier.h | 4 ++-- > 2 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h > index 2ab1eb33106e..959e45b81fe2 100644 > --- a/arch/x86/include/asm/barrier.h > +++ b/arch/x86/include/asm/barrier.h > @@ -95,13 +95,11 @@ do { \ > * Stop RDTSC speculation. This is needed when you need to use RDTSC > * (or get_cycles or vread that possibly accesses the TSC) in a defined > * code region. > - * > - * (Could use an alternative three way for this if there was one.) > */ > static __always_inline void rdtsc_barrier(void) > { > - alternative(ASM_NOP3, "mfence", X86_FEATURE_MFENCE_RDTSC); > - alternative(ASM_NOP3, "lfence", X86_FEATURE_LFENCE_RDTSC); > + alternative_2("", "mfence", X86_FEATURE_MFENCE_RDTSC, > + "lfence", X86_FEATURE_LFENCE_RDTSC); > } > > #endif /* _ASM_X86_BARRIER_H */ > diff --git a/arch/x86/um/asm/barrier.h b/arch/x86/um/asm/barrier.h > index 2d7d9a1f5b53..8ffd2146fa6a 100644 > --- a/arch/x86/um/asm/barrier.h > +++ b/arch/x86/um/asm/barrier.h > @@ -64,8 +64,8 @@ > */ > static inline void rdtsc_barrier(void) > { > - alternative(ASM_NOP3, "mfence", X86_FEATURE_MFENCE_RDTSC); > - alternative(ASM_NOP3, "lfence", X86_FEATURE_LFENCE_RDTSC); > + alternative_2("", "mfence", X86_FEATURE_MFENCE_RDTSC, > + "lfence", X86_FEATURE_LFENCE_RDTSC); > } > > #endif >