From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 AEF41304BCB; Sat, 30 May 2026 17:50:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780163459; cv=none; b=t7rITrKGCh+v9CGWlAQSCXgIPgt7cnCegdxx5dSxL5PZQfaN11aHYCz11CzpNwh4SMmkAM5sU8vWxYfbo985dHLnElod2Uv0YwdMU2fxbpgSc98i5umCgknP68fEa/vsClB0lIcycxk3jhQ7r6QpMqIuSphqaySy23N8xNgmKfI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780163459; c=relaxed/simple; bh=l8Rp/2e12lOGXHS4eHNyJ/6usCVF3g2dG1mVHKxaxrk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Au3OwbwUCNYO97nnGW1yKdL2eYsvFsQZDiLMi/OJiZDs1wxtFV3/redH2p+kzuXLL74DNP+99v0Vc6IJnCLc4zkm8woNfTkCYWqUxVt98rve3hmyU5GQrumcqlC1HSu7s4Vxuvz+5pZhHWv+WONdzvNgm+vmhh+8byhGCpoLxgc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MH60mlZd; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="MH60mlZd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F359F1F00893; Sat, 30 May 2026 17:50:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780163458; bh=vIugvuZ7wokATplNFA9eT3pxzOCh2tRyn9YF4IMQUdo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MH60mlZdZjvlWkvqQsp/XW6ZNgCDHPK9zhxjtbiaVIWhCrFJwDRODLcaJkObd3TZ2 gnNo7fGK9wJkFiX7zNTrzhocCE+kQ4jcPrxKzv6ya4rAdhisJ3QsYnLyW6KQ4eA94U 0qPmuyMV7Cb6lPQ2AWRCD76EStkLMIGmFoj9P/Cc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yosry Ahmed , Sean Christopherson Subject: [PATCH 5.15 235/776] KVM: SVM: Explicitly mark vmcb01 dirty after modifying VMCB intercepts Date: Sat, 30 May 2026 17:59:09 +0200 Message-ID: <20260530160246.605151194@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160240.228940103@linuxfoundation.org> References: <20260530160240.228940103@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sean Christopherson commit d5bde6113aed8315a2bfe708730b721be9c2f48b upstream. When reacting to an intercept update, explicitly mark vmcb01's intercepts dirty, as KVM always initially operates on vmcb01, and nested_svm_vmexit() isn't guaranteed to mark VMCB_INTERCEPTS as dirty. I.e. if L2 is active, KVM will modify the intercepts for L1, but might not mark them as dirty before the next VMRUN of L1. Fixes: 116a0a23676e ("KVM: SVM: Add clean-bit for intercetps, tsc-offset and pause filter count") Cc: stable@vger.kernel.org Reviewed-by: Yosry Ahmed Link: https://patch.msgid.link/20260218230958.2877682-2-seanjc@google.com Signed-off-by: Sean Christopherson Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/svm/nested.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -128,11 +128,13 @@ void recalc_intercepts(struct vcpu_svm * struct vmcb_control_area *c, *h, *g; unsigned int i; - vmcb_mark_dirty(svm->vmcb, VMCB_INTERCEPTS); + vmcb_mark_dirty(svm->vmcb01.ptr, VMCB_INTERCEPTS); if (!is_guest_mode(&svm->vcpu)) return; + vmcb_mark_dirty(svm->vmcb, VMCB_INTERCEPTS); + c = &svm->vmcb->control; h = &svm->vmcb01.ptr->control; g = &svm->nested.ctl;