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 8169B3AEF26 for ; Sun, 3 May 2026 12:11:42 +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=1777810302; cv=none; b=gNai/gR4ffhPuv5hzlPswhrqWJpskw2vd5X97gzIPZ4wMfoyuNpMgSCxia2WUeo27IcYMYeETWum8n/WPmBlcqTQSuXMM+RwzI0PFn0pIwKZmcm6phV2gaAoQBLu2MOZfFMHBqig90bhnorcWBwFfSImcsSN2z9ZOq/uCLQ5qFo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777810302; c=relaxed/simple; bh=IFp9PN6AZBWauu/gQjLuVlZqo2hr4d5Z4KXIugKoAgo=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=hEbC2s1JBrR9+bWz7on6UJMyjeAP/wXTBsRgm8nn5tPT43m1zA+pD0H44mYPiZ3ZOCVV8zijiOVrutZDWJAAowPO0EzH8/HPwUNudeWSmwZhrTnsIPLHHjNvTUpqT1psLKV8Ln+JxkU5Eg/udHEFyoDS0aH50cUORBMjvU6A+sg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0GaS/l0a; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="0GaS/l0a" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A2F9C2BCB4; Sun, 3 May 2026 12:11:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777810302; bh=IFp9PN6AZBWauu/gQjLuVlZqo2hr4d5Z4KXIugKoAgo=; h=Subject:To:Cc:From:Date:From; b=0GaS/l0aNUMYfcT0uURkdTU6PXm74vyFjG3eAExAF2od7tQuCZDmWJWrUDripCGNG PBOuER4Zg8YxUWTqDVc8O+2Hxy2WUsQggwEgItnU/xZ2ArW0XnVw8hnTgBpW3Yq4fY 2Ocs3dIS9i9YdRJdhBUjZR30DflgfFNiNdePkP4c= Subject: FAILED: patch "[PATCH] KVM: SVM: Explicitly mark vmcb01 dirty after modifying VMCB" failed to apply to 5.10-stable tree To: seanjc@google.com,yosry.ahmed@linux.dev Cc: From: Date: Sun, 03 May 2026 14:11:39 +0200 Message-ID: <2026050339-outlast-sculpture-2388@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x d5bde6113aed8315a2bfe708730b721be9c2f48b # git commit -s git send-email --to '' --in-reply-to '2026050339-outlast-sculpture-2388@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From d5bde6113aed8315a2bfe708730b721be9c2f48b Mon Sep 17 00:00:00 2001 From: Sean Christopherson Date: Wed, 18 Feb 2026 15:09:51 -0800 Subject: [PATCH] KVM: SVM: Explicitly mark vmcb01 dirty after modifying VMCB intercepts 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 diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 1c5f0f08bb8c..5b639d98bf09 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -128,11 +128,13 @@ void recalc_intercepts(struct vcpu_svm *svm) struct vmcb_ctrl_area_cached *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;