From: Greg Kroah-Hartman Date: Sun, 3 May 2026 12:44:29 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v6.12.86~37 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b89094eb49ae9ff05f20fbc379c06cfd7ce024bb;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: kvm-nsvm-add-missing-consistency-check-for-ncr3-validity.patch kvm-nsvm-always-inject-a-gp-if-mapping-vmcb12-fails-on-nested-vmrun.patch kvm-nsvm-clear-gif-on-nested-vmexit-invalid.patch kvm-nsvm-ensure-avic-is-inhibited-when-restoring-a-vcpu-to-guest-mode.patch kvm-nsvm-mark-all-of-vmcb02-dirty-when-restoring-nested-state.patch kvm-nsvm-sync-interrupt-shadow-to-cached-vmcb12-after-vmrun-of-l2.patch kvm-nsvm-sync-nextrip-to-cached-vmcb12-after-vmrun-of-l2.patch kvm-svm-explicitly-mark-vmcb01-dirty-after-modifying-vmcb-intercepts.patch kvm-svm-inject-ud-for-invlpga-if-efer.svme-0.patch mmc-block-use-single-block-write-in-retry.patch rtc-ntxec-fix-of-node-reference-imbalance.patch tpm-tpm_tis-add-error-logging-for-data-transfer.patch userfaultfd-allow-registration-of-ranges-below-mmap_min_addr.patch --- diff --git a/queue-5.15/kvm-nsvm-add-missing-consistency-check-for-ncr3-validity.patch b/queue-5.15/kvm-nsvm-add-missing-consistency-check-for-ncr3-validity.patch new file mode 100644 index 0000000000..db87a1c3a9 --- /dev/null +++ b/queue-5.15/kvm-nsvm-add-missing-consistency-check-for-ncr3-validity.patch @@ -0,0 +1,49 @@ +From b71138fcc362c67ebe66747bb22cb4e6b4d6a651 Mon Sep 17 00:00:00 2001 +From: Yosry Ahmed +Date: Tue, 3 Mar 2026 00:34:09 +0000 +Subject: KVM: nSVM: Add missing consistency check for nCR3 validity +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Yosry Ahmed + +commit b71138fcc362c67ebe66747bb22cb4e6b4d6a651 upstream. + +From the APM Volume #2, 15.25.4 (24593—Rev. 3.42—March 2024): + + When VMRUN is executed with nested paging enabled (NP_ENABLE = 1), the + following conditions are considered illegal state combinations, in + addition to those mentioned in “Canonicalization and Consistency Checks”: + • Any MBZ bit of nCR3 is set. + • Any G_PAT.PA field has an unsupported type encoding or any + reserved field in G_PAT has a nonzero value. + +Add the consistency check for nCR3 being a legal GPA with no MBZ bits +set. Note, the G_PAT.PA check is being handled separately[*]. + +Link: https://lore.kernel.org/kvm/20260205214326.1029278-3-jmattson@google.com [*] +Fixes: 4b16184c1cca ("KVM: SVM: Initialize Nested Nested MMU context on VMRUN") +Cc: stable@vger.kernel.org +Signed-off-by: Yosry Ahmed +Link: https://patch.msgid.link/20260303003421.2185681-16-yosry@kernel.org +[sean: capture everything in CC(), massage changelog formatting] +Signed-off-by: Sean Christopherson +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kvm/svm/nested.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/arch/x86/kvm/svm/nested.c ++++ b/arch/x86/kvm/svm/nested.c +@@ -256,6 +256,10 @@ static bool nested_vmcb_check_controls(s + if (CC((control->nested_ctl & SVM_NESTED_CTL_NP_ENABLE) && !npt_enabled)) + return false; + ++ if (CC((control->nested_ctl & SVM_NESTED_CTL_NP_ENABLE) && ++ !kvm_vcpu_is_legal_gpa(vcpu, control->nested_cr3))) ++ return false; ++ + if (CC(!nested_svm_check_bitmap_pa(vcpu, control->msrpm_base_pa, + MSRPM_SIZE))) + return false; diff --git a/queue-5.15/kvm-nsvm-always-inject-a-gp-if-mapping-vmcb12-fails-on-nested-vmrun.patch b/queue-5.15/kvm-nsvm-always-inject-a-gp-if-mapping-vmcb12-fails-on-nested-vmrun.patch new file mode 100644 index 0000000000..079edf25b1 --- /dev/null +++ b/queue-5.15/kvm-nsvm-always-inject-a-gp-if-mapping-vmcb12-fails-on-nested-vmrun.patch @@ -0,0 +1,41 @@ +From 01ddcdc55e097ca38c28ae656711b8e6d1df71f8 Mon Sep 17 00:00:00 2001 +From: Yosry Ahmed +Date: Tue, 3 Mar 2026 00:33:59 +0000 +Subject: KVM: nSVM: Always inject a #GP if mapping VMCB12 fails on nested VMRUN + +From: Yosry Ahmed + +commit 01ddcdc55e097ca38c28ae656711b8e6d1df71f8 upstream. + +nested_svm_vmrun() currently only injects a #GP if kvm_vcpu_map() fails +with -EINVAL. But it could also fail with -EFAULT if creating a host +mapping failed. Inject a #GP in all cases, no reason to treat failure +modes differently. + +Fixes: 8c5fbf1a7231 ("KVM/nSVM: Use the new mapping API for mapping guest memory") +CC: stable@vger.kernel.org +Co-developed-by: Sean Christopherson +Signed-off-by: Yosry Ahmed +Link: https://patch.msgid.link/20260303003421.2185681-6-yosry@kernel.org +Signed-off-by: Sean Christopherson +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kvm/svm/nested.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +--- a/arch/x86/kvm/svm/nested.c ++++ b/arch/x86/kvm/svm/nested.c +@@ -651,12 +651,9 @@ int nested_svm_vmrun(struct kvm_vcpu *vc + } + + vmcb12_gpa = svm->vmcb->save.rax; +- ret = kvm_vcpu_map(vcpu, gpa_to_gfn(vmcb12_gpa), &map); +- if (ret == -EINVAL) { ++ if (kvm_vcpu_map(vcpu, gpa_to_gfn(vmcb12_gpa), &map)) { + kvm_inject_gp(vcpu, 0); + return 1; +- } else if (ret) { +- return kvm_skip_emulated_instruction(vcpu); + } + + ret = kvm_skip_emulated_instruction(vcpu); diff --git a/queue-5.15/kvm-nsvm-clear-gif-on-nested-vmexit-invalid.patch b/queue-5.15/kvm-nsvm-clear-gif-on-nested-vmexit-invalid.patch new file mode 100644 index 0000000000..07ee732246 --- /dev/null +++ b/queue-5.15/kvm-nsvm-clear-gif-on-nested-vmexit-invalid.patch @@ -0,0 +1,33 @@ +From f85a6ce06e4a0d49652f57967a649ab09e06287c Mon Sep 17 00:00:00 2001 +From: Yosry Ahmed +Date: Tue, 3 Mar 2026 00:34:04 +0000 +Subject: KVM: nSVM: Clear GIF on nested #VMEXIT(INVALID) + +From: Yosry Ahmed + +commit f85a6ce06e4a0d49652f57967a649ab09e06287c upstream. + +According to the APM, GIF is set to 0 on any #VMEXIT, including +an #VMEXIT(INVALID) due to failed consistency checks. Clear GIF on +consistency check failures. + +Fixes: 3d6368ef580a ("KVM: SVM: Add VMRUN handler") +Cc: stable@vger.kernel.org +Signed-off-by: Yosry Ahmed +Link: https://patch.msgid.link/20260303003421.2185681-11-yosry@kernel.org +Signed-off-by: Sean Christopherson +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kvm/svm/nested.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/x86/kvm/svm/nested.c ++++ b/arch/x86/kvm/svm/nested.c +@@ -671,6 +671,7 @@ int nested_svm_vmrun(struct kvm_vcpu *vc + vmcb12->control.exit_code_hi = -1u; + vmcb12->control.exit_info_1 = 0; + vmcb12->control.exit_info_2 = 0; ++ svm_set_gif(svm, false); + goto out; + } + diff --git a/queue-5.15/kvm-nsvm-ensure-avic-is-inhibited-when-restoring-a-vcpu-to-guest-mode.patch b/queue-5.15/kvm-nsvm-ensure-avic-is-inhibited-when-restoring-a-vcpu-to-guest-mode.patch new file mode 100644 index 0000000000..1ca9d3f8fd --- /dev/null +++ b/queue-5.15/kvm-nsvm-ensure-avic-is-inhibited-when-restoring-a-vcpu-to-guest-mode.patch @@ -0,0 +1,42 @@ +From 24f7d36b824b65cf1a2db3db478059187b2a37b0 Mon Sep 17 00:00:00 2001 +From: Yosry Ahmed +Date: Tue, 24 Feb 2026 22:50:17 +0000 +Subject: KVM: nSVM: Ensure AVIC is inhibited when restoring a vCPU to guest mode + +From: Yosry Ahmed + +commit 24f7d36b824b65cf1a2db3db478059187b2a37b0 upstream. + +On nested VMRUN, KVM ensures AVIC is inhibited by requesting +KVM_REQ_APICV_UPDATE, triggering a check of inhibit reasons, finding +APICV_INHIBIT_REASON_NESTED, and disabling AVIC. + +However, when KVM_SET_NESTED_STATE is performed on a vCPU not in guest +mode with AVIC enabled, KVM_REQ_APICV_UPDATE is not requested, and AVIC +is not inhibited. + +Request KVM_REQ_APICV_UPDATE in the KVM_SET_NESTED_STATE path if AVIC is +active, similar to the nested VMRUN path. + +Fixes: f44509f849fe ("KVM: x86: SVM: allow AVIC to co-exist with a nested guest running") +Cc: stable@vger.kernel.org +Signed-off-by: Yosry Ahmed +Link: https://patch.msgid.link/20260224225017.3303870-1-yosry@kernel.org +Signed-off-by: Sean Christopherson +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kvm/svm/nested.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/arch/x86/kvm/svm/nested.c ++++ b/arch/x86/kvm/svm/nested.c +@@ -1407,6 +1407,9 @@ static int svm_set_nested_state(struct k + goto out_free; + + ++ if (kvm_vcpu_apicv_active(vcpu)) ++ kvm_make_request(KVM_REQ_APICV_UPDATE, vcpu); ++ + kvm_make_request(KVM_REQ_GET_NESTED_STATE_PAGES, vcpu); + ret = 0; + out_free: diff --git a/queue-5.15/kvm-nsvm-mark-all-of-vmcb02-dirty-when-restoring-nested-state.patch b/queue-5.15/kvm-nsvm-mark-all-of-vmcb02-dirty-when-restoring-nested-state.patch new file mode 100644 index 0000000000..63859e24b4 --- /dev/null +++ b/queue-5.15/kvm-nsvm-mark-all-of-vmcb02-dirty-when-restoring-nested-state.patch @@ -0,0 +1,42 @@ +From e63fb1379f4b9300a44739964e69549bebbcdca4 Mon Sep 17 00:00:00 2001 +From: Yosry Ahmed +Date: Tue, 10 Feb 2026 01:08:06 +0000 +Subject: KVM: nSVM: Mark all of vmcb02 dirty when restoring nested state + +From: Yosry Ahmed + +commit e63fb1379f4b9300a44739964e69549bebbcdca4 upstream. + +When restoring a vCPU in guest mode, any state restored before +KVM_SET_NESTED_STATE (e.g. KVM_SET_SREGS) will mark the corresponding +dirty bits in vmcb01, as it is the active VMCB before switching to +vmcb02 in svm_set_nested_state(). + +Hence, mark all fields in vmcb02 dirty in svm_set_nested_state() to +capture any previously restored fields. + +Fixes: cc440cdad5b7 ("KVM: nSVM: implement KVM_GET_NESTED_STATE and KVM_SET_NESTED_STATE") +CC: stable@vger.kernel.org +Signed-off-by: Yosry Ahmed +Link: https://patch.msgid.link/20260210010806.3204289-1-yosry.ahmed@linux.dev +Signed-off-by: Sean Christopherson +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kvm/svm/nested.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/arch/x86/kvm/svm/nested.c ++++ b/arch/x86/kvm/svm/nested.c +@@ -1387,6 +1387,12 @@ static int svm_set_nested_state(struct k + nested_vmcb02_prepare_control(svm); + + /* ++ * Any previously restored state (e.g. KVM_SET_SREGS) would mark fields ++ * dirty in vmcb01 instead of vmcb02, so mark all of vmcb02 dirty here. ++ */ ++ vmcb_mark_all_dirty(svm->vmcb); ++ ++ /* + * While the nested guest CR3 is already checked and set by + * KVM_SET_SREGS, it was set when nested state was yet loaded, + * thus MMU might not be initialized correctly. diff --git a/queue-5.15/kvm-nsvm-sync-interrupt-shadow-to-cached-vmcb12-after-vmrun-of-l2.patch b/queue-5.15/kvm-nsvm-sync-interrupt-shadow-to-cached-vmcb12-after-vmrun-of-l2.patch new file mode 100644 index 0000000000..7a0f3ea5af --- /dev/null +++ b/queue-5.15/kvm-nsvm-sync-interrupt-shadow-to-cached-vmcb12-after-vmrun-of-l2.patch @@ -0,0 +1,52 @@ +From 03bee264f8ebfd39e0254c98e112d033a7aa9055 Mon Sep 17 00:00:00 2001 +From: Yosry Ahmed +Date: Wed, 25 Feb 2026 00:59:44 +0000 +Subject: KVM: nSVM: Sync interrupt shadow to cached vmcb12 after VMRUN of L2 + +From: Yosry Ahmed + +commit 03bee264f8ebfd39e0254c98e112d033a7aa9055 upstream. + +After VMRUN in guest mode, nested_sync_control_from_vmcb02() syncs +fields written by the CPU from vmcb02 to the cached vmcb12. This is +because the cached vmcb12 is used as the authoritative copy of some of +the controls, and is the payload when saving/restoring nested state. + +int_state is also written by the CPU, specifically bit 0 (i.e. +SVM_INTERRUPT_SHADOW_MASK) for nested VMs, but it is not sync'd to +cached vmcb12. This does not cause a problem if KVM_SET_NESTED_STATE +preceeds KVM_SET_VCPU_EVENTS in the restore path, as an interrupt shadow +would be correctly restored to vmcb02 (KVM_SET_VCPU_EVENTS overwrites +what KVM_SET_NESTED_STATE restored in int_state). + +However, if KVM_SET_VCPU_EVENTS preceeds KVM_SET_NESTED_STATE, an +interrupt shadow would be restored into vmcb01 instead of vmcb02. This +would mostly be benign for L1 (delays an interrupt), but not for L2. For +L2, the vCPU could hang (e.g. if a wakeup interrupt is delivered before +a HLT that should have been in an interrupt shadow). + +Sync int_state to the cached vmcb12 in nested_sync_control_from_vmcb02() +to avoid this problem. With that, KVM_SET_NESTED_STATE restores the +correct interrupt shadow state, and if KVM_SET_VCPU_EVENTS follows it +would overwrite it with the same value. + +Fixes: cc440cdad5b7 ("KVM: nSVM: implement KVM_GET_NESTED_STATE and KVM_SET_NESTED_STATE") +CC: stable@vger.kernel.org +Signed-off-by: Yosry Ahmed +Link: https://patch.msgid.link/20260225005950.3739782-3-yosry@kernel.org +Signed-off-by: Sean Christopherson +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kvm/svm/nested.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/x86/kvm/svm/nested.c ++++ b/arch/x86/kvm/svm/nested.c +@@ -336,6 +336,7 @@ void nested_sync_control_from_vmcb02(str + u32 mask; + svm->nested.ctl.event_inj = svm->vmcb->control.event_inj; + svm->nested.ctl.event_inj_err = svm->vmcb->control.event_inj_err; ++ svm->nested.ctl.int_state = svm->vmcb->control.int_state; + + /* Only a few fields of int_ctl are written by the processor. */ + mask = V_IRQ_MASK | V_TPR_MASK; diff --git a/queue-5.15/kvm-nsvm-sync-nextrip-to-cached-vmcb12-after-vmrun-of-l2.patch b/queue-5.15/kvm-nsvm-sync-nextrip-to-cached-vmcb12-after-vmrun-of-l2.patch new file mode 100644 index 0000000000..a36ba609ce --- /dev/null +++ b/queue-5.15/kvm-nsvm-sync-nextrip-to-cached-vmcb12-after-vmrun-of-l2.patch @@ -0,0 +1,55 @@ +From 778d8c1b2a6ffe622ddcd3bb35b620e6e41f4da0 Mon Sep 17 00:00:00 2001 +From: Yosry Ahmed +Date: Wed, 25 Feb 2026 00:59:43 +0000 +Subject: KVM: nSVM: Sync NextRIP to cached vmcb12 after VMRUN of L2 + +From: Yosry Ahmed + +commit 778d8c1b2a6ffe622ddcd3bb35b620e6e41f4da0 upstream. + +After VMRUN in guest mode, nested_sync_control_from_vmcb02() syncs +fields written by the CPU from vmcb02 to the cached vmcb12. This is +because the cached vmcb12 is used as the authoritative copy of some of +the controls, and is the payload when saving/restoring nested state. + +NextRIP is also written by the CPU (in some cases) after VMRUN, but is +not sync'd to the cached vmcb12. As a result, it is corrupted after +save/restore (replaced by the original value written by L1 on nested +VMRUN). This could cause problems for both KVM (e.g. when injecting a +soft IRQ) or L1 (e.g. when using NextRIP to advance RIP after emulating +an instruction). + +Fix this by sync'ing NextRIP to the cache after VMRUN of L2, but only +after completing interrupts (not in nested_sync_control_from_vmcb02()), +as KVM may update NextRIP (e.g. when re-injecting a soft IRQ). + +Fixes: cc440cdad5b7 ("KVM: nSVM: implement KVM_GET_NESTED_STATE and KVM_SET_NESTED_STATE") +CC: stable@vger.kernel.org +Co-developed-by: Sean Christopherson +Signed-off-by: Yosry Ahmed +Link: https://patch.msgid.link/20260225005950.3739782-2-yosry@kernel.org +Signed-off-by: Sean Christopherson +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kvm/svm/svm.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/arch/x86/kvm/svm/svm.c ++++ b/arch/x86/kvm/svm/svm.c +@@ -3952,6 +3952,16 @@ static __no_kcsan fastpath_t svm_vcpu_ru + if (is_guest_mode(vcpu)) + return EXIT_FASTPATH_NONE; + ++ /* ++ * Update the cache after completing interrupts to get an accurate ++ * NextRIP, e.g. when re-injecting a soft interrupt. ++ * ++ * FIXME: Rework svm_get_nested_state() to not pull data from the ++ * cache (except for maybe int_ctl). ++ */ ++ if (is_guest_mode(vcpu)) ++ svm->nested.ctl.next_rip = svm->vmcb->control.next_rip; ++ + return svm_exit_handlers_fastpath(vcpu); + } + diff --git a/queue-5.15/kvm-svm-explicitly-mark-vmcb01-dirty-after-modifying-vmcb-intercepts.patch b/queue-5.15/kvm-svm-explicitly-mark-vmcb01-dirty-after-modifying-vmcb-intercepts.patch new file mode 100644 index 0000000000..86bc401cce --- /dev/null +++ b/queue-5.15/kvm-svm-explicitly-mark-vmcb01-dirty-after-modifying-vmcb-intercepts.patch @@ -0,0 +1,42 @@ +From d5bde6113aed8315a2bfe708730b721be9c2f48b Mon Sep 17 00:00:00 2001 +From: Sean Christopherson +Date: Wed, 18 Feb 2026 15:09:51 -0800 +Subject: KVM: SVM: Explicitly mark vmcb01 dirty after modifying VMCB intercepts + +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; diff --git a/queue-5.15/kvm-svm-inject-ud-for-invlpga-if-efer.svme-0.patch b/queue-5.15/kvm-svm-inject-ud-for-invlpga-if-efer.svme-0.patch new file mode 100644 index 0000000000..87218f259d --- /dev/null +++ b/queue-5.15/kvm-svm-inject-ud-for-invlpga-if-efer.svme-0.patch @@ -0,0 +1,36 @@ +From d99df02ff427f461102230f9c5b90a6c64ee8e23 Mon Sep 17 00:00:00 2001 +From: Kevin Cheng +Date: Sat, 28 Feb 2026 03:33:26 +0000 +Subject: KVM: SVM: Inject #UD for INVLPGA if EFER.SVME=0 + +From: Kevin Cheng + +commit d99df02ff427f461102230f9c5b90a6c64ee8e23 upstream. + +INVLPGA should cause a #UD when EFER.SVME is not set. Add a check to +properly inject #UD when EFER.SVME=0. + +Fixes: ff092385e828 ("KVM: SVM: Implement INVLPGA") +Cc: stable@vger.kernel.org +Signed-off-by: Kevin Cheng +Reviewed-by: Yosry Ahmed +Link: https://patch.msgid.link/20260228033328.2285047-3-chengkev@google.com +[sean: tag for stable@] +Signed-off-by: Sean Christopherson +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kvm/svm/svm.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/arch/x86/kvm/svm/svm.c ++++ b/arch/x86/kvm/svm/svm.c +@@ -2363,6 +2363,9 @@ static int invlpga_interception(struct k + gva_t gva = kvm_rax_read(vcpu); + u32 asid = kvm_rcx_read(vcpu); + ++ if (nested_svm_check_permissions(vcpu)) ++ return 1; ++ + /* FIXME: Handle an address size prefix. */ + if (!is_long_mode(vcpu)) + gva = (u32)gva; diff --git a/queue-5.15/mmc-block-use-single-block-write-in-retry.patch b/queue-5.15/mmc-block-use-single-block-write-in-retry.patch new file mode 100644 index 0000000000..574646ce50 --- /dev/null +++ b/queue-5.15/mmc-block-use-single-block-write-in-retry.patch @@ -0,0 +1,92 @@ +From c7c6d4f5103864f73ee3a78bfd6da241f84197dd Mon Sep 17 00:00:00 2001 +From: Bin Liu +Date: Wed, 25 Mar 2026 08:49:47 -0500 +Subject: mmc: block: use single block write in retry + +From: Bin Liu + +commit c7c6d4f5103864f73ee3a78bfd6da241f84197dd upstream. + +Due to errata i2493[0], multi-block write would still fail in retries. + +With i2493, the MMC interface has the potential of write failures when +issuing multi-block writes operating in HS200 mode with excessive IO +supply noise. + +While the errata provides guidance in hardware design and layout to +minimize the IO supply noise, in theory the write failure cannot be +resolved in hardware. The software solution to ensure the data integrity +is to add minimum 5us delay between block writes. Single-block write is +the practical way to introduce the delay. + +This patch reuses recovery_mode flag, and switches to single-block +write in retry when multi-block write fails. It covers both CQE and +non-CQE cases. + +[0] https://www.ti.com/lit/pdf/sprz582 +Cc: stable@vger.kernel.org +Suggested-by: Jens Axboe +Signed-off-by: Bin Liu +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mmc/core/block.c | 12 ++++++++++-- + drivers/mmc/core/queue.h | 3 +++ + 2 files changed, 13 insertions(+), 2 deletions(-) + +--- a/drivers/mmc/core/block.c ++++ b/drivers/mmc/core/block.c +@@ -1361,6 +1361,9 @@ static void mmc_blk_data_prep(struct mmc + rq_data_dir(req) == WRITE && + (md->flags & MMC_BLK_REL_WR); + ++ if (mqrq->flags & MQRQ_XFER_SINGLE_BLOCK) ++ recovery_mode = 1; ++ + memset(brq, 0, sizeof(struct mmc_blk_request)); + + mmc_crypto_prepare_req(mqrq); +@@ -1500,10 +1503,13 @@ static void mmc_blk_cqe_complete_rq(stru + err = 0; + + if (err) { +- if (mqrq->retries++ < MMC_CQE_RETRIES) ++ if (mqrq->retries++ < MMC_CQE_RETRIES) { ++ if (rq_data_dir(req) == WRITE) ++ mqrq->flags |= MQRQ_XFER_SINGLE_BLOCK; + blk_mq_requeue_request(req, true); +- else ++ } else { + blk_mq_end_request(req, BLK_STS_IOERR); ++ } + } else if (mrq->data) { + if (blk_update_request(req, BLK_STS_OK, mrq->data->bytes_xfered)) + blk_mq_requeue_request(req, true); +@@ -2041,6 +2047,8 @@ static void mmc_blk_mq_complete_rq(struc + } else if (!blk_rq_bytes(req)) { + __blk_mq_end_request(req, BLK_STS_IOERR); + } else if (mqrq->retries++ < MMC_MAX_RETRIES) { ++ if (rq_data_dir(req) == WRITE) ++ mqrq->flags |= MQRQ_XFER_SINGLE_BLOCK; + blk_mq_requeue_request(req, true); + } else { + if (mmc_card_removed(mq->card)) +--- a/drivers/mmc/core/queue.h ++++ b/drivers/mmc/core/queue.h +@@ -61,6 +61,8 @@ enum mmc_drv_op { + MMC_DRV_OP_GET_EXT_CSD, + }; + ++#define MQRQ_XFER_SINGLE_BLOCK BIT(0) ++ + struct mmc_queue_req { + struct mmc_blk_request brq; + struct scatterlist *sg; +@@ -69,6 +71,7 @@ struct mmc_queue_req { + void *drv_op_data; + unsigned int ioc_count; + int retries; ++ u32 flags; + }; + + struct mmc_queue { diff --git a/queue-5.15/rtc-ntxec-fix-of-node-reference-imbalance.patch b/queue-5.15/rtc-ntxec-fix-of-node-reference-imbalance.patch new file mode 100644 index 0000000000..06f8ab75a2 --- /dev/null +++ b/queue-5.15/rtc-ntxec-fix-of-node-reference-imbalance.patch @@ -0,0 +1,41 @@ +From 30c4d2f26bb3538c328035cea2e6265c8320539e Mon Sep 17 00:00:00 2001 +From: Johan Hovold +Date: Tue, 7 Apr 2026 14:27:17 +0200 +Subject: rtc: ntxec: fix OF node reference imbalance +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Johan Hovold + +commit 30c4d2f26bb3538c328035cea2e6265c8320539e upstream. + +The driver reuses the OF node of the parent multi-function device but +fails to take another reference to balance the one dropped by the +platform bus code when unbinding the MFD and deregistering the child +devices. + +Fix this by using the intended helper for reusing OF nodes. + +Fixes: 435af89786c6 ("rtc: New driver for RTC in Netronix embedded controller") +Cc: stable@vger.kernel.org # 5.13 +Cc: Jonathan Neuschäfer +Signed-off-by: Johan Hovold +Link: https://patch.msgid.link/20260407122717.2676774-1-johan@kernel.org +Signed-off-by: Alexandre Belloni +Signed-off-by: Greg Kroah-Hartman +--- + drivers/rtc/rtc-ntxec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/rtc/rtc-ntxec.c ++++ b/drivers/rtc/rtc-ntxec.c +@@ -110,7 +110,7 @@ static int ntxec_rtc_probe(struct platfo + struct rtc_device *dev; + struct ntxec_rtc *rtc; + +- pdev->dev.of_node = pdev->dev.parent->of_node; ++ device_set_of_node_from_dev(&pdev->dev, pdev->dev.parent); + + rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL); + if (!rtc) diff --git a/queue-5.15/series b/queue-5.15/series index 19eb6afdb2..61841ebe52 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -226,3 +226,16 @@ ipv4-icmp-validate-reply-type-before-using-icmp_pointers.patch libceph-prevent-potential-null-ptr-deref-in-ceph_handle_auth_reply.patch tpm-avoid-wunused-but-set-variable.patch power-supply-axp288_charger-do-not-cancel-work-before-initializing-it.patch +mmc-block-use-single-block-write-in-retry.patch +tpm-tpm_tis-add-error-logging-for-data-transfer.patch +rtc-ntxec-fix-of-node-reference-imbalance.patch +userfaultfd-allow-registration-of-ranges-below-mmap_min_addr.patch +kvm-nsvm-mark-all-of-vmcb02-dirty-when-restoring-nested-state.patch +kvm-nsvm-sync-nextrip-to-cached-vmcb12-after-vmrun-of-l2.patch +kvm-nsvm-sync-interrupt-shadow-to-cached-vmcb12-after-vmrun-of-l2.patch +kvm-svm-inject-ud-for-invlpga-if-efer.svme-0.patch +kvm-svm-explicitly-mark-vmcb01-dirty-after-modifying-vmcb-intercepts.patch +kvm-nsvm-ensure-avic-is-inhibited-when-restoring-a-vcpu-to-guest-mode.patch +kvm-nsvm-always-inject-a-gp-if-mapping-vmcb12-fails-on-nested-vmrun.patch +kvm-nsvm-clear-gif-on-nested-vmexit-invalid.patch +kvm-nsvm-add-missing-consistency-check-for-ncr3-validity.patch diff --git a/queue-5.15/tpm-tpm_tis-add-error-logging-for-data-transfer.patch b/queue-5.15/tpm-tpm_tis-add-error-logging-for-data-transfer.patch new file mode 100644 index 0000000000..17d56e4074 --- /dev/null +++ b/queue-5.15/tpm-tpm_tis-add-error-logging-for-data-transfer.patch @@ -0,0 +1,42 @@ +From 0471921e2d1043dcc6de5cffb49dd37709521abe Mon Sep 17 00:00:00 2001 +From: Jacqueline Wong +Date: Wed, 15 Apr 2026 16:00:05 +0000 +Subject: tpm: tpm_tis: add error logging for data transfer + +From: Jacqueline Wong + +commit 0471921e2d1043dcc6de5cffb49dd37709521abe upstream. + +Add logging to more easily determine reason for transmit failure + +Cc: stable@vger.kernel.org # v6.6+ +Fixes: 280db21e153d8 ("tpm_tis: Resend command to recover from data transfer errors") +Signed-off-by: Jacqueline Wong +Signed-off-by: Jordan Hand +Link: https://lore.kernel.org/r/20260415160006.2275325-2-jacqwong@google.com +Signed-off-by: Jarkko Sakkinen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/char/tpm/tpm_tis_core.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/char/tpm/tpm_tis_core.c ++++ b/drivers/char/tpm/tpm_tis_core.c +@@ -410,6 +410,8 @@ static int tpm_tis_send_data(struct tpm_ + status = tpm_tis_status(chip); + if (!itpm && (status & TPM_STS_DATA_EXPECT) == 0) { + rc = -EIO; ++ dev_err(&chip->dev, "TPM_STS_DATA_EXPECT should be set. sts = 0x%08x\n", ++ status); + goto out_err; + } + } +@@ -427,6 +429,8 @@ static int tpm_tis_send_data(struct tpm_ + status = tpm_tis_status(chip); + if (!itpm && (status & TPM_STS_DATA_EXPECT) != 0) { + rc = -EIO; ++ dev_err(&chip->dev, "TPM_STS_DATA_EXPECT should be unset. sts = 0x%08x\n", ++ status); + goto out_err; + } + diff --git a/queue-5.15/userfaultfd-allow-registration-of-ranges-below-mmap_min_addr.patch b/queue-5.15/userfaultfd-allow-registration-of-ranges-below-mmap_min_addr.patch new file mode 100644 index 0000000000..59b9a77811 --- /dev/null +++ b/queue-5.15/userfaultfd-allow-registration-of-ranges-below-mmap_min_addr.patch @@ -0,0 +1,60 @@ +From 161ce69c2c89781784b945d8e281ff2da9dede9c Mon Sep 17 00:00:00 2001 +From: "Denis M. Karpov" +Date: Thu, 9 Apr 2026 13:33:45 +0300 +Subject: userfaultfd: allow registration of ranges below mmap_min_addr + +From: Denis M. Karpov + +commit 161ce69c2c89781784b945d8e281ff2da9dede9c upstream. + +The current implementation of validate_range() in fs/userfaultfd.c +performs a hard check against mmap_min_addr. This is redundant because +UFFDIO_REGISTER operates on memory ranges that must already be backed by a +VMA. + +Enforcing mmap_min_addr or capability checks again in userfaultfd is +unnecessary and prevents applications like binary compilers from using +UFFD for valid memory regions mapped by application. + +Remove the redundant check for mmap_min_addr. + +We started using UFFD instead of the classic mprotect approach in the +binary translator to track application writes. During development, we +encountered this bug. The translator cannot control where the translated +application chooses to map its memory and if the app requires a +low-address area, UFFD fails, whereas mprotect would work just fine. I +believe this is a genuine logic bug rather than an improvement, and I +would appreciate including the fix in stable. + +Link: https://lore.kernel.org/20260409103345.15044-1-komlomal@gmail.com +Fixes: 86039bd3b4e6 ("userfaultfd: add new syscall to provide memory externalization") +Signed-off-by: Denis M. Karpov +Reviewed-by: Lorenzo Stoakes +Acked-by: Harry Yoo (Oracle) +Reviewed-by: Pedro Falcato +Reviewed-by: Liam R. Howlett +Reviewed-by: Mike Rapoport (Microsoft) +Cc: Alexander Viro +Cc: Al Viro +Cc: Christian Brauner +Cc: Jan Kara +Cc: Jann Horn +Cc: Peter Xu +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + fs/userfaultfd.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/fs/userfaultfd.c ++++ b/fs/userfaultfd.c +@@ -1242,8 +1242,6 @@ static __always_inline int validate_rang + return -EINVAL; + if (!len) + return -EINVAL; +- if (start < mmap_min_addr) +- return -EINVAL; + if (start >= task_size) + return -EINVAL; + if (len > task_size - start)