Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp1107233imm; Fri, 22 Jun 2018 10:25:56 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKOsKflaAZSsvlRrAVhz4bS/ZjCz09+ltRfbSZSUP9nnovVeeLDRgbqi/iuOHiYe/hx8ToH X-Received: by 2002:a17:902:70ca:: with SMTP id l10-v6mr2614700plt.174.1529688356439; Fri, 22 Jun 2018 10:25:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529688356; cv=none; d=google.com; s=arc-20160816; b=hjpTma/Bk8hLmVZ/CWOkHuES5jadJEJlF/GGrzEsbWmegAJ+FeZIQchcVzCRelCV9X 9KELCMgE2JnBlPrq5UoomuqDWdoe1w78EPgzhmgKk5ra4KhIoBbVPj9qA4KY/Mm4yyG4 VaI7cHQTdiAv5X7RMc6+IAVXyfOleIK1LjdfUsNL1wn+Eq9Zm8nIKkAWK5eMvym+Gvz0 CR2C/AW/ueyoONQF+nN0NzIcrnp/o7Zsuy4SvTAS7WuUDUxlJAlOeFOv75GFQvMoy/Iq cQ6MxtGBJ1j9Kt1UggKYXH0NtfTfGLsUKDhbbHguVGElOdWUWIWnzY/IjWtMZh3o+PIG TCRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=cjagv8YBC8VY4YWKqqQZzMh4aYFbPkTiEOfha5z01Aw=; b=izFPXKZ2cV3zXwZE3AzQvmitwPf+oWJG6oadLnI4CdRQGUHNUhJpUHGkNHcGxQtu14 MKXxXkbQE1dLA3mTpoADkmFnllZ7UWdj8SAZCG9djFmIH2uSDQc/4f0ek5U59HfHn7n5 Owa92hwWM+wBp2Yql6SxuWmYvrHlk5BoVYqnC8xJ/Xg92nfhuHySLAK2VX8oxoLu4jQ+ wTqLWkH6vjvHvpSZC2HNiT3+L48ZuL0RjKcYY7fePNXGlvF9YFoUo41sw6W1hvIZYMip l4zK0bJ8nLyL1QrGzRI0/pbSvKTaZEsyAPE3ZoqlO5FFSWCum9J2/VrZjV15VsBPHd8S i80w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vmware.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v4-v6si7286161pfm.151.2018.06.22.10.25.42; Fri, 22 Jun 2018 10:25:56 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vmware.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934229AbeFVRYU (ORCPT + 99 others); Fri, 22 Jun 2018 13:24:20 -0400 Received: from ex13-edg-ou-001.vmware.com ([208.91.0.189]:17636 "EHLO EX13-EDG-OU-001.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933815AbeFVRWo (ORCPT ); Fri, 22 Jun 2018 13:22:44 -0400 Received: from sc9-mailhost3.vmware.com (10.113.161.73) by EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id 15.0.1156.6; Fri, 22 Jun 2018 10:22:05 -0700 Received: from sc2-haas01-esx0118.eng.vmware.com (sc2-haas01-esx0118.eng.vmware.com [10.172.44.118]) by sc9-mailhost3.vmware.com (Postfix) with ESMTP id 2CE3F4062A; Fri, 22 Jun 2018 10:22:42 -0700 (PDT) From: Nadav Amit To: , CC: Nadav Amit , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Subject: [PATCH v6 8/9] x86: cpufeature: use macros instead of inline assembly Date: Fri, 22 Jun 2018 10:22:11 -0700 Message-ID: <20180622172212.199633-9-namit@vmware.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180622172212.199633-1-namit@vmware.com> References: <20180622172212.199633-1-namit@vmware.com> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: None (EX13-EDG-OU-001.vmware.com: namit@vmware.com does not designate permitted sender hosts) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use assembly macros for static_cpu_has() and call them from inline assembly. This not only makes the code more readable, but also improves compilation decision, specifically inline decisions which GCC base on the number of new lines in inline assembly. The patch slightly increases the kernel size: text data bss dec hex filename 18162879 10226256 2957312 31346447 1de4f0f ./vmlinux before 18163528 10226300 2957312 31347140 1de51c4 ./vmlinux after (+693) And enables the inlining of function such as free_ldt_pgtables(). Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: x86@kernel.org Acked-by: Peter Zijlstra (Intel) Signed-off-by: Nadav Amit --- arch/x86/include/asm/cpufeature.h | 82 ++++++++++++++++++------------- arch/x86/kernel/macros.S | 1 + 2 files changed, 48 insertions(+), 35 deletions(-) diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index aced6c9290d6..7d442722ef24 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -2,10 +2,10 @@ #ifndef _ASM_X86_CPUFEATURE_H #define _ASM_X86_CPUFEATURE_H -#include - -#if defined(__KERNEL__) && !defined(__ASSEMBLY__) +#ifdef __KERNEL__ +#ifndef __ASSEMBLY__ +#include #include #include @@ -161,37 +161,10 @@ extern void clear_cpu_cap(struct cpuinfo_x86 *c, unsigned int bit); */ static __always_inline __pure bool _static_cpu_has(u16 bit) { - asm_volatile_goto("1: jmp 6f\n" - "2:\n" - ".skip -(((5f-4f) - (2b-1b)) > 0) * " - "((5f-4f) - (2b-1b)),0x90\n" - "3:\n" - ".section .altinstructions,\"a\"\n" - " .long 1b - .\n" /* src offset */ - " .long 4f - .\n" /* repl offset */ - " .word %P[always]\n" /* always replace */ - " .byte 3b - 1b\n" /* src len */ - " .byte 5f - 4f\n" /* repl len */ - " .byte 3b - 2b\n" /* pad len */ - ".previous\n" - ".section .altinstr_replacement,\"ax\"\n" - "4: jmp %l[t_no]\n" - "5:\n" - ".previous\n" - ".section .altinstructions,\"a\"\n" - " .long 1b - .\n" /* src offset */ - " .long 0\n" /* no replacement */ - " .word %P[feature]\n" /* feature bit */ - " .byte 3b - 1b\n" /* src len */ - " .byte 0\n" /* repl len */ - " .byte 0\n" /* pad len */ - ".previous\n" - ".section .altinstr_aux,\"ax\"\n" - "6:\n" - " testb %[bitnum],%[cap_byte]\n" - " jnz %l[t_yes]\n" - " jmp %l[t_no]\n" - ".previous\n" + asm_volatile_goto("STATIC_CPU_HAS bitnum=%[bitnum] " + "cap_byte=\"%[cap_byte]\" " + "feature=%P[feature] t_yes=%l[t_yes] " + "t_no=%l[t_no] always=%P[always]" : : [feature] "i" (bit), [always] "i" (X86_FEATURE_ALWAYS), [bitnum] "i" (1 << (bit & 7)), @@ -226,5 +199,44 @@ static __always_inline __pure bool _static_cpu_has(u16 bit) #define CPU_FEATURE_TYPEVAL boot_cpu_data.x86_vendor, boot_cpu_data.x86, \ boot_cpu_data.x86_model -#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */ +#else /* __ASSEMBLY__ */ + +.macro STATIC_CPU_HAS bitnum:req cap_byte:req feature:req t_yes:req t_no:req always:req +1: + jmp 6f +2: + .skip -(((5f-4f) - (2b-1b)) > 0) * ((5f-4f) - (2b-1b)),0x90 +3: + .section .altinstructions,"a" + .long 1b - . /* src offset */ + .long 4f - . /* repl offset */ + .word \always /* always replace */ + .byte 3b - 1b /* src len */ + .byte 5f - 4f /* repl len */ + .byte 3b - 2b /* pad len */ + .previous + .section .altinstr_replacement,"ax" +4: + jmp \t_no +5: + .previous + .section .altinstructions,"a" + .long 1b - . /* src offset */ + .long 0 /* no replacement */ + .word \feature /* feature bit */ + .byte 3b - 1b /* src len */ + .byte 0 /* repl len */ + .byte 0 /* pad len */ + .previous + .section .altinstr_aux,"ax" +6: + testb \bitnum,\cap_byte + jnz \t_yes + jmp \t_no + .previous +.endm + +#endif /* __ASSEMBLY__ */ + +#endif /* __KERNEL__ */ #endif /* _ASM_X86_CPUFEATURE_H */ diff --git a/arch/x86/kernel/macros.S b/arch/x86/kernel/macros.S index 7baa40d5bf16..bf8b9c93e255 100644 --- a/arch/x86/kernel/macros.S +++ b/arch/x86/kernel/macros.S @@ -12,3 +12,4 @@ #include #include #include +#include -- 2.17.1