Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1356763ybz; Wed, 22 Apr 2020 19:27:27 -0700 (PDT) X-Google-Smtp-Source: APiQypI6xvybDbkM6qelB2w55uwK8/+1HMJ8nqN9ZvrzpRStvAKiyprE7iMS4NcDYBRX8HGr5sjx X-Received: by 2002:aa7:d481:: with SMTP id b1mr1147179edr.226.1587608847194; Wed, 22 Apr 2020 19:27:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587608847; cv=none; d=google.com; s=arc-20160816; b=c8Wk69LHq6ARpWXZ0tZIgUN/p51qoK1g5hsaSZSRe3vrVdU23l7XVB2D+cCVvY0B+V +0DziW4SMWodhvuYXMw58qwac/Vkq9XoQNSbd+1dpfJNeItOWBWOsxI1kOe6uNspUgFe fOWPqAFHk8VO+L6fumExw3yFXzMlqQkzOIvEbPsEEZXSOGvb3t2XJI/na4nbPMWL2+M3 zudSrloTZcaJIc4O+mlwonsgcvB2R6B/kfJR0j3/yy58PpG52YXochgE7vXPfV0GvZVT Psk10ICAlcgBN6dLhws5XjH0H0PS2nB7SBO3wPnB915ehUCMindAmWhZtjYH6E/lxTpb AgFw== 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=ucFI4q4uCjdMYqxdjjTjrP+jE50+KDE7F+rv5lhyWhs=; b=o3PZhz7+XUpzGeNUKzWX8Flo2n7K6hC01bpUhlGXYcr2ZGD48JWVx6JijziXy1z0zF LJ+NK8+zbyJXx9JfZUTFBObWyhwA9ig1j+bEf1OHTUa/+Zqwzuf+HI7l5OPWNd4H/wkJ HX1TYDXD6u8E7pYS6rmLnsen7ZF6xxYyBGzDjR0/30Z4BZwGViGVdAt9pqrpOrGVvFf3 xSDe2/gVWrVnCzYj21Y2udp1HkcUGNi03G6Ez3uEUG6XnDrZkwRAJovlS1cOLnBIwh+S 8x6y8HrNdy2x4PkW5A0awTz1C6NBNmYXnfYwSzNzCqNZIvh+ZEVetdwMCyMpX2RHiWK+ QyIQ== 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 q10si466276edr.310.2020.04.22.19.27.04; Wed, 22 Apr 2020 19:27:27 -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 S1726609AbgDWC0A (ORCPT + 99 others); Wed, 22 Apr 2020 22:26:00 -0400 Received: from mga05.intel.com ([192.55.52.43]:43420 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726046AbgDWCZ6 (ORCPT ); Wed, 22 Apr 2020 22:25:58 -0400 IronPort-SDR: wM19L4gr9oxiPfoATnG+pwzDYYhXm2MgaLMssCFyKiY2NDUtM788cs3FSZq+DJRdgLh3HKf14J uxN5g3GCLQow== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Apr 2020 19:25:54 -0700 IronPort-SDR: PVnCEJYehreoWf0lBzr4dNWvVBTu0u3jmAHrc6AlP3H9rww3JzHGd3riVr/szbSOwSGPe2xgEt pHfBmuMwlx6Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,305,1583222400"; d="scan'208";a="259273947" 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 06/13] KVM: nVMX: Report NMIs as allowed when in L2 and Exit-on-NMI is set Date: Wed, 22 Apr 2020 19:25:43 -0700 Message-Id: <20200423022550.15113-7-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 Report NMIs as allowed when the vCPU is in L2 and L2 is being run with Exit-on-NMI enabled, as NMIs are always unblocked from L1's perspective in this case. Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/vmx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 7dd42e7fef94..c7bb9d90d441 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -4516,6 +4516,9 @@ static bool vmx_nmi_allowed(struct kvm_vcpu *vcpu) if (to_vmx(vcpu)->nested.nested_run_pending) return false; + if (is_guest_mode(vcpu) && nested_exit_on_nmi(vcpu)) + return true; + if (!enable_vnmi && to_vmx(vcpu)->loaded_vmcs->soft_vnmi_blocked) return false; -- 2.26.0