From patchwork Tue Jan 31 11:20:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Dyasli X-Patchwork-Id: 9546943 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E1457604A0 for ; Tue, 31 Jan 2017 11:23:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D39AA27BA5 for ; Tue, 31 Jan 2017 11:23:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C7FCF28338; Tue, 31 Jan 2017 11:23:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7140C27BA5 for ; Tue, 31 Jan 2017 11:23:04 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYWUj-0003Hq-Cz; Tue, 31 Jan 2017 11:21:05 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYWUi-0003Hb-ST for xen-devel@lists.xen.org; Tue, 31 Jan 2017 11:21:04 +0000 Received: from [85.158.143.35] by server-10.bemta-6.messagelabs.com id E8/07-13192-02370985; Tue, 31 Jan 2017 11:21:04 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphkeJIrShJLcpLzFFi42JxWrrBXle+eEK EQUsvo8WSj4tZHBg9ju7+zRTAGMWamZeUX5HAmrH7aB9bwRypit/bt7E2MG4W7mLk5JAQ8Jc4 NWE/E4jNJqAnsXH2KzBbREBWYnXXHPYuRi4OZoEjjBJTVx1hB0kIC5hKPG3rArNZBFQl/s26x 9zFyMHBK+AuseCqPMRMOYmb5zqZQWxOAQ+Jf6vesoDYQkAlR39PZ4ewVSVev9gFFucVEJQ4Of MJmM0sICFx8MUL5gmMvLOQpGYhSS1gZFrFqF6cWlSWWqRrqZdUlJmeUZKbmJmja2hgppebWly cmJ6ak5hUrJecn7uJERg6DECwg/HupoBDjJIcTEqivJ+FJ0QI8SXlp1RmJBZnxBeV5qQWH2KU 4eBQkuD9XQiUEyxKTU+tSMvMAQYxTFqCg0dJhPclSJq3uCAxtzgzHSJ1ilFRSpxXuggoIQCSy CjNg2uDRc4lRlkpYV5GoEOEeApSi3IzS1DlXzGKczAqCfN+BBnPk5lXAjf9FdBiJqDF7q/6QB aXJCKkpBoY+86GdvoxCIT52P/z/Xdo1plP6rPC3Z9aBRwKW2mw5r0bw2TvnHcHXTki7+izLp7 TYbv0N+OHmJi2+yvyot22PyiZVJ1bJlNu51r8/t+Mb92bl6jLN605K77gqKb6zyotzebexQ0f 7+nKfrz0fAPLgR3Ns50/au7hcNn1eI/A1xyv6cH3L9uUKrEUZyQaajEXFScCAPGuRuuXAgAA X-Env-Sender: prvs=197ca0e1a=sergey.dyasli@citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1485861660!49180160!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23341 invoked from network); 31 Jan 2017 11:21:02 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 31 Jan 2017 11:21:02 -0000 X-IronPort-AV: E=Sophos;i="5.33,314,1477958400"; d="scan'208";a="411964579" From: Sergey Dyasli To: Date: Tue, 31 Jan 2017 11:20:33 +0000 Message-ID: <1485861635-3473-3-git-send-email-sergey.dyasli@citrix.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485861635-3473-1-git-send-email-sergey.dyasli@citrix.com> References: <1485861635-3473-1-git-send-email-sergey.dyasli@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Kevin Tian , Jan Beulich , Jun Nakajima , Sergey Dyasli Subject: [Xen-devel] [PATCH 2/4] x86/vmx: improve __vmread_safe() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP The original function doesn't distinguish between Valid and Invalid VMfails. Improved function returns error code depending on the outcome: VMsucceed: 0 VMfailValid: VM Instruction Error Number VMfailInvalid: VMX_INSN_FAIL_INVALID (~0UL) Existing users of __vmread_safe() are updated. Signed-off-by: Sergey Dyasli --- xen/arch/x86/hvm/vmx/vmcs.c | 2 +- xen/arch/x86/hvm/vmx/vvmx.c | 2 +- xen/include/asm-x86/hvm/vmx/vmx.h | 41 +++++++++++++++++---------------------- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 59ef199..641e2ef 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1711,7 +1711,7 @@ static inline unsigned long vmr(unsigned long field) { unsigned long val; - return __vmread_safe(field, &val) ? val : 0; + return __vmread_safe(field, &val) ? 0 : val; } #define vmr16(fld) ({ \ diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 105a3c0..e0cf0fb 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -932,7 +932,7 @@ static inline void shadow_to_vvmcs(const struct vcpu *v, unsigned int field) { unsigned long value; - if ( __vmread_safe(field, &value) ) + if ( __vmread_safe(field, &value) == 0 ) set_vvmcs(v, field, value); } diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h index b0f3f3c..8d871cf 100644 --- a/xen/include/asm-x86/hvm/vmx/vmx.h +++ b/xen/include/asm-x86/hvm/vmx/vmx.h @@ -401,32 +401,27 @@ static always_inline void __vmwrite(unsigned long field, unsigned long value) ); } -static inline bool_t __vmread_safe(unsigned long field, unsigned long *value) +static inline unsigned long __vmread_safe(unsigned long field, + unsigned long *value) { - bool_t okay; + unsigned long ret = 0; + bool fail_invalid, fail_valid; - asm volatile ( -#ifdef HAVE_GAS_VMX - "vmread %2, %1\n\t" -#else - VMREAD_OPCODE MODRM_EAX_ECX -#endif - /* CF==1 or ZF==1 --> rc = 0 */ -#ifdef __GCC_ASM_FLAG_OUTPUTS__ - : "=@ccnbe" (okay), -#else - "setnbe %0" - : "=qm" (okay), -#endif -#ifdef HAVE_GAS_VMX - "=rm" (*value) - : "r" (field)); -#else - "=c" (*value) - : "a" (field)); -#endif + asm volatile ( GAS_VMX_OP("vmread %[field], %[value]\n", + VMREAD_OPCODE MODRM_EAX_ECX) + ASM_FLAG_OUT(, "setb %[fail_invalid]\n") + ASM_FLAG_OUT(, "sete %[fail_valid]\n") + : ASM_FLAG_OUT("=@ccb", [fail_invalid] "=rm") (fail_invalid), + ASM_FLAG_OUT("=@cce", [fail_valid] "=rm") (fail_valid), + [value] GAS_VMX_OP("=rm", "=c") (*value) + : [field] GAS_VMX_OP("r", "a") (field)); + + if ( fail_invalid ) + ret = VMX_INSN_FAIL_INVALID; + else if ( fail_valid ) + __vmread(VM_INSTRUCTION_ERROR, &ret); - return okay; + return ret; } static always_inline unsigned long __vmwrite_safe(unsigned long field,