]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop iommu patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Apr 2026 05:35:06 +0000 (07:35 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Apr 2026 05:35:06 +0000 (07:35 +0200)
14 files changed:
queue-5.10/iommu-do-not-call-drivers-for-empty-gathers.patch [deleted file]
queue-5.10/series
queue-5.15/iommu-do-not-call-drivers-for-empty-gathers.patch [deleted file]
queue-5.15/series
queue-6.1/iommu-do-not-call-drivers-for-empty-gathers.patch [deleted file]
queue-6.1/series
queue-6.12/iommu-do-not-call-drivers-for-empty-gathers.patch [deleted file]
queue-6.12/series
queue-6.18/iommu-do-not-call-drivers-for-empty-gathers.patch [deleted file]
queue-6.18/series
queue-6.19/iommu-do-not-call-drivers-for-empty-gathers.patch [deleted file]
queue-6.19/series
queue-6.6/iommu-do-not-call-drivers-for-empty-gathers.patch [deleted file]
queue-6.6/series

diff --git a/queue-5.10/iommu-do-not-call-drivers-for-empty-gathers.patch b/queue-5.10/iommu-do-not-call-drivers-for-empty-gathers.patch
deleted file mode 100644 (file)
index c8c8f56..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 90c5def10bea574b101b7a520c015ca81742183f Mon Sep 17 00:00:00 2001
-From: Jason Gunthorpe <jgg@nvidia.com>
-Date: Mon, 2 Mar 2026 18:22:52 -0400
-Subject: iommu: Do not call drivers for empty gathers
-
-From: Jason Gunthorpe <jgg@nvidia.com>
-
-commit 90c5def10bea574b101b7a520c015ca81742183f upstream.
-
-An empty gather is coded with start=U64_MAX, end=0 and several drivers go
-on to convert that to a size with:
-
- end - start + 1
-
-Which gives 2 for an empty gather. This then causes Weird Stuff to
-happen (for example an UBSAN splat in VT-d) that is hopefully harmless,
-but maybe not.
-
-Prevent drivers from being called right in iommu_iotlb_sync().
-
-Auditing shows that AMD, Intel, Mediatek and RSIC-V drivers all do things
-on these empty gathers.
-
-Further, there are several callers that can trigger empty gathers,
-especially in unusual conditions. For example iommu_map_nosync() will call
-a 0 size unmap on some error paths. Also in VFIO, iommupt and other
-places.
-
-Cc: stable@vger.kernel.org
-Reported-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
-Closes: https://lore.kernel.org/r/11145826.aFP6jjVeTY@jkrzyszt-mobl2.ger.corp.intel.com
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
-Reviewed-by: Samiullah Khawaja <skhawaja@google.com>
-Reviewed-by: Robin Murphy <robin.murphy@arm.com>
-Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>
-Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- include/linux/iommu.h |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/include/linux/iommu.h
-+++ b/include/linux/iommu.h
-@@ -526,7 +526,8 @@ static inline void iommu_flush_iotlb_all
- static inline void iommu_iotlb_sync(struct iommu_domain *domain,
-                                 struct iommu_iotlb_gather *iotlb_gather)
- {
--      if (domain->ops->iotlb_sync)
-+      if (domain->ops->iotlb_sync &&
-+          likely(iotlb_gather->start < iotlb_gather->end))
-               domain->ops->iotlb_sync(domain, iotlb_gather);
-       iommu_iotlb_gather_init(iotlb_gather);
index 3bafbfcce55a926dcd828c38353632b01f5f5dfc..dc6707fa92a6a1c78c2aae73fea32b4655dd73c2 100644 (file)
@@ -373,7 +373,6 @@ alsa-ctxfi-fix-missing-spdifi1-index-handling.patch
 bluetooth-smp-derive-legacy-responder-stk-authentication-from-mitm-state.patch
 bluetooth-smp-force-responder-mitm-requirements-before-building-the-pairing-response.patch
 mips-fix-the-gcc-version-check-for-__multi3-workaround.patch
-iommu-do-not-call-drivers-for-empty-gathers.patch
 hwmon-occ-fix-division-by-zero-in-occ_show_power_1.patch
 drm-ast-dp501-fix-initialization-of-scu2c.patch
 usb-serial-io_edgeport-add-support-for-blackbox-ic135a.patch
diff --git a/queue-5.15/iommu-do-not-call-drivers-for-empty-gathers.patch b/queue-5.15/iommu-do-not-call-drivers-for-empty-gathers.patch
deleted file mode 100644 (file)
index 96e8d09..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 90c5def10bea574b101b7a520c015ca81742183f Mon Sep 17 00:00:00 2001
-From: Jason Gunthorpe <jgg@nvidia.com>
-Date: Mon, 2 Mar 2026 18:22:52 -0400
-Subject: iommu: Do not call drivers for empty gathers
-
-From: Jason Gunthorpe <jgg@nvidia.com>
-
-commit 90c5def10bea574b101b7a520c015ca81742183f upstream.
-
-An empty gather is coded with start=U64_MAX, end=0 and several drivers go
-on to convert that to a size with:
-
- end - start + 1
-
-Which gives 2 for an empty gather. This then causes Weird Stuff to
-happen (for example an UBSAN splat in VT-d) that is hopefully harmless,
-but maybe not.
-
-Prevent drivers from being called right in iommu_iotlb_sync().
-
-Auditing shows that AMD, Intel, Mediatek and RSIC-V drivers all do things
-on these empty gathers.
-
-Further, there are several callers that can trigger empty gathers,
-especially in unusual conditions. For example iommu_map_nosync() will call
-a 0 size unmap on some error paths. Also in VFIO, iommupt and other
-places.
-
-Cc: stable@vger.kernel.org
-Reported-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
-Closes: https://lore.kernel.org/r/11145826.aFP6jjVeTY@jkrzyszt-mobl2.ger.corp.intel.com
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
-Reviewed-by: Samiullah Khawaja <skhawaja@google.com>
-Reviewed-by: Robin Murphy <robin.murphy@arm.com>
-Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>
-Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- include/linux/iommu.h |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/include/linux/iommu.h
-+++ b/include/linux/iommu.h
-@@ -517,7 +517,8 @@ static inline void iommu_flush_iotlb_all
- static inline void iommu_iotlb_sync(struct iommu_domain *domain,
-                                 struct iommu_iotlb_gather *iotlb_gather)
- {
--      if (domain->ops->iotlb_sync)
-+      if (domain->ops->iotlb_sync &&
-+          likely(iotlb_gather->start < iotlb_gather->end))
-               domain->ops->iotlb_sync(domain, iotlb_gather);
-       iommu_iotlb_gather_init(iotlb_gather);
index b5171d35508abb48a0071b9035bb1b4485ad191a..2e9892b2d79663308be35c188e9cb587989b68a3 100644 (file)
@@ -448,7 +448,6 @@ alsa-ctxfi-fix-missing-spdifi1-index-handling.patch
 bluetooth-smp-derive-legacy-responder-stk-authentication-from-mitm-state.patch
 bluetooth-smp-force-responder-mitm-requirements-before-building-the-pairing-response.patch
 mips-fix-the-gcc-version-check-for-__multi3-workaround.patch
-iommu-do-not-call-drivers-for-empty-gathers.patch
 hwmon-occ-fix-division-by-zero-in-occ_show_power_1.patch
 drm-ast-dp501-fix-initialization-of-scu2c.patch
 usb-serial-io_edgeport-add-support-for-blackbox-ic135a.patch
diff --git a/queue-6.1/iommu-do-not-call-drivers-for-empty-gathers.patch b/queue-6.1/iommu-do-not-call-drivers-for-empty-gathers.patch
deleted file mode 100644 (file)
index 66d504d..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 90c5def10bea574b101b7a520c015ca81742183f Mon Sep 17 00:00:00 2001
-From: Jason Gunthorpe <jgg@nvidia.com>
-Date: Mon, 2 Mar 2026 18:22:52 -0400
-Subject: iommu: Do not call drivers for empty gathers
-
-From: Jason Gunthorpe <jgg@nvidia.com>
-
-commit 90c5def10bea574b101b7a520c015ca81742183f upstream.
-
-An empty gather is coded with start=U64_MAX, end=0 and several drivers go
-on to convert that to a size with:
-
- end - start + 1
-
-Which gives 2 for an empty gather. This then causes Weird Stuff to
-happen (for example an UBSAN splat in VT-d) that is hopefully harmless,
-but maybe not.
-
-Prevent drivers from being called right in iommu_iotlb_sync().
-
-Auditing shows that AMD, Intel, Mediatek and RSIC-V drivers all do things
-on these empty gathers.
-
-Further, there are several callers that can trigger empty gathers,
-especially in unusual conditions. For example iommu_map_nosync() will call
-a 0 size unmap on some error paths. Also in VFIO, iommupt and other
-places.
-
-Cc: stable@vger.kernel.org
-Reported-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
-Closes: https://lore.kernel.org/r/11145826.aFP6jjVeTY@jkrzyszt-mobl2.ger.corp.intel.com
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
-Reviewed-by: Samiullah Khawaja <skhawaja@google.com>
-Reviewed-by: Robin Murphy <robin.murphy@arm.com>
-Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>
-Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- include/linux/iommu.h |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/include/linux/iommu.h
-+++ b/include/linux/iommu.h
-@@ -509,7 +509,8 @@ static inline void iommu_flush_iotlb_all
- static inline void iommu_iotlb_sync(struct iommu_domain *domain,
-                                 struct iommu_iotlb_gather *iotlb_gather)
- {
--      if (domain->ops->iotlb_sync)
-+      if (domain->ops->iotlb_sync &&
-+          likely(iotlb_gather->start < iotlb_gather->end))
-               domain->ops->iotlb_sync(domain, iotlb_gather);
-       iommu_iotlb_gather_init(iotlb_gather);
index 98e49a89fd262b0c3a4fb4bcc0d827672e7c7a44..0b93fbf934922ef124cb60374c2454591aa98296 100644 (file)
@@ -204,7 +204,6 @@ alsa-ctxfi-fix-missing-spdifi1-index-handling.patch
 bluetooth-smp-derive-legacy-responder-stk-authentication-from-mitm-state.patch
 bluetooth-smp-force-responder-mitm-requirements-before-building-the-pairing-response.patch
 mips-fix-the-gcc-version-check-for-__multi3-workaround.patch
-iommu-do-not-call-drivers-for-empty-gathers.patch
 hwmon-occ-fix-division-by-zero-in-occ_show_power_1.patch
 mips-mm-allocate-tlb_vpn-array-atomically.patch
 iio-adc-ti-adc161s626-fix-buffer-read-on-big-endian.patch
diff --git a/queue-6.12/iommu-do-not-call-drivers-for-empty-gathers.patch b/queue-6.12/iommu-do-not-call-drivers-for-empty-gathers.patch
deleted file mode 100644 (file)
index 81c6657..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 90c5def10bea574b101b7a520c015ca81742183f Mon Sep 17 00:00:00 2001
-From: Jason Gunthorpe <jgg@nvidia.com>
-Date: Mon, 2 Mar 2026 18:22:52 -0400
-Subject: iommu: Do not call drivers for empty gathers
-
-From: Jason Gunthorpe <jgg@nvidia.com>
-
-commit 90c5def10bea574b101b7a520c015ca81742183f upstream.
-
-An empty gather is coded with start=U64_MAX, end=0 and several drivers go
-on to convert that to a size with:
-
- end - start + 1
-
-Which gives 2 for an empty gather. This then causes Weird Stuff to
-happen (for example an UBSAN splat in VT-d) that is hopefully harmless,
-but maybe not.
-
-Prevent drivers from being called right in iommu_iotlb_sync().
-
-Auditing shows that AMD, Intel, Mediatek and RSIC-V drivers all do things
-on these empty gathers.
-
-Further, there are several callers that can trigger empty gathers,
-especially in unusual conditions. For example iommu_map_nosync() will call
-a 0 size unmap on some error paths. Also in VFIO, iommupt and other
-places.
-
-Cc: stable@vger.kernel.org
-Reported-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
-Closes: https://lore.kernel.org/r/11145826.aFP6jjVeTY@jkrzyszt-mobl2.ger.corp.intel.com
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
-Reviewed-by: Samiullah Khawaja <skhawaja@google.com>
-Reviewed-by: Robin Murphy <robin.murphy@arm.com>
-Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>
-Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- include/linux/iommu.h |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/include/linux/iommu.h
-+++ b/include/linux/iommu.h
-@@ -862,7 +862,8 @@ static inline void iommu_flush_iotlb_all
- static inline void iommu_iotlb_sync(struct iommu_domain *domain,
-                                 struct iommu_iotlb_gather *iotlb_gather)
- {
--      if (domain->ops->iotlb_sync)
-+      if (domain->ops->iotlb_sync &&
-+          likely(iotlb_gather->start < iotlb_gather->end))
-               domain->ops->iotlb_sync(domain, iotlb_gather);
-       iommu_iotlb_gather_init(iotlb_gather);
index 0e167bcf87960041d199c63d75c99944c298728a..916ff290930ccf5951af9d683bb8fae86f7a4ab9 100644 (file)
@@ -130,7 +130,6 @@ ksmbd-fix-oob-write-in-query_info-for-compound-requests.patch
 mips-mm-rewrite-tlb-uniquification-for-the-hidden-bit-feature.patch
 mips-sibyte-bring-back-cache-initialisation.patch
 mips-fix-the-gcc-version-check-for-__multi3-workaround.patch
-iommu-do-not-call-drivers-for-empty-gathers.patch
 hwmon-occ-fix-division-by-zero-in-occ_show_power_1.patch
 mips-mm-allocate-tlb_vpn-array-atomically.patch
 drm-amdgpu-fix-the-idr-allocation-flags.patch
diff --git a/queue-6.18/iommu-do-not-call-drivers-for-empty-gathers.patch b/queue-6.18/iommu-do-not-call-drivers-for-empty-gathers.patch
deleted file mode 100644 (file)
index f8fb79e..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 90c5def10bea574b101b7a520c015ca81742183f Mon Sep 17 00:00:00 2001
-From: Jason Gunthorpe <jgg@nvidia.com>
-Date: Mon, 2 Mar 2026 18:22:52 -0400
-Subject: iommu: Do not call drivers for empty gathers
-
-From: Jason Gunthorpe <jgg@nvidia.com>
-
-commit 90c5def10bea574b101b7a520c015ca81742183f upstream.
-
-An empty gather is coded with start=U64_MAX, end=0 and several drivers go
-on to convert that to a size with:
-
- end - start + 1
-
-Which gives 2 for an empty gather. This then causes Weird Stuff to
-happen (for example an UBSAN splat in VT-d) that is hopefully harmless,
-but maybe not.
-
-Prevent drivers from being called right in iommu_iotlb_sync().
-
-Auditing shows that AMD, Intel, Mediatek and RSIC-V drivers all do things
-on these empty gathers.
-
-Further, there are several callers that can trigger empty gathers,
-especially in unusual conditions. For example iommu_map_nosync() will call
-a 0 size unmap on some error paths. Also in VFIO, iommupt and other
-places.
-
-Cc: stable@vger.kernel.org
-Reported-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
-Closes: https://lore.kernel.org/r/11145826.aFP6jjVeTY@jkrzyszt-mobl2.ger.corp.intel.com
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
-Reviewed-by: Samiullah Khawaja <skhawaja@google.com>
-Reviewed-by: Robin Murphy <robin.murphy@arm.com>
-Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>
-Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- include/linux/iommu.h |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/include/linux/iommu.h
-+++ b/include/linux/iommu.h
-@@ -978,7 +978,8 @@ static inline void iommu_flush_iotlb_all
- static inline void iommu_iotlb_sync(struct iommu_domain *domain,
-                                 struct iommu_iotlb_gather *iotlb_gather)
- {
--      if (domain->ops->iotlb_sync)
-+      if (domain->ops->iotlb_sync &&
-+          likely(iotlb_gather->start < iotlb_gather->end))
-               domain->ops->iotlb_sync(domain, iotlb_gather);
-       iommu_iotlb_gather_init(iotlb_gather);
index 365911f471936a3ad9adc3a25653d8b13af7318e..09a58c327554eb3ae00b9349585a56d1e43f5ae7 100644 (file)
@@ -146,7 +146,6 @@ ksmbd-fix-oob-write-in-query_info-for-compound-requests.patch
 mips-mm-rewrite-tlb-uniquification-for-the-hidden-bit-feature.patch
 mips-sibyte-bring-back-cache-initialisation.patch
 mips-fix-the-gcc-version-check-for-__multi3-workaround.patch
-iommu-do-not-call-drivers-for-empty-gathers.patch
 hwmon-occ-fix-division-by-zero-in-occ_show_power_1.patch
 mips-mm-allocate-tlb_vpn-array-atomically.patch
 x86-kexec-disable-kcov-instrumentation-after-load_segments.patch
diff --git a/queue-6.19/iommu-do-not-call-drivers-for-empty-gathers.patch b/queue-6.19/iommu-do-not-call-drivers-for-empty-gathers.patch
deleted file mode 100644 (file)
index 86ae89a..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 90c5def10bea574b101b7a520c015ca81742183f Mon Sep 17 00:00:00 2001
-From: Jason Gunthorpe <jgg@nvidia.com>
-Date: Mon, 2 Mar 2026 18:22:52 -0400
-Subject: iommu: Do not call drivers for empty gathers
-
-From: Jason Gunthorpe <jgg@nvidia.com>
-
-commit 90c5def10bea574b101b7a520c015ca81742183f upstream.
-
-An empty gather is coded with start=U64_MAX, end=0 and several drivers go
-on to convert that to a size with:
-
- end - start + 1
-
-Which gives 2 for an empty gather. This then causes Weird Stuff to
-happen (for example an UBSAN splat in VT-d) that is hopefully harmless,
-but maybe not.
-
-Prevent drivers from being called right in iommu_iotlb_sync().
-
-Auditing shows that AMD, Intel, Mediatek and RSIC-V drivers all do things
-on these empty gathers.
-
-Further, there are several callers that can trigger empty gathers,
-especially in unusual conditions. For example iommu_map_nosync() will call
-a 0 size unmap on some error paths. Also in VFIO, iommupt and other
-places.
-
-Cc: stable@vger.kernel.org
-Reported-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
-Closes: https://lore.kernel.org/r/11145826.aFP6jjVeTY@jkrzyszt-mobl2.ger.corp.intel.com
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
-Reviewed-by: Samiullah Khawaja <skhawaja@google.com>
-Reviewed-by: Robin Murphy <robin.murphy@arm.com>
-Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>
-Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- include/linux/iommu.h |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/include/linux/iommu.h
-+++ b/include/linux/iommu.h
-@@ -979,7 +979,8 @@ static inline void iommu_flush_iotlb_all
- static inline void iommu_iotlb_sync(struct iommu_domain *domain,
-                                 struct iommu_iotlb_gather *iotlb_gather)
- {
--      if (domain->ops->iotlb_sync)
-+      if (domain->ops->iotlb_sync &&
-+          likely(iotlb_gather->start < iotlb_gather->end))
-               domain->ops->iotlb_sync(domain, iotlb_gather);
-       iommu_iotlb_gather_init(iotlb_gather);
index d579f71129aeca490cd780cc043149619fe9570e..1b0a6e014e11a5a4fbfccab97740286560bc6fe2 100644 (file)
@@ -184,7 +184,6 @@ ksmbd-fix-oob-write-in-query_info-for-compound-requests.patch
 mips-mm-rewrite-tlb-uniquification-for-the-hidden-bit-feature.patch
 mips-sibyte-bring-back-cache-initialisation.patch
 mips-fix-the-gcc-version-check-for-__multi3-workaround.patch
-iommu-do-not-call-drivers-for-empty-gathers.patch
 hwmon-occ-fix-division-by-zero-in-occ_show_power_1.patch
 mips-mm-allocate-tlb_vpn-array-atomically.patch
 x86-kexec-disable-kcov-instrumentation-after-load_segments.patch
diff --git a/queue-6.6/iommu-do-not-call-drivers-for-empty-gathers.patch b/queue-6.6/iommu-do-not-call-drivers-for-empty-gathers.patch
deleted file mode 100644 (file)
index cb7f0d9..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 90c5def10bea574b101b7a520c015ca81742183f Mon Sep 17 00:00:00 2001
-From: Jason Gunthorpe <jgg@nvidia.com>
-Date: Mon, 2 Mar 2026 18:22:52 -0400
-Subject: iommu: Do not call drivers for empty gathers
-
-From: Jason Gunthorpe <jgg@nvidia.com>
-
-commit 90c5def10bea574b101b7a520c015ca81742183f upstream.
-
-An empty gather is coded with start=U64_MAX, end=0 and several drivers go
-on to convert that to a size with:
-
- end - start + 1
-
-Which gives 2 for an empty gather. This then causes Weird Stuff to
-happen (for example an UBSAN splat in VT-d) that is hopefully harmless,
-but maybe not.
-
-Prevent drivers from being called right in iommu_iotlb_sync().
-
-Auditing shows that AMD, Intel, Mediatek and RSIC-V drivers all do things
-on these empty gathers.
-
-Further, there are several callers that can trigger empty gathers,
-especially in unusual conditions. For example iommu_map_nosync() will call
-a 0 size unmap on some error paths. Also in VFIO, iommupt and other
-places.
-
-Cc: stable@vger.kernel.org
-Reported-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
-Closes: https://lore.kernel.org/r/11145826.aFP6jjVeTY@jkrzyszt-mobl2.ger.corp.intel.com
-Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
-Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
-Reviewed-by: Samiullah Khawaja <skhawaja@google.com>
-Reviewed-by: Robin Murphy <robin.murphy@arm.com>
-Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>
-Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- include/linux/iommu.h |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/include/linux/iommu.h
-+++ b/include/linux/iommu.h
-@@ -550,7 +550,8 @@ static inline void iommu_flush_iotlb_all
- static inline void iommu_iotlb_sync(struct iommu_domain *domain,
-                                 struct iommu_iotlb_gather *iotlb_gather)
- {
--      if (domain->ops->iotlb_sync)
-+      if (domain->ops->iotlb_sync &&
-+          likely(iotlb_gather->start < iotlb_gather->end))
-               domain->ops->iotlb_sync(domain, iotlb_gather);
-       iommu_iotlb_gather_init(iotlb_gather);
index 912ec199ffaff53e200755eb22b61234418ad999..6b25f0a6c4cb9bcfb202cfb7c872d9dd64300199 100644 (file)
@@ -79,7 +79,6 @@ alsa-ctxfi-fix-missing-spdifi1-index-handling.patch
 bluetooth-smp-derive-legacy-responder-stk-authentication-from-mitm-state.patch
 bluetooth-smp-force-responder-mitm-requirements-before-building-the-pairing-response.patch
 mips-fix-the-gcc-version-check-for-__multi3-workaround.patch
-iommu-do-not-call-drivers-for-empty-gathers.patch
 hwmon-occ-fix-division-by-zero-in-occ_show_power_1.patch
 mips-mm-allocate-tlb_vpn-array-atomically.patch
 iio-adc-ti-adc161s626-fix-buffer-read-on-big-endian.patch