From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 694153CFF6E for ; Mon, 16 Mar 2026 17:20:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773681606; cv=none; b=H1hsO7f9inYwumEdrH82ZuTSyet1YkRMuGwAGTi6AMNcvjcetrF+w6RB1WQdpKmpnSDWyEC+PB2RTqwOfE5bkbCEhx+pESaQAMvRvb5fVAJg80q1NQkbCeJ8m3eR8/fw4ewSAY6h5IMVj5LUAKv1FxVZBuzosApTpASdS45gERs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773681606; c=relaxed/simple; bh=HNMnmPvNdVDkfMchex+qw8iaKGMYfHowY3ePHucuPPw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MT7L/11QEvDhyaGF1trE4CygVainhzd6t8CrumHv6c/lzGZWHAHHnvmcBfQgpcpNdqhc8U4d+hxZhZ14Wp1bWWkBUh0u/rfRdI6QHmxnkrgNXEkrRopl1fSpxPKzzcjZoMcLT9mirJlHez0jhWgPk3kD46WYf+p6m+Zql4Ij9O0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dW4QLohx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dW4QLohx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A53BAC19421; Mon, 16 Mar 2026 17:20:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773681606; bh=HNMnmPvNdVDkfMchex+qw8iaKGMYfHowY3ePHucuPPw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dW4QLohxLZ75NVrsjsgGM2H7nqJJlid3Dn0+LhgEb7Wlak4Dk6ccYP+7+WiF2r3HO qdI+IlwHJtLYvA/kFIQJe87lVCcevXrZi9F+mR5bDcTA09Ov2JVlt9XL1QAs2Wfzfv HdAwVl+caiqZusiCentbmXAo7/86AyTM7/23RIq7cKX1T2unVttNbhuX3G2Y8jyVl9 AcaRjxVxKpqqN/W12q2I/J8VJsunQVMWQRVhBYIpe//2g+x4bjP3I1hSYZcZVOd72o AMVH4eKFLzjsm6QEVhtd48z9fOWaM0/cdvj0Q/RzUgK6w29ZORXusU7z8VMrzqu58y i8oW5oK+Wo+LA== From: Sasha Levin To: stable@vger.kernel.org Cc: Sean Christopherson , Sasha Levin Subject: [PATCH 6.12.y 1/8] KVM: x86: Co-locate initialization of feature MSRs in kvm_arch_vcpu_create() Date: Mon, 16 Mar 2026 13:19:56 -0400 Message-ID: <20260316172003.1024253-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026031659-scroll-setting-4687@gregkh> References: <2026031659-scroll-setting-4687@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Sean Christopherson [ Upstream commit 2142ac663a6a72ac868d0768681b1355e3a703eb ] Bunch all of the feature MSR initialization in kvm_arch_vcpu_create() so that it can be easily quirked in a future patch. No functional change intended. Link: https://lore.kernel.org/r/20240802185511.305849-2-seanjc@google.com Signed-off-by: Sean Christopherson Stable-dep-of: e2ffe85b6d2b ("KVM: x86: Introduce KVM_X86_QUIRK_VMCS12_ALLOW_FREEZE_IN_SMM") Signed-off-by: Sasha Levin --- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 0d9035993ed36..60e2ac7ed2fc3 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12383,6 +12383,8 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) kvm_async_pf_hash_reset(vcpu); + vcpu->arch.arch_capabilities = kvm_get_arch_capabilities(); + vcpu->arch.msr_platform_info = MSR_PLATFORM_INFO_CPUID_FAULT; vcpu->arch.perf_capabilities = kvm_caps.supported_perf_cap; kvm_pmu_init(vcpu); @@ -12397,8 +12399,6 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) if (r) goto free_guest_fpu; - vcpu->arch.arch_capabilities = kvm_get_arch_capabilities(); - vcpu->arch.msr_platform_info = MSR_PLATFORM_INFO_CPUID_FAULT; kvm_xen_init_vcpu(vcpu); vcpu_load(vcpu); kvm_set_tsc_khz(vcpu, vcpu->kvm->arch.default_tsc_khz); -- 2.51.0