Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752173AbcCRBoT (ORCPT ); Thu, 17 Mar 2016 21:44:19 -0400 Received: from mail-oi0-f48.google.com ([209.85.218.48]:33910 "EHLO mail-oi0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752139AbcCRBoM (ORCPT ); Thu, 17 Mar 2016 21:44:12 -0400 MIME-Version: 1.0 In-Reply-To: <1458130769-24963-1-git-send-email-bp@alien8.de> References: <1458130769-24963-1-git-send-email-bp@alien8.de> From: Andy Lutomirski Date: Thu, 17 Mar 2016 18:43:51 -0700 Message-ID: Subject: Re: [PATCH] x86/cpu: Do the feature test first in enable_sep_cpu() To: Borislav Petkov Cc: X86 ML , LKML Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1324 Lines: 52 On Wed, Mar 16, 2016 at 5:19 AM, Borislav Petkov wrote: > From: Borislav Petkov > > ... before assigning local vars. Kill out label too and simplify. > > No functionality change. Acked-by: Andy Lutomirski > > Signed-off-by: Borislav Petkov > --- > arch/x86/kernel/cpu/common.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c > index 249461f95851..63658d23d3dd 100644 > --- a/arch/x86/kernel/cpu/common.c > +++ b/arch/x86/kernel/cpu/common.c > @@ -1030,12 +1030,12 @@ void enable_sep_cpu(void) > struct tss_struct *tss; > int cpu; > > + if (!boot_cpu_has(X86_FEATURE_SEP)) > + return; > + > cpu = get_cpu(); > tss = &per_cpu(cpu_tss, cpu); > > - if (!boot_cpu_has(X86_FEATURE_SEP)) > - goto out; > - > /* > * We cache MSR_IA32_SYSENTER_CS's value in the TSS's ss1 field -- > * see the big comment in struct x86_hw_tss's definition. > @@ -1050,7 +1050,6 @@ void enable_sep_cpu(void) > > wrmsr(MSR_IA32_SYSENTER_EIP, (unsigned long)entry_SYSENTER_32, 0); > > -out: > put_cpu(); > } > #endif > -- > 2.7.3 > -- Andy Lutomirski AMA Capital Management, LLC