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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham 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 18CEDC433E9 for ; Thu, 4 Mar 2021 09:54:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E4A7964F20 for ; Thu, 4 Mar 2021 09:54:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238057AbhCDJxg (ORCPT ); Thu, 4 Mar 2021 04:53:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:45771 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238064AbhCDJxe (ORCPT ); Thu, 4 Mar 2021 04:53:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614851529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=NBlfUZ5qlNcwMNLTSOObyKp2FpqfhaUG207qjodcr48=; b=fS64oB02dDkssJdr0Mz0S5DJgoJOAqhOig2b+XHM3xb7NrIDwus23sPy2FM5DPI2FtrU3c b4Vs1YWQIuLUbYOmHTSGbV7r2tej/k18q823uNlHuXP5ABIK43T/eUW7AbtsjB5LN+FFoK myAm/D8mUPwEG6xGG0wduJ60vt9vZOk= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-44-T6jH7RVAM6KgOvPov2GiyQ-1; Thu, 04 Mar 2021 04:52:07 -0500 X-MC-Unique: T6jH7RVAM6KgOvPov2GiyQ-1 Received: by mail-ed1-f70.google.com with SMTP id i6so7382304edq.12 for ; Thu, 04 Mar 2021 01:52:06 -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:in-reply-to:references:date :message-id:mime-version; bh=NBlfUZ5qlNcwMNLTSOObyKp2FpqfhaUG207qjodcr48=; b=YRJqL2sWJjDIT5/Idhlb5Q8z8VFkdnDk2MKy81Xq8hMAKBAAw/gOrnmfwYPr/g+rI9 meCgbzrJPxY4TI+J/iq9wD84u2Os3tU0wpY0bJs7Q6RFS5RSl6J7yH5AUDHd3XqblpO/ ZHkxzPsRmJrhyIsnz2YAAALa06xqSd/F1kNiURJPeSdo9BRj+1BPmIoeD7p1CnLq3xSU UDpanCo0Fm8WlrJ2UF9XHRjJfIX567ajCRudhQDY6tOu8IXJbyb+HN4oLMnr1U8gtsJW 3bCbFgYgDn9V5WTd9pNeqfZjBEUBErmrO2cJkIgzZ1jIKgSeIxoihjUEjIv9MMozsMSb cuWA== X-Gm-Message-State: AOAM530jpZiOSakJNMDH2jjt3tID8tMNO9zWSDCtGBLAZJeU5te6tn6a kRamez231W3QjBaTCAIyNtn4r77Zfp/gaA2sjagjcqcmYeWoJztYegTCh0SFo4xaISFjy16LMAV JHVVjDMjRHQyj X-Received: by 2002:a17:906:a016:: with SMTP id p22mr3267348ejy.456.1614851525954; Thu, 04 Mar 2021 01:52:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJwlo5eA6ixzk4HcXv/OUomMVtpzFZiKvWSMBnmf8YrnTG8jpRbWpN8vf4hpbLg26sZCmMjhug== X-Received: by 2002:a17:906:a016:: with SMTP id p22mr3267339ejy.456.1614851525798; Thu, 04 Mar 2021 01:52:05 -0800 (PST) Received: from vitty.brq.redhat.com (g-server-2.ign.cz. [91.219.240.2]) by smtp.gmail.com with ESMTPSA id e18sm22793498eji.111.2021.03.04.01.52.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 01:52:05 -0800 (PST) From: Vitaly Kuznetsov To: Yang Weijiang Cc: Yang Weijiang , pbonzini@redhat.com, seanjc@google.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 3/3] KVM: nVMX: Add CET entry/exit load bits to evmcs unsupported list In-Reply-To: <20210304060740.11339-4-weijiang.yang@intel.com> References: <20210304060740.11339-1-weijiang.yang@intel.com> <20210304060740.11339-4-weijiang.yang@intel.com> Date: Thu, 04 Mar 2021 10:52:04 +0100 Message-ID: <87h7lrckl7.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Yang Weijiang writes: > Nested guest doesn't support CET when KVM is running as an intermediate > layer between two Hyper-Vs for now, so mask out related CET entry/exit > load bits. Relevant enabling patches will be posted as a separate patch > series. > > Suggested-by: Paolo Bonzini > Suggested-by: Vitaly Kuznetsov > Signed-off-by: Yang Weijiang > --- > arch/x86/kvm/vmx/evmcs.c | 4 ++-- > arch/x86/kvm/vmx/evmcs.h | 6 ++++-- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kvm/vmx/evmcs.c b/arch/x86/kvm/vmx/evmcs.c > index 41f24661af04..9f81db51fd8b 100644 > --- a/arch/x86/kvm/vmx/evmcs.c > +++ b/arch/x86/kvm/vmx/evmcs.c > @@ -351,11 +351,11 @@ void nested_evmcs_filter_control_msr(u32 msr_index, u64 *pdata) > switch (msr_index) { > case MSR_IA32_VMX_EXIT_CTLS: > case MSR_IA32_VMX_TRUE_EXIT_CTLS: > - ctl_high &= ~VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL; > + ctl_high &= ~EVMCS1_UNSUPPORTED_VMEXIT_CTRL; > break; > case MSR_IA32_VMX_ENTRY_CTLS: > case MSR_IA32_VMX_TRUE_ENTRY_CTLS: > - ctl_high &= ~VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL; > + ctl_high &= ~EVMCS1_UNSUPPORTED_VMENTRY_CTRL; > break; > case MSR_IA32_VMX_PROCBASED_CTLS2: > ctl_high &= ~SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES; > diff --git a/arch/x86/kvm/vmx/evmcs.h b/arch/x86/kvm/vmx/evmcs.h > index bd41d9462355..25588694eb04 100644 > --- a/arch/x86/kvm/vmx/evmcs.h > +++ b/arch/x86/kvm/vmx/evmcs.h > @@ -59,8 +59,10 @@ DECLARE_STATIC_KEY_FALSE(enable_evmcs); > SECONDARY_EXEC_SHADOW_VMCS | \ > SECONDARY_EXEC_TSC_SCALING | \ > SECONDARY_EXEC_PAUSE_LOOP_EXITING) > -#define EVMCS1_UNSUPPORTED_VMEXIT_CTRL (VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL) > -#define EVMCS1_UNSUPPORTED_VMENTRY_CTRL (VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL) > +#define EVMCS1_UNSUPPORTED_VMEXIT_CTRL (VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL | \ > + VM_EXIT_LOAD_CET_STATE) > +#define EVMCS1_UNSUPPORTED_VMENTRY_CTRL (VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL | \ > + VM_ENTRY_LOAD_CET_STATE) > #define EVMCS1_UNSUPPORTED_VMFUNC (VMX_VMFUNC_EPTP_SWITCHING) > > #if IS_ENABLED(CONFIG_HYPERV) Thanks, this should be enough for both KVM on Hyper-V and Hyper-V on KVM using eVMCS. Reviewed-by: Vitaly Kuznetsov -- Vitaly