From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 21 Jan 2026 17:29:57 +0000 (+0100)
Subject: 6.18-stable patches
X-Git-Tag: v6.12.67~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55ce78e74b6f14840901976549494734324953d4;p=thirdparty%2Fkernel%2Fstable-queue.git

6.18-stable patches

added patches:
	iommu-sva-include-mmu_notifier.h-header.patch
---

diff --git a/queue-6.18/iommu-sva-include-mmu_notifier.h-header.patch b/queue-6.18/iommu-sva-include-mmu_notifier.h-header.patch
new file mode 100644
index 0000000000..162569c31a
--- /dev/null
+++ b/queue-6.18/iommu-sva-include-mmu_notifier.h-header.patch
@@ -0,0 +1,58 @@
+From 4b5c493ff762bb0433529ca6870b284f0a2a5ca8 Mon Sep 17 00:00:00 2001
+From: Carlos Llamas <cmllamas@google.com>
+Date: Mon, 5 Jan 2026 19:07:46 +0000
+Subject: iommu/sva: include mmu_notifier.h header
+
+From: Carlos Llamas <cmllamas@google.com>
+
+commit 4b5c493ff762bb0433529ca6870b284f0a2a5ca8 upstream.
+
+A call to mmu_notifier_arch_invalidate_secondary_tlbs() was introduced in
+commit e37d5a2d60a3 ("iommu/sva: invalidate stale IOTLB entries for kernel
+address space") but without explicitly adding its corresponding header
+file <linux/mmu_notifier.h>.  This was evidenced while trying to enable
+compile testing support for IOMMU_SVA:
+
+   config IOMMU_SVA
+          select IOMMU_MM_DATA
+  -       bool
+  +       bool "Shared Virtual Addressing" if COMPILE_TEST
+
+The thing is for certain architectures this header file is indirectly
+included via <asm/tlbflush.h>.  However, for others such as 32-bit arm the
+header is missing and it results in a build failure:
+
+  $ make ARCH=arm allmodconfig
+  [...]
+  drivers/iommu/iommu-sva.c:340:3: error: call to undeclared function 'mmu_notifier_arch_invalidate_secondary_tlbs' [...]
+    340 |  mmu_notifier_arch_invalidate_secondary_tlbs(iommu_mm->mm, start, end);
+        |  ^
+
+Fix this by including the appropriate header file.
+
+Link: https://lkml.kernel.org/r/20260105190747.625082-1-cmllamas@google.com
+Fixes: e37d5a2d60a3 ("iommu/sva: invalidate stale IOTLB entries for kernel address space")
+Signed-off-by: Carlos Llamas <cmllamas@google.com>
+Cc: Baolu Lu <baolu.lu@linux.intel.com>
+Cc: Jason Gunthorpe <jgg@ziepe.ca>
+Cc: Joerg Roedel <joro@8bytes.org>
+Cc: Kevin Tian <kevin.tian@intel.com>
+Cc: Robin Murphy <robin.murphy@arm.com>
+Cc: Vasant Hegde <vasant.hegde@amd.com>
+Cc: Will Deacon <will@kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/iommu/iommu-sva.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/iommu/iommu-sva.c
++++ b/drivers/iommu/iommu-sva.c
+@@ -3,6 +3,7 @@
+  * Helpers for IOMMU drivers implementing SVA
+  */
+ #include <linux/mmu_context.h>
++#include <linux/mmu_notifier.h>
+ #include <linux/mutex.h>
+ #include <linux/sched/mm.h>
+ #include <linux/iommu.h>
diff --git a/queue-6.18/series b/queue-6.18/series
index 1032b9bc7e..1c589893f4 100644
--- a/queue-6.18/series
+++ b/queue-6.18/series
@@ -195,3 +195,4 @@ mm-page_alloc-vmstat-simplify-refresh_cpu_vm_stats-change-detection.patch
 mm-page_alloc-batch-page-freeing-in-decay_pcp_high.patch
 mm-page_alloc-prevent-pcp-corruption-with-smp-n.patch
 revert-functionfs-fix-the-open-removal-races.patch
+iommu-sva-include-mmu_notifier.h-header.patch