Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1357876ybz; Wed, 22 Apr 2020 19:29:19 -0700 (PDT) X-Google-Smtp-Source: APiQypIv8uVp4WgTej01IUx5t8vkU9z6YkQWnr0vU/wPu6D2p4UZPGS3rsuOJDqxfknEF6idHqqm X-Received: by 2002:a17:906:4eda:: with SMTP id i26mr977557ejv.180.1587608959399; Wed, 22 Apr 2020 19:29:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587608959; cv=none; d=google.com; s=arc-20160816; b=VZMew1Wvn6wrCEZRjGZHyDNG3EC2/BQUPPIr++ZzMuu2HCz9YXpcxcja10TDg/4uz3 1lTP0mQRcSwAQMroCnG5zNTBLfdzCErXi7197UGvlbjLxjhPeVcx2Besw8gTKqQBs5qg Nix2vt1Qkc8CLD10VGeRudnkAYL9FGXyLE06YovFs8vWlzhLg0lxlS8cSHKk0fSSsHA7 MzqxNDXbLHMWzN0ULnD38/IUZSK1kkZFX4yGraoIU9MxJSfZXRZ+KznbZH2rFRBfpEgs TMdfyxEERB6fVPolLnmb9LaDza6YJJ/vvZX4B2s9DW85aclfnDcynRTANdd+EviQRFkz iOhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=ivhVObM3odEBiDtvsJMNw4MGwlb+/BBDrYUvT6JUVXI=; b=Hy060tkrAANDwxqOqV9610Fb1A1NjLMfskR0KmwGRxEOKbhnr4CBR9mqEuIeNN34po OgQkzIfCyC814LlpFCjfW5o0sNw2BXQYYDhxHGoK6qUC8l/8GktEsNBqcZupBteaPerh ddtdI/H3SVDqSYyemn+diRIdc5dJa+ejh8ehV/KgASjcRNbR8pmU+Qh9paD0pirsbqEQ qvFrYtQIYfAOdz4bYBVRKHnLpvHKRB6IYg8QnxAYJa+ms1/DnooEgIwh0oY/CiCN/UDk Ei0xzZCwxGKk/rVf/oL6dwJ0hQOI0voxVvlSx43fT7QEdJXc7EzzZNadyH6lY5ygzynO Ugyg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f23si534338ejf.414.2020.04.22.19.28.57; Wed, 22 Apr 2020 19:29:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726589AbgDWCZ7 (ORCPT + 99 others); Wed, 22 Apr 2020 22:25:59 -0400 Received: from mga06.intel.com ([134.134.136.31]:33065 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726531AbgDWCZz (ORCPT ); Wed, 22 Apr 2020 22:25:55 -0400 IronPort-SDR: s26WKoNGj5W2M59TxkXILsFSB1Je+Uj1rJbxRAskXpvlmonW0liYBYoSenEARcxjoD6lINeAwy dYLGgqx0cdoA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2020 19:25:55 -0700 IronPort-SDR: IWz/jX4EuR4wSESpckY98nIQ4T88r/8JDElm83svD7uN6k3ik1kR72U4AaC3BiaZDIM/NW4FKc vU/CnIn3QrSg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,305,1583222400"; d="scan'208";a="259273970" Received: from sjchrist-coffee.jf.intel.com ([10.54.74.202]) by orsmga006.jf.intel.com with ESMTP; 22 Apr 2020 19:25:54 -0700 From: Sean Christopherson To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Oliver Upton , Peter Shier Subject: [PATCH 13/13] KVM: VMX: Use vmx_get_rflags() to query RFLAGS in vmx_interrupt_blocked() Date: Wed, 22 Apr 2020 19:25:50 -0700 Message-Id: <20200423022550.15113-14-sean.j.christopherson@intel.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200423022550.15113-1-sean.j.christopherson@intel.com> References: <20200423022550.15113-1-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use vmx_get_rflags() instead of manually reading vmcs.GUEST_RFLAGS when querying RFLAGS.IF so that multiple checks against interrupt blocking in a single run loop only require a single VMREAD. Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 68b3748b5383..9c4dd481b588 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -4537,7 +4537,7 @@ bool vmx_interrupt_blocked(struct kvm_vcpu *vcpu) if (is_guest_mode(vcpu) && nested_exit_on_intr(vcpu)) return false; - return !(vmcs_readl(GUEST_RFLAGS) & X86_EFLAGS_IF) || + return !(vmx_get_rflags(vcpu) & X86_EFLAGS_IF) || (vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) & (GUEST_INTR_STATE_STI | GUEST_INTR_STATE_MOV_SS)); } -- 2.26.0