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 CACE52FB977 for ; Thu, 14 Aug 2025 12:56:18 +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=1755176179; cv=none; b=K1IDPBFxhTZsdEnxe5/BctKVSfDDuRtWsTLgEEkmlfeRClqtw7V6TrIw8W5rIvCsDgpWh2xXdEQAUhmkmHxqRkpQHsyUaegtWInXvltZxLipzkmKK7bc1UcAds0iXFkgqxUoFETywRoiQt37GJzrjg8t3EWE/nRZZ42LFSBTta4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755176179; c=relaxed/simple; bh=S8BNgBdpMwwCTCinH2bkmC7/uIPkXn5og49mi/3ZO4g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UDW+ttGmHCZNclBwBlGvqK4PoXLsCMkByOmbTqyxEkNRdL5rp6eLXh720iC6sIWXGiMydSvhd1c31z0kpyPkZ2lj8Dl3tx3SOOQapXBwjXPj5RDZwx6dPQ25aGe6zzaMIDBU5mPxDqLvlkUkjb4k+61JzXJ+2fcQDSkV9UtZNg4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EvNsFlUz; 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="EvNsFlUz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1622C4CEED; Thu, 14 Aug 2025 12:56:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755176178; bh=S8BNgBdpMwwCTCinH2bkmC7/uIPkXn5og49mi/3ZO4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EvNsFlUz+OsUTs6PA9Gb+aVj+zGtjXevmNJaiROuD9r29+rvn9FXD11N6vu8xpIAa aju3/zG+RT8blkOx/zuq+9izf0Kv4uzW8LEfqD9B+G3fmZO1qwk3R4Mso93PryRT5s X437WZ4n8mlFSat92IT5dcNaUdB1e0iqtI+DfTBAVAx4s8mqIswmXclqJTLD6F0sGm mZlZJjMK99v2f/USdFIOmGYYCsTq71slP3WKeX+lZkUVR0OEAABOwJBV+ojtDL0Cpy SQKr7An8SVUjvFvZQqzBvCxqwwm53jr/5QDmCdt9+8Vr8d7sUw4GLjtC3yPALFJYao TmrJtZux5rL7w== From: Sasha Levin To: stable@vger.kernel.org Cc: Sean Christopherson , Dapeng Mi , Sasha Levin Subject: [PATCH 6.12.y 1/3] KVM: VMX: Extract checking of guest's DEBUGCTL into helper Date: Thu, 14 Aug 2025 08:56:12 -0400 Message-Id: <20250814125614.2090890-1-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <2025081209-sworn-unholy-36ad@gregkh> References: <2025081209-sworn-unholy-36ad@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 8a4351ac302cd8c19729ba2636acfd0467c22ae8 ] Move VMX's logic to check DEBUGCTL values into a standalone helper so that the code can be used by nested VM-Enter to apply the same logic to the value being loaded from vmcs12. KVM needs to explicitly check vmcs12->guest_ia32_debugctl on nested VM-Enter, as hardware may support features that KVM does not, i.e. relying on hardware to detect invalid guest state will result in false negatives. Unfortunately, that means applying KVM's funky suppression of BTF and LBR to vmcs12 so as not to break existing guests. No functional change intended. Reviewed-by: Dapeng Mi Link: https://lore.kernel.org/r/20250610232010.162191-6-seanjc@google.com Signed-off-by: Sean Christopherson Stable-dep-of: 7d0cce6cbe71 ("KVM: VMX: Wrap all accesses to IA32_DEBUGCTL with getter/setter APIs") Signed-off-by: Sasha Levin --- arch/x86/kvm/vmx/vmx.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 9a4ebf3dfbfc..5a6d91f44705 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -2188,6 +2188,19 @@ static u64 vmx_get_supported_debugctl(struct kvm_vcpu *vcpu, bool host_initiated return debugctl; } +static bool vmx_is_valid_debugctl(struct kvm_vcpu *vcpu, u64 data, + bool host_initiated) +{ + u64 invalid; + + invalid = data & ~vmx_get_supported_debugctl(vcpu, host_initiated); + if (invalid & (DEBUGCTLMSR_BTF | DEBUGCTLMSR_LBR)) { + kvm_pr_unimpl_wrmsr(vcpu, MSR_IA32_DEBUGCTLMSR, data); + invalid &= ~(DEBUGCTLMSR_BTF | DEBUGCTLMSR_LBR); + } + return !invalid; +} + /* * Writes msr value into the appropriate "register". * Returns 0 on success, non-0 otherwise. @@ -2256,19 +2269,12 @@ int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) } vmcs_writel(GUEST_SYSENTER_ESP, data); break; - case MSR_IA32_DEBUGCTLMSR: { - u64 invalid; - - invalid = data & ~vmx_get_supported_debugctl(vcpu, msr_info->host_initiated); - if (invalid & (DEBUGCTLMSR_BTF|DEBUGCTLMSR_LBR)) { - kvm_pr_unimpl_wrmsr(vcpu, msr_index, data); - data &= ~(DEBUGCTLMSR_BTF|DEBUGCTLMSR_LBR); - invalid &= ~(DEBUGCTLMSR_BTF|DEBUGCTLMSR_LBR); - } - - if (invalid) + case MSR_IA32_DEBUGCTLMSR: + if (!vmx_is_valid_debugctl(vcpu, data, msr_info->host_initiated)) return 1; + data &= vmx_get_supported_debugctl(vcpu, msr_info->host_initiated); + if (is_guest_mode(vcpu) && get_vmcs12(vcpu)->vm_exit_controls & VM_EXIT_SAVE_DEBUG_CONTROLS) get_vmcs12(vcpu)->guest_ia32_debugctl = data; @@ -2278,7 +2284,6 @@ int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) (data & DEBUGCTLMSR_LBR)) intel_pmu_create_guest_lbr_event(vcpu); return 0; - } case MSR_IA32_BNDCFGS: if (!kvm_mpx_supported() || (!msr_info->host_initiated && -- 2.39.5