Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-09-17 07:18:52 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-09-17 07:18:52 +0200
commitfdcd619a68d3a9d9c5bf9325d5e7e7302d5d3293 (patch)
tree9e0e6366915d2b13b38348c61049d29f25adeea5
parentc14d61f1525109ee0354198d7da469f76f329a32 (diff)
parentb0363d2f6c7dc92a15734d837a03344c0d4de111 (diff)
Merge branch 'SLE15-SP2' into SLE15-SP2-AZURE
-rw-r--r--patches.suse/0001-iommu-vt-d-Fix-race-condition-in-add_unmap.patch34
-rw-r--r--series.conf2
2 files changed, 0 insertions, 36 deletions
diff --git a/patches.suse/0001-iommu-vt-d-Fix-race-condition-in-add_unmap.patch b/patches.suse/0001-iommu-vt-d-Fix-race-condition-in-add_unmap.patch
deleted file mode 100644
index 655f5bb8ea..0000000000
--- a/patches.suse/0001-iommu-vt-d-Fix-race-condition-in-add_unmap.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Joerg Roedel <jroedel@suse.de>
-Date: Fri, 15 Jun 2018 15:09:43 +0200
-Subject: iommu/vt-d: Fix race condition in add_unmap()
-Patch-mainline: No, upstream switched to a different implementation
-References: bsc#1096790, bsc#1097034
-
-The high-water-mark needs to be checked again after the lock
-is taken, otherwise flush_data->size might grow larger than
-the high-water-mark and we write behind the array limits of
-the deferred flush tables.
-
-Signed-off-by: Joerg Roedel <jroedel@suse.de>
----
- drivers/iommu/intel-iommu.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
-index 880830d..919ede7 100644
---- a/drivers/iommu/intel-iommu.c
-+++ b/drivers/iommu/intel-iommu.c
-@@ -3742,6 +3742,10 @@ static void add_unmap(struct dmar_domain *dom, unsigned long iova_pfn,
-
- spin_lock_irqsave(&flush_data->lock, flags);
-
-+ /* Need to check that again after we own the lock */
-+ if (unlikely(flush_data->size == HIGH_WATER_MARK))
-+ flush_unmaps(flush_data);
-+
- iommu = domain_get_iommu(dom);
- iommu_id = iommu->seq_id;
-
---
-2.12.3
-
diff --git a/series.conf b/series.conf
index 68ac5588e7..c452d7c130 100644
--- a/series.conf
+++ b/series.conf
@@ -512,8 +512,6 @@
+jlee patches.suse/0055-acpi-Ignore-acpi_rsdp-kernel-param-when-the-kernel-h.patch
+jlee patches.suse/0056-acpi-Disable-ACPI-table-override-if-the-kernel-is-lo.patch
+jlee patches.suse/0057-acpi-Disable-APEI-error-injection-if-the-kernel-is-l.patch
-# jroedel
-+jroedel patches.suse/0001-iommu-vt-d-Fix-race-condition-in-add_unmap.patch
# lduncan
+lduncan patches.suse/target-transport-should-handle-st-FM-EOM-ILI-reads.patch
# lhenriques