From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D167DC3F68F for ; Wed, 15 Jan 2020 17:10:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C69D214AF for ; Wed, 15 Jan 2020 17:10:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SDC+l8Zp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729121AbgAORKZ (ORCPT ); Wed, 15 Jan 2020 12:10:25 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:27920 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726574AbgAORKX (ORCPT ); Wed, 15 Jan 2020 12:10:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579108221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gSI+9ZFmzhwau+7pGCHRYVf7K5e/ts+rnUbmZcA7/DU=; b=SDC+l8ZpxJXbV66Uxxt6EJNnExuqrAl2D85oGpNjLgZ+ToroTJ/H9McS0BxUTUBzAEOUUO VM25b4IHfP7TtIZ6Z86WnTtuciKW24b3xt03SLKPvjehicimy0Jm6yG5gtXhDu+ewDgLSB rrDaDia1HL4m94Z+2aZCDTmGXjhLL/M= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-372-tWTnKLNIOC6kNim1auWiIQ-1; Wed, 15 Jan 2020 12:10:20 -0500 X-MC-Unique: tWTnKLNIOC6kNim1auWiIQ-1 Received: by mail-wr1-f69.google.com with SMTP id u18so8194214wrn.11 for ; Wed, 15 Jan 2020 09:10:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gSI+9ZFmzhwau+7pGCHRYVf7K5e/ts+rnUbmZcA7/DU=; b=NnNgTLNeVAwjBVt4CQ+tPO2KqoK8/zRl5tdOMSyjj2U/ZOgMmWZ/Xg09kxEHspJMBS SXUtSRYg7ZzyXaCIWFo/saF1h1vB5xOOSnQVcdq3YeQXRfosLpyjH+UvdjN9Xqx+kOBh YY6x/BtfysHbnQGq7aFN+agHvMUoTbsEGZc4jIC949J2yJldFIlXUZPWCkgwmKNrI5CH SAayxKcOc8uh5+Pt8eQiDwmN/vtFfq7BSPU07iTMfVtCEuat7Xs7j5n+dKQv1lo80Dew vhM2bMVLDGVF1a5XrJcLkVnGBr29uq3H3tqs0WUlMivwkFOlxaVFXS8sZ6HsaFG3kLon /Qxw== X-Gm-Message-State: APjAAAV6ENjcMIF7c9NGcwhpHprZCk7m80LpmmZ0Hz2ZjUujkc2hQkmL XOvQK9eH6B7oHkZ3QcMtSTilbwJaWK3pLWU4NsxNs5LWJ0iAY51CUYl8VShwFacnVi5IGR9badL gZ5KIwGecKYEonCvkTUCSRsFO X-Received: by 2002:a1c:e108:: with SMTP id y8mr852714wmg.147.1579108219183; Wed, 15 Jan 2020 09:10:19 -0800 (PST) X-Google-Smtp-Source: APXvYqwooCNRjva1ReNTUjIwvyiUsGeGB/7NwFSnSMiE2Ww25Pqyumx/tXtSDOemmBM4vZewR+hQwA== X-Received: by 2002:a1c:e108:: with SMTP id y8mr852697wmg.147.1579108218968; Wed, 15 Jan 2020 09:10:18 -0800 (PST) Received: from vitty.brq.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id y20sm525071wmi.25.2020.01.15.09.10.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2020 09:10:18 -0800 (PST) From: Vitaly Kuznetsov To: kvm@vger.kernel.org Cc: Paolo Bonzini , Sean Christopherson , Jim Mattson , linux-kernel@vger.kernel.org, Liran Alon , Roman Kagan Subject: [PATCH RFC 2/3] x86/kvm/hyper-v: move VMX controls sanitization out of nested_enable_evmcs() Date: Wed, 15 Jan 2020 18:10:13 +0100 Message-Id: <20200115171014.56405-3-vkuznets@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200115171014.56405-1-vkuznets@redhat.com> References: <20200115171014.56405-1-vkuznets@redhat.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 With fine grained VMX feature enablement QEMU>=4.2 tries to do KVM_SET_MSRS with default (matching CPU model) values and in case eVMCS is also enabled, fails. It would be possible to drop VMX feature filtering completely and make this a guest's responsibility: if it decides to use eVMCS it should know which fields are available and which are not. Hyper-V mostly complies to this, however, there is at least one problematic control: SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES which Hyper-V enables. As there is no 'apic_addr_field' in eVMCS, we fail to handle this properly in KVM. It is unclear how this is supposed to work, genuine Hyper-V doesn't expose the control so it is possible that this is just a bug (in Hyper-V). Move VMX controls sanitization from nested_enable_evmcs() to vmx_get_msr(), this allows userspace to keep setting controls it wants and at the same time hides them from the guest. Signed-off-by: Vitaly Kuznetsov --- arch/x86/kvm/vmx/evmcs.c | 38 ++++++++++++++++++++++++++++++++------ arch/x86/kvm/vmx/evmcs.h | 1 + arch/x86/kvm/vmx/vmx.c | 10 ++++++++-- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/arch/x86/kvm/vmx/evmcs.c b/arch/x86/kvm/vmx/evmcs.c index 89c3e0caf39f..b5d6582ba589 100644 --- a/arch/x86/kvm/vmx/evmcs.c +++ b/arch/x86/kvm/vmx/evmcs.c @@ -346,6 +346,38 @@ uint16_t nested_get_evmcs_version(struct kvm_vcpu *vcpu) return 0; } +void nested_evmcs_filter_control_msr(u32 msr_index, u64 *pdata) +{ + u32 ctl_low = (u32)*pdata, ctl_high = (u32)(*pdata >> 32); + /* + * Enlightened VMCS doesn't have certain fields, make sure we don't + * expose unsupported controls to L1. + */ + + switch (msr_index) { + case MSR_IA32_VMX_PINBASED_CTLS: + case MSR_IA32_VMX_TRUE_PINBASED_CTLS: + ctl_high &= ~EVMCS1_UNSUPPORTED_PINCTRL; + break; + case MSR_IA32_VMX_EXIT_CTLS: + case MSR_IA32_VMX_TRUE_EXIT_CTLS: + ctl_high &= ~EVMCS1_UNSUPPORTED_VMEXIT_CTRL; + break; + case MSR_IA32_VMX_ENTRY_CTLS: + case MSR_IA32_VMX_TRUE_ENTRY_CTLS: + ctl_high &= ~EVMCS1_UNSUPPORTED_VMENTRY_CTRL; + break; + case MSR_IA32_VMX_PROCBASED_CTLS2: + ctl_high &= ~EVMCS1_UNSUPPORTED_2NDEXEC; + break; + case MSR_IA32_VMX_VMFUNC: + ctl_low &= ~EVMCS1_UNSUPPORTED_VMFUNC; + break; + } + + *pdata = ctl_low | ((u64)ctl_high << 32); +} + int nested_enable_evmcs(struct kvm_vcpu *vcpu, uint16_t *vmcs_version) { @@ -356,11 +388,5 @@ int nested_enable_evmcs(struct kvm_vcpu *vcpu, if (vmcs_version) *vmcs_version = nested_get_evmcs_version(vcpu); - vmx->nested.msrs.pinbased_ctls_high &= ~EVMCS1_UNSUPPORTED_PINCTRL; - vmx->nested.msrs.entry_ctls_high &= ~EVMCS1_UNSUPPORTED_VMENTRY_CTRL; - vmx->nested.msrs.exit_ctls_high &= ~EVMCS1_UNSUPPORTED_VMEXIT_CTRL; - vmx->nested.msrs.secondary_ctls_high &= ~EVMCS1_UNSUPPORTED_2NDEXEC; - vmx->nested.msrs.vmfunc_controls &= ~EVMCS1_UNSUPPORTED_VMFUNC; - return 0; } diff --git a/arch/x86/kvm/vmx/evmcs.h b/arch/x86/kvm/vmx/evmcs.h index 07ebf6882a45..b88d9807a796 100644 --- a/arch/x86/kvm/vmx/evmcs.h +++ b/arch/x86/kvm/vmx/evmcs.h @@ -201,5 +201,6 @@ bool nested_enlightened_vmentry(struct kvm_vcpu *vcpu, u64 *evmcs_gpa); uint16_t nested_get_evmcs_version(struct kvm_vcpu *vcpu); int nested_enable_evmcs(struct kvm_vcpu *vcpu, uint16_t *vmcs_version); +void nested_evmcs_filter_control_msr(u32 msr_index, u64 *pdata); #endif /* __KVM_X86_VMX_EVMCS_H */ diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index e3394c839dea..8eb74618b8d8 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -1849,8 +1849,14 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) case MSR_IA32_VMX_BASIC ... MSR_IA32_VMX_VMFUNC: if (!nested_vmx_allowed(vcpu)) return 1; - return vmx_get_vmx_msr(&vmx->nested.msrs, msr_info->index, - &msr_info->data); + if (vmx_get_vmx_msr(&vmx->nested.msrs, msr_info->index, + &msr_info->data)) + return 1; + if (!msr_info->host_initiated && + vmx->nested.enlightened_vmcs_enabled) + nested_evmcs_filter_control_msr(msr_info->index, + &msr_info->data); + break; case MSR_IA32_RTIT_CTL: if (pt_mode != PT_MODE_HOST_GUEST) return 1; -- 2.24.1