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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2420DC433EF for ; Tue, 12 Jul 2022 11:58:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232892AbiGLL6p (ORCPT ); Tue, 12 Jul 2022 07:58:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233064AbiGLL6V (ORCPT ); Tue, 12 Jul 2022 07:58:21 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A5AA5B6283 for ; Tue, 12 Jul 2022 04:57:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657627070; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=E6mo0fjgCJvn0COaKmNGfmwMaRUQgez7gOZGTdEXFuU=; b=irJnPvtsF+Q7woJ8Od84xp++MLQH755TE/baUMBcWtVynPDBDuVNiXe4l6NXSE5RC3wome 2R+Hm9Nipb3Oq2MZLh+uD6Z/7JyuXczAtGVcohnJxjVKe0vENxHCfAtND/PwOfXj4L4xzK xrMiYVL2st3LBpRtgaeO3tcK2iehmlY= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-633-q-aOqudiOseYawtfRLDgyw-1; Tue, 12 Jul 2022 07:57:49 -0400 X-MC-Unique: q-aOqudiOseYawtfRLDgyw-1 Received: by mail-qk1-f198.google.com with SMTP id k9-20020a05620a414900b006b58d6a89f2so4013624qko.2 for ; Tue, 12 Jul 2022 04:57:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=E6mo0fjgCJvn0COaKmNGfmwMaRUQgez7gOZGTdEXFuU=; b=HsG3dsZ8d15CLCuui6Memjj6zVihQecWG2J/eX2rvEV+GZnhYNL/nRvbp1zMhU8j6e tH5E4PEK/y/OZsSMzjYqU555iJH3EZAsfRANVLMrzBvCW7bp0W7dfrihap6VrkO4B+Oy 71rX/H6fjAENFVxgnjrEL9fxPAOybCcc6XsA4/35nfLxyHWSRP3bEcgX60nTkticIj2O sMDwl+ByDVcDPhxAcpu/cOgp3T0VILAmSXE3MKridyyWkmVcAWgkdrXRZtI5Ba/LHQwu IvMNYVD+dOOL8jZow+3z6+GNYNUkNrrcY3ftoErMfyx54QkNEMV3E0GlUDWk8YimYzIq BmLA== X-Gm-Message-State: AJIora9/g9oKVN8QcbGFqCgB2glDFLAduGLzmMiMo31Pubp44PEgXuw8 HlfMJKhxYQ6tjZMKbSMpYbVGmzure6t95tqhyYCx13y40wQVOks7z12hsjWy/BVGJJIsGghNsOy R7Zw4zsUfYfjVS5C2TBYNJ3MN X-Received: by 2002:ac8:7c4d:0:b0:31a:6e91:5f7a with SMTP id o13-20020ac87c4d000000b0031a6e915f7amr17204268qtv.441.1657627069330; Tue, 12 Jul 2022 04:57:49 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vvYmQmiVDjM/8YLCpDfQjgb7wdvPNRHF0AqwpZAs8YlTirKABOeI3IIhmjUZTWbhdmXETGZg== X-Received: by 2002:ac8:7c4d:0:b0:31a:6e91:5f7a with SMTP id o13-20020ac87c4d000000b0031a6e915f7amr17204252qtv.441.1657627069114; Tue, 12 Jul 2022 04:57:49 -0700 (PDT) Received: from [10.35.4.238] (bzq-82-81-161-50.red.bezeqint.net. [82.81.161.50]) by smtp.gmail.com with ESMTPSA id a187-20020ae9e8c4000000b006b5517da3casm8552810qkg.22.2022.07.12.04.57.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 04:57:48 -0700 (PDT) Message-ID: Subject: Re: [PATCH v3 18/25] KVM: VMX: Add missing CPU based VM execution controls to vmcs_config From: Maxim Levitsky To: Vitaly Kuznetsov , kvm@vger.kernel.org, Paolo Bonzini , Sean Christopherson Cc: Anirudh Rayabharam , Wanpeng Li , Jim Mattson , linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org Date: Tue, 12 Jul 2022 14:57:45 +0300 In-Reply-To: <20220708144223.610080-19-vkuznets@redhat.com> References: <20220708144223.610080-1-vkuznets@redhat.com> <20220708144223.610080-19-vkuznets@redhat.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.40.4 (3.40.4-5.fc34) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2022-07-08 at 16:42 +0200, Vitaly Kuznetsov wrote: > As a preparation to reusing the result of setup_vmcs_config() in > nested VMX MSR setup, add the CPU based VM execution controls which KVM > doesn't use but supports for nVMX to KVM_OPT_VMX_CPU_BASED_VM_EXEC_CONTROL > and filter them out in vmx_exec_control(). > > No functional change intended. > > Reviewed-by: Jim Mattson > Signed-off-by: Vitaly Kuznetsov > --- >  arch/x86/kvm/vmx/vmx.c | 6 ++++++ >  arch/x86/kvm/vmx/vmx.h | 6 +++++- >  2 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > index 2fb89bdcbbd8..9771c771c8f5 100644 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@ -4240,6 +4240,12 @@ static u32 vmx_exec_control(struct vcpu_vmx *vmx) >  { >         u32 exec_control = vmcs_config.cpu_based_exec_ctrl; >   > +       /* Not used by KVM but supported for nesting. */ > +       exec_control &= ~(CPU_BASED_RDTSC_EXITING | > +                         CPU_BASED_USE_IO_BITMAPS | > +                         CPU_BASED_MONITOR_TRAP_FLAG | > +                         CPU_BASED_PAUSE_EXITING); > + >         /* INTR_WINDOW_EXITING and NMI_WINDOW_EXITING are toggled dynamically */ >         exec_control &= ~(CPU_BASED_INTR_WINDOW_EXITING | >                           CPU_BASED_NMI_WINDOW_EXITING); > diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h > index e9c392398f1b..758f80c41beb 100644 > --- a/arch/x86/kvm/vmx/vmx.h > +++ b/arch/x86/kvm/vmx/vmx.h > @@ -539,9 +539,13 @@ static inline u8 vmx_get_rvi(void) >  #endif >   >  #define KVM_OPT_VMX_CPU_BASED_VM_EXEC_CONTROL                  \ > -       (CPU_BASED_TPR_SHADOW |                                 \ > +       (CPU_BASED_RDTSC_EXITING |                              \ > +       CPU_BASED_TPR_SHADOW |                                  \ > +       CPU_BASED_USE_IO_BITMAPS |                              \ > +       CPU_BASED_MONITOR_TRAP_FLAG |                           \ >         CPU_BASED_USE_MSR_BITMAPS |                             \ >         CPU_BASED_NMI_WINDOW_EXITING |                          \ > +       CPU_BASED_PAUSE_EXITING |                               \ >         CPU_BASED_ACTIVATE_SECONDARY_CONTROLS |                 \ >         CPU_BASED_ACTIVATE_TERTIARY_CONTROLS) >   Reviewed-by: Maxim Levitsky Best regards, Maxim Levitsky