From mboxrd@z Thu Jan 1 00:00:00 1970 From: Feng Wu Subject: [PATCH v3 5/5] x86: Use alternative mechanism to define CLAC/STAC Date: Fri, 30 May 2014 16:56:25 +0800 Message-ID: <1401440185-11266-6-git-send-email-feng.wu@intel.com> References: <1401440185-11266-1-git-send-email-feng.wu@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1401440185-11266-1-git-send-email-feng.wu@intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Feng Wu , ian.campbell@citrix.com, andrew.cooper3@citrix.com, tim@xen.org, keir.xen@gmail.com, stefano.stabellini@citrix.com, JBeulich@suse.com, boris.ostrovsky@oracle.com List-Id: xen-devel@lists.xenproject.org This patch use alternative mechanism to define CLAC/STAC. Signed-off-by: Feng Wu Reviewed-by: Andrew Cooper --- xen/include/asm-x86/asm_defns.h | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index 87a462f..f8ef1f8 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -10,6 +10,7 @@ #include #include #include +#include #ifndef __ASSEMBLY__ void ret_from_intr(void); @@ -166,26 +167,28 @@ void ret_from_intr(void); #define __ASM_STAC .byte 0x0f,0x01,0xcb #ifdef __ASSEMBLY__ -#define ASM_AC(op) \ - btl $X86_FEATURE_SMAP & 31, \ - CPUINFO_FEATURE_OFFSET(X86_FEATURE_SMAP)+boot_cpu_data(%rip); \ - jnc 881f; \ - __ASM_##op; \ -881: +#define ASM_AC(op) \ + 661: ASM_NOP3; \ + .pushsection .altinstr_replacement, "ax"; \ + 662: __ASM_##op; \ + .popsection; \ + .pushsection .altinstructions, "a"; \ + altinstruction_entry 661b, 662b, X86_FEATURE_SMAP, 3, 3; \ + .popsection #define ASM_STAC ASM_AC(STAC) #define ASM_CLAC ASM_AC(CLAC) #else static inline void clac(void) { - if ( boot_cpu_has(X86_FEATURE_SMAP) ) - asm volatile (__stringify(__ASM_CLAC) : : : "memory"); + /* Note: a barrier is implicit in alternative() */ + alternative(ASM_NOP3, __stringify(__ASM_CLAC), X86_FEATURE_SMAP); } static inline void stac(void) { - if ( boot_cpu_has(X86_FEATURE_SMAP) ) - asm volatile (__stringify(__ASM_STAC) : : : "memory"); + /* Note: a barrier is implicit in alternative() */ + alternative(ASM_NOP3, __stringify(__ASM_STAC), X86_FEATURE_SMAP); } #endif -- 1.8.3.1