Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp1163441rwb; Thu, 19 Jan 2023 07:20:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXtY3PB69xHFki3rU+xVw1PeVFrRxTxSTDjr3ysX+X2WV5G6BunIsMzMReo7UGxuWvioSir5 X-Received: by 2002:a05:6a20:93a8:b0:b9:36be:23c1 with SMTP id x40-20020a056a2093a800b000b936be23c1mr2281397pzh.49.1674141655177; Thu, 19 Jan 2023 07:20:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674141655; cv=none; d=google.com; s=arc-20160816; b=VHdFygWXpmbTWnk+FK5e8XTfUIAZB41ai/2thkV5KAZQ9kUU6p3YmpgqXL8IjIqzLg qkCm75mmiPU8ud6eIA9VkdADVdsJoipCDaHEwhg0KPaHXS6A8Ghs450OgPvPNCWkjSCX B3VX9rF9GXGiBFSNtZkLBEPriymFu8Z1pbAVLeyKXsvFLLf2Qg1CJcsdpN9g2VddOliJ NoqzyIc0yJ3ssanABlyLh16tKgQnfmWDQFHYKn6Gr/+1qWAimkMzNYSfxRBmrpP9cQ16 AlhVy+YRUfWjoYaijtoBfZmTvU1zI7qQ0BCzmUO4AosVtHJiF9dCAYZ8vuzq1aTLh0LE VMwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=AgETEfa02Nsc1LkWzccokR9RlT3kw3FYwF8qT52gfTg=; b=h7msA0H09KV8YDSbulewgUO+Jug4OZb7zLdTNNQvHVHDhOEnGgLsqAryiM3nrBvoKp 5JYk2saAbeuiZ6fUL1SY3j59YODQ+v+2puo+r9Vmf8Rd/l1+EGzD09VmD93SrPtns9PG bxuiowQvmlF5Dwz6hrmvAfFRLgJZMEpVDJ8XZgmJNzvh2kv3SPSRGFOZiolOVTYI1YNf hxkaqU6EIj48or8vUEWFmE70oPjhY9Gw2S+OmMNC837a3vvlL7S78ip7e34KKC5OkJH+ /JbGDrKXbR3cT+nOUBZkJE/KZFXlW6X/GcukClus+4mEErO1w1vd//TAa3iiq74CNni3 zP3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=A7h9en3h; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f7-20020a636a07000000b004d21beccd9esi1728427pgc.498.2023.01.19.07.20.49; Thu, 19 Jan 2023 07:20:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=A7h9en3h; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230194AbjASPK4 (ORCPT + 45 others); Thu, 19 Jan 2023 10:10:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230240AbjASPKu (ORCPT ); Thu, 19 Jan 2023 10:10:50 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6073769239; Thu, 19 Jan 2023 07:10:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674141048; x=1705677048; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=3cOB46VGq8/Iw3wpbdSkSQ/qmcK81MvT/60er3OPmA4=; b=A7h9en3hIkou7I7AC4PBYknqxMqJLNwFZjKxbBKt34dYKkrJ5M9wsP81 4T3k8HlmDApi2eHbzvS3DGxVDWHmI8Gj/F4XsXfl8dltaxMqgDLSIQoY2 88n494m6OlCZKEGSbZIx26vdhBtc5D0iNcWAsHEG221O/Tkpz/RKvFY0+ p6v+YLj5KgEd/oeewzFcFDwk/AfbltON0rYUSNMsFZ6kLR0NYcjkvEp4l wzU9TrOI7wpoYdkKqxe3+juw81GieMXPdDNANCFfNjIznTI1xQ8ddcZZL s8lwYIRb6NCE+2RU8u3J6fd/8I48Dc8yWDmF3Y/yIFL0k6VzMwcT/k9NL A==; X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="325350478" X-IronPort-AV: E=Sophos;i="5.97,229,1669104000"; d="scan'208";a="325350478" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 07:10:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="610093351" X-IronPort-AV: E=Sophos;i="5.97,229,1669104000"; d="scan'208";a="610093351" Received: from skxmcp01.bj.intel.com ([10.240.193.86]) by orsmga003.jf.intel.com with ESMTP; 19 Jan 2023 07:10:46 -0800 From: Yu Zhang To: pbonzini@redhat.com, seanjc@google.com, kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] KVM: nVMX: Remove outdated comments in nested_vmx_setup_ctls_msrs() Date: Thu, 19 Jan 2023 22:19:45 +0800 Message-Id: <20230119141946.585610-1-yu.c.zhang@linux.intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org nested_vmx_setup_ctls_msrs() initializes the vmcs_conf.nested, which stores the global VMX MSR configurations when nested is supported, regardless of any particular CPUID settings for one VM. Commit 6defc591846d ("KVM: nVMX: include conditional controls in /dev/kvm KVM_GET_MSRS") added the some feature flags for secondary proc-based controls, so that those features can be available in KVM_GET_MSRS. Yet this commit did not remove the obsolete comments in nested_vmx_setup_ctls_msrs(). Just fix the comments, and no functional change intended. Fixes: 6defc591846d ("KVM: nVMX: include conditional controls in /dev/kvm KVM_GET_MSRS") Signed-off-by: Yu Zhang --- arch/x86/kvm/vmx/nested.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index d93c715cda6a..81dfbffae575 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -6863,11 +6863,6 @@ void nested_vmx_setup_ctls_msrs(struct vmcs_config *vmcs_conf, u32 ept_caps) msrs->procbased_ctls_low &= ~(CPU_BASED_CR3_LOAD_EXITING | CPU_BASED_CR3_STORE_EXITING); - /* - * secondary cpu-based controls. Do not include those that - * depend on CPUID bits, they are added later by - * vmx_vcpu_after_set_cpuid. - */ msrs->secondary_ctls_low = 0; msrs->secondary_ctls_high = vmcs_conf->cpu_based_2nd_exec_ctrl; -- 2.25.1