From patchwork Thu Jun 28 11:58:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 10493679 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 53BFA60325 for ; Thu, 28 Jun 2018 11:58:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A67529C26 for ; Thu, 28 Jun 2018 11:58:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C48B29C33; Thu, 28 Jun 2018 11:58:10 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A7B0B29C26 for ; Thu, 28 Jun 2018 11:58:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932205AbeF1L6H (ORCPT ); Thu, 28 Jun 2018 07:58:07 -0400 Received: from mail-io0-f175.google.com ([209.85.223.175]:45453 "EHLO mail-io0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932078AbeF1L6G (ORCPT ); Thu, 28 Jun 2018 07:58:06 -0400 Received: by mail-io0-f175.google.com with SMTP id l25-v6so4959972ioh.12 for ; Thu, 28 Jun 2018 04:58:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to:cc; bh=IFVW6uLj3Jt6F2ELxf3JWRYiRXxgmTYhyxXyVxvNx1Q=; b=g2teUS2pyZs8T2K3MUplDJbCGb9nvonxfPiIoCDnpYH3PuIanyNLsSovBWAohSWl/T zqAtGKUtuVtBZol3S3VTOfarc0M8rldFB85hpijm1TFc2GSNet919vc+Emu2fxf+tZ/n Exe8rsk3eOX4enUL53vHpDZMX3PgYg2OS0B61dqraYCL9weG++L/lU7G3FSLiZs7Rnkv g+kneQo0z7OiZKhW2h1Y8tOOzG8HZ5popQ0ASRSRQgkgJ26dn8cstN7qsmT74vC9m6s6 07bAOwfJFAED96i2D7/lK9U60HWH7rNqnFXzSbGKxe7ldcGal62hHgjabF5sbhElbqBC dMjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=IFVW6uLj3Jt6F2ELxf3JWRYiRXxgmTYhyxXyVxvNx1Q=; b=AYE4PeyE5grNVETFKr0ghPUf+Heob8RjKR6ERxMSNHVqIp+KSMl0Y8jt9ilAGjet07 wyl7fjX7TVwZpiFhA6HxfTbI2v9BEvc4Uxrq67ccqhRrhlFjBVV+jM/9Ebg2eeSSWgz8 eXmjdiz0YGtiSZQiUECbWkpVEMTwp8KAU5zSc2NQgwNtcD4pPQDK2vKTApP6IHTKah5Z AM/cEGeBzZ5fXqiC/2mIpD/lfaQWOwfF2HQCvU0FbQC0G/4agwFbtYP15W02votHqYVo GguwlHk+yyUbovCpNbs3RADYO+o55JxdBtnUcjNBHKABDeVGygSWVu5EY6kYkM5MFF8d UHHg== X-Gm-Message-State: APt69E0NgY34IMqVuDMeEQ23wEvzxzEZY1eBe4oxiDOf/HbOl/8o8N+l +CqwW9ErcMA5xHzxSNzPs156tDYIas4AnZ1F554= X-Google-Smtp-Source: AAOMgpcXEqmwAlds6QVum+Rd/Do+68627sA0LSZ2r52Hsxzg24bxINWAx1cMRBK5hcw41wcHIA7gGrv0KFkM4+xz3PU= X-Received: by 2002:a6b:16c7:: with SMTP id 190-v6mr8482296iow.221.1530187085883; Thu, 28 Jun 2018 04:58:05 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:2e51:0:0:0:0:0 with HTTP; Thu, 28 Jun 2018 04:58:05 -0700 (PDT) From: Uros Bizjak Date: Thu, 28 Jun 2018 13:58:05 +0200 Message-ID: Subject: [PATCH] KVM/x86: Use CC_SET()/CC_OUT in arch/x86/kvm/vmx.c To: pbonzini@redhat.com, rkrcmar@redhat.com Cc: kvm@vger.kernel.org Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP KVM/x86: Use CC_SET()/CC_OUT in arch/x86/kvm/vmx.c Remove open-coded uses of set instructions to use CC_SET()/CC_OUT() in arch/x86/kvm/vmx.c. Signed-off-by: Uros Bizjak diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 1689f433f3a0..66d536c306d8 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -38,6 +38,7 @@ #include "kvm_cache_regs.h" #include "x86.h" +#include #include #include #include @@ -1826,11 +1827,12 @@ static inline void __invvpid(int ext, u16 vpid, gva_t gva) u64 rsvd : 48; u64 gva; } operand = { vpid, 0, gva }; + bool error; - asm volatile (__ex(ASM_VMX_INVVPID) - /* CF==1 or ZF==1 --> rc = -1 */ - "; ja 1f ; ud2 ; 1:" - : : "a"(&operand), "c"(ext) : "cc", "memory"); + asm volatile (__ex(ASM_VMX_INVVPID) CC_SET(na) + : CC_OUT(na) (error) : "a"(&operand), "c"(ext) + : "memory"); + BUG_ON(error); } static inline void __invept(int ext, u64 eptp, gpa_t gpa) @@ -1838,11 +1840,12 @@ static inline void __invept(int ext, u64 eptp, gpa_t gpa) struct { u64 eptp, gpa; } operand = {eptp, gpa}; + bool error; - asm volatile (__ex(ASM_VMX_INVEPT) - /* CF==1 or ZF==1 --> rc = -1 */ - "; ja 1f ; ud2 ; 1:\n" - : : "a" (&operand), "c" (ext) : "cc", "memory"); + asm volatile (__ex(ASM_VMX_INVEPT) CC_SET(na) + : CC_OUT(na) (error) : "a" (&operand), "c" (ext) + : "memory"); + BUG_ON(error); } static struct shared_msr_entry *find_msr_entry(struct vcpu_vmx *vmx, u32 msr) @@ -1858,11 +1861,11 @@ static struct shared_msr_entry *find_msr_entry(struct vcpu_vmx *vmx, u32 msr) static void vmcs_clear(struct vmcs *vmcs) { u64 phys_addr = __pa(vmcs); - u8 error; + bool error; - asm volatile (__ex(ASM_VMX_VMCLEAR_RAX) "; setna %0" - : "=qm"(error) : "a"(&phys_addr), "m"(phys_addr) - : "cc", "memory"); + asm volatile (__ex(ASM_VMX_VMCLEAR_RAX) CC_SET(na) + : CC_OUT(na) (error) : "a"(&phys_addr), "m"(phys_addr) + : "memory"); if (error) printk(KERN_ERR "kvm: vmclear fail: %p/%llx\n", vmcs, phys_addr); @@ -1880,14 +1883,14 @@ static inline void loaded_vmcs_init(struct loaded_vmcs *loaded_vmcs) static void vmcs_load(struct vmcs *vmcs) { u64 phys_addr = __pa(vmcs); - u8 error; + bool error; if (static_branch_unlikely(&enable_evmcs)) return evmcs_load(phys_addr); - asm volatile (__ex(ASM_VMX_VMPTRLD_RAX) "; setna %0" - : "=qm"(error) : "a"(&phys_addr), "m"(phys_addr) - : "cc", "memory"); + asm volatile (__ex(ASM_VMX_VMPTRLD_RAX) CC_SET(na) + : CC_OUT(na) (error) : "a"(&phys_addr), "m"(phys_addr) + : "memory"); if (error) printk(KERN_ERR "kvm: vmptrld %p/%llx failed\n", vmcs, phys_addr); @@ -2100,10 +2103,10 @@ static noinline void vmwrite_error(unsigned long field, unsigned long value) static __always_inline void __vmcs_writel(unsigned long field, unsigned long value) { - u8 error; + bool error; - asm volatile (__ex(ASM_VMX_VMWRITE_RAX_RDX) "; setna %0" - : "=q"(error) : "a"(value), "d"(field) : "cc"); + asm volatile (__ex(ASM_VMX_VMWRITE_RAX_RDX) CC_SET(na) + : CC_OUT(na) (error) : "a"(value), "d"(field)); if (unlikely(error)) vmwrite_error(field, value); }