Received: by 2002:a05:6a10:6006:0:0:0:0 with SMTP id w6csp1044082pxa; Fri, 28 Aug 2020 01:57:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwWnUwZFXGPmRvuUHI7ydI3s50JWK6qQ8nl7ksrkcdIpgaSwSVIHvEEHoX7nNA4UBmmqJU X-Received: by 2002:aa7:c3d3:: with SMTP id l19mr830757edr.102.1598605031243; Fri, 28 Aug 2020 01:57:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598605031; cv=none; d=google.com; s=arc-20160816; b=q110ibVjQmrhGRRki2xaQqQWu7M09EhmJX+5hwVARvrirClExm7K5M5Y4QGsWoOKyr yxFUKO5jkeBJnozTg/6sejzbJh7TPmR0lA1CCRICb/hTNSKPcFs6+dUMb05R1eb6c86g WEMkb5eGSosgGlaimq9DoH0/X5zzr1Y8GiboqZ6riqg+wr6yvFwkMDsK8aiFBVgdSe5W Zwe+9NXAcjxrDtfy2OGs0EeKDC53OwQ5GVpAGwSyHZ1js/AddHQTzUepU3yvXLSeCAWK wzCtOy/+tuTq82khKQc4bGLgdovozC9xZ9fjOkU8n8fYmXgQyeta4c0Uq8PuiRFyOgeW 3/3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:ironport-sdr:ironport-sdr; bh=Ffuc33UR29J4Y0pAUD0jWOf6VdbZ7Rsziv8IBIi/NRQ=; b=alY+T8IG220ygo3NX6zC0rw6TtR5awl0k1B5oc3wKk+/8w9S6j9PGsH/CfhufOm1Ow b9QFXQXszt1PWX2FUsezuVFoPZwbY+ewjARTVFRDD6suSi8l6gqxUJ6AFqrK1vRQVRwx seg+JQ0txtS2GPaLqLxMi8n8MnbFTZflhpwtI9/oX1xn5Z+tr2AUYemXFWZXJUkWXf/z UEMCWD3q3UfVkVaJHziOhuD02VGAVbb4+IZ6zS/dpE3c+dJtnVOux76+QigJM9JrHrtb iBuhbEBorhkm0wNlHs+zqhQp9RbXHdySpMB905/2Kg7JGHaj5Wu/mwLRly6hrjKwp4yf D3lw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g12si166896edq.478.2020.08.28.01.56.47; Fri, 28 Aug 2020 01:57:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728822AbgH1Iyj (ORCPT + 99 others); Fri, 28 Aug 2020 04:54:39 -0400 Received: from mga17.intel.com ([192.55.52.151]:49198 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728680AbgH1Iy1 (ORCPT ); Fri, 28 Aug 2020 04:54:27 -0400 IronPort-SDR: bxz6lcHUOEnzTWAn186YuaJInY+oWp5xal7UczcYH19iUxiKPbksd812NuHXe1NvMRjyNf+DlT sBs2l9GGPVwQ== X-IronPort-AV: E=McAfee;i="6000,8403,9726"; a="136697546" X-IronPort-AV: E=Sophos;i="5.76,363,1592895600"; d="scan'208";a="136697546" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Aug 2020 01:54:27 -0700 IronPort-SDR: c2GF2PiqdEC3O4/gAw/BnftQZg9f6IEQ6QMGh91mpdXSa9LqNKo7qdQM4LzenyeYoA9zmq73f+ KAp9HzdqoW0g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,363,1592895600"; d="scan'208";a="332483523" Received: from chenyi-pc.sh.intel.com ([10.239.159.72]) by fmsmga002.fm.intel.com with ESMTP; 28 Aug 2020 01:54:25 -0700 From: Chenyi Qiang To: Paolo Bonzini , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , Xiaoyao Li Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] KVM: nVMX: Simplify the initialization of nested_vmx_msrs Date: Fri, 28 Aug 2020 16:56:22 +0800 Message-Id: <20200828085622.8365-6-chenyi.qiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200828085622.8365-1-chenyi.qiang@intel.com> References: <20200828085622.8365-1-chenyi.qiang@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The nested VMX controls MSRs can be initialized by the global capability values stored in vmcs_config. Signed-off-by: Chenyi Qiang Reviewed-by: Xiaoyao Li --- arch/x86/kvm/vmx/vmx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index f9664ccc003b..0c36cd664222 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -7019,8 +7019,7 @@ static int vmx_create_vcpu(struct kvm_vcpu *vcpu) } if (nested) - nested_vmx_setup_ctls_msrs(&vmx->nested.msrs, - vmx_capability.ept); + memcpy(&vmx->nested.msrs, &vmcs_config.nested, sizeof(vmx->nested.msrs)); else memset(&vmx->nested.msrs, 0, sizeof(vmx->nested.msrs)); -- 2.17.1