From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932174AbcGTW0E (ORCPT ); Wed, 20 Jul 2016 18:26:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54318 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755328AbcGTWZ4 (ORCPT ); Wed, 20 Jul 2016 18:25:56 -0400 From: Bandan Das To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, rkrcmar@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] nvmx: use warn_on for buggy cases when emulating invept/invvpid Date: Wed, 20 Jul 2016 18:25:33 -0400 Message-Id: <1469053536-11130-2-git-send-email-bsd@redhat.com> In-Reply-To: <1469053536-11130-1-git-send-email-bsd@redhat.com> References: <1469053536-11130-1-git-send-email-bsd@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 20 Jul 2016 22:25:56 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If L1 hypervisor decides to try out something weird, alert the host but only less aggressively. Also, remove the comment regarding nested vpid support since it is no longer valid. Signed-off-by: Bandan Das --- arch/x86/kvm/vmx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 64a79f2..9fd0681 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2854,7 +2854,6 @@ static int vmx_get_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata) vmx->nested.nested_vmx_secondary_ctls_high); break; case MSR_IA32_VMX_EPT_VPID_CAP: - /* Currently, no nested vpid support */ *pdata = vmx->nested.nested_vmx_ept_caps | ((u64)vmx->nested.nested_vmx_vpid_caps << 32); break; @@ -7462,7 +7461,7 @@ static int handle_invept(struct kvm_vcpu *vcpu) break; default: /* Trap single context invalidation invept calls */ - BUG_ON(1); + WARN_ON(1); break; } @@ -7525,7 +7524,7 @@ static int handle_invvpid(struct kvm_vcpu *vcpu) break; default: /* Trap individual address invalidation invvpid calls */ - BUG_ON(1); + WARN_ON(1); break; } -- 2.5.5