Home Home > GIT Browse > SLE12-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Thumshirn <jthumshirn@suse.de>2019-08-09 13:56:07 +0200
committerJohannes Thumshirn <jthumshirn@suse.de>2019-08-09 13:56:07 +0200
commitbabfba9412bd8b6bd05df6b1e38382c9f4e867e9 (patch)
treec24c1995e97732e8e5e4c159a05ddcd6a5edf0a0
parentb83a9701588129927520ca29ef02cabcd12bf212 (diff)
parent85606f6626db96eac57addcbeb5983a82daf9a75 (diff)
Merge remote-tracking branch 'origin/users/jroedel/SLE12-SP4/for-next' into SLE12-SP4
Pull iommu fixes from Joerg Roedel.
-rw-r--r--patches.drivers/iommu-iova-fix-compilation-error-with-config_iommu_iova30
-rw-r--r--patches.drivers/iommu-vt-d-don-t-queue_iova-if-there-is-no-flush-queue182
-rw-r--r--series.conf2
3 files changed, 214 insertions, 0 deletions
diff --git a/patches.drivers/iommu-iova-fix-compilation-error-with-config_iommu_iova b/patches.drivers/iommu-iova-fix-compilation-error-with-config_iommu_iova
new file mode 100644
index 0000000000..61817eae9f
--- /dev/null
+++ b/patches.drivers/iommu-iova-fix-compilation-error-with-config_iommu_iova
@@ -0,0 +1,30 @@
+From: Joerg Roedel <jroedel@suse.de>
+Date: Tue, 23 Jul 2019 09:51:00 +0200
+Subject: iommu/iova: Fix compilation error with !CONFIG_IOMMU_IOVA
+Git-commit: 201c1db90cd643282185a00770f12f95da330eca
+Patch-mainline: v5.3-rc2
+References: bsc#1145024
+
+The stub function for !CONFIG_IOMMU_IOVA needs to be
+'static inline'.
+
+Fixes: effa467870c76 ('iommu/vt-d: Don't queue_iova() if there is no flush queue')
+Signed-off-by: Joerg Roedel <jroedel@suse.de>
+---
+ include/linux/iova.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/linux/iova.h b/include/linux/iova.h
+index cd0f1de901a8..a0637abffee8 100644
+--- a/include/linux/iova.h
++++ b/include/linux/iova.h
+@@ -236,7 +236,7 @@ static inline void init_iova_domain(struct iova_domain *iovad,
+ {
+ }
+
+-bool has_iova_flush_queue(struct iova_domain *iovad)
++static inline bool has_iova_flush_queue(struct iova_domain *iovad)
+ {
+ return false;
+ }
+
diff --git a/patches.drivers/iommu-vt-d-don-t-queue_iova-if-there-is-no-flush-queue b/patches.drivers/iommu-vt-d-don-t-queue_iova-if-there-is-no-flush-queue
new file mode 100644
index 0000000000..44ac48eac2
--- /dev/null
+++ b/patches.drivers/iommu-vt-d-don-t-queue_iova-if-there-is-no-flush-queue
@@ -0,0 +1,182 @@
+From: Dmitry Safonov <dima@arista.com>
+Date: Tue, 16 Jul 2019 22:38:05 +0100
+Subject: iommu/vt-d: Don't queue_iova() if there is no flush queue
+Git-commit: effa467870c7612012885df4e246bdb8ffd8e44c
+Patch-mainline: v5.3-rc2
+References: bsc#1145024
+
+Intel VT-d driver was reworked to use common deferred flushing
+implementation. Previously there was one global per-cpu flush queue,
+afterwards - one per domain.
+
+Before deferring a flush, the queue should be allocated and initialized.
+
+Currently only domains with IOMMU_DOMAIN_DMA type initialize their flush
+queue. It's probably worth to init it for static or unmanaged domains
+too, but it may be arguable - I'm leaving it to iommu folks.
+
+Prevent queuing an iova flush if the domain doesn't have a queue.
+The defensive check seems to be worth to keep even if queue would be
+initialized for all kinds of domains. And is easy backportable.
+
+On 4.19.43 stable kernel it has a user-visible effect: previously for
+devices in si domain there were crashes, on sata devices:
+
+ BUG: spinlock bad magic on CPU#6, swapper/0/1
+ lock: 0xffff88844f582008, .magic: 00000000, .owner: <none>/-1, .owner_cpu: 0
+ CPU: 6 PID: 1 Comm: swapper/0 Not tainted 4.19.43 #1
+ Call Trace:
+ <IRQ>
+ dump_stack+0x61/0x7e
+ spin_bug+0x9d/0xa3
+ do_raw_spin_lock+0x22/0x8e
+ _raw_spin_lock_irqsave+0x32/0x3a
+ queue_iova+0x45/0x115
+ intel_unmap+0x107/0x113
+ intel_unmap_sg+0x6b/0x76
+ __ata_qc_complete+0x7f/0x103
+ ata_qc_complete+0x9b/0x26a
+ ata_qc_complete_multiple+0xd0/0xe3
+ ahci_handle_port_interrupt+0x3ee/0x48a
+ ahci_handle_port_intr+0x73/0xa9
+ ahci_single_level_irq_intr+0x40/0x60
+ __handle_irq_event_percpu+0x7f/0x19a
+ handle_irq_event_percpu+0x32/0x72
+ handle_irq_event+0x38/0x56
+ handle_edge_irq+0x102/0x121
+ handle_irq+0x147/0x15c
+ do_IRQ+0x66/0xf2
+ common_interrupt+0xf/0xf
+ RIP: 0010:__do_softirq+0x8c/0x2df
+
+The same for usb devices that use ehci-pci:
+ BUG: spinlock bad magic on CPU#0, swapper/0/1
+ lock: 0xffff88844f402008, .magic: 00000000, .owner: <none>/-1, .owner_cpu: 0
+ CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.19.43 #4
+ Call Trace:
+ <IRQ>
+ dump_stack+0x61/0x7e
+ spin_bug+0x9d/0xa3
+ do_raw_spin_lock+0x22/0x8e
+ _raw_spin_lock_irqsave+0x32/0x3a
+ queue_iova+0x77/0x145
+ intel_unmap+0x107/0x113
+ intel_unmap_page+0xe/0x10
+ usb_hcd_unmap_urb_setup_for_dma+0x53/0x9d
+ usb_hcd_unmap_urb_for_dma+0x17/0x100
+ unmap_urb_for_dma+0x22/0x24
+ __usb_hcd_giveback_urb+0x51/0xc3
+ usb_giveback_urb_bh+0x97/0xde
+ tasklet_action_common.isra.4+0x5f/0xa1
+ tasklet_action+0x2d/0x30
+ __do_softirq+0x138/0x2df
+ irq_exit+0x7d/0x8b
+ smp_apic_timer_interrupt+0x10f/0x151
+ apic_timer_interrupt+0xf/0x20
+ </IRQ>
+ RIP: 0010:_raw_spin_unlock_irqrestore+0x17/0x39
+
+Cc: David Woodhouse <dwmw2@infradead.org>
+Cc: Joerg Roedel <joro@8bytes.org>
+Cc: Lu Baolu <baolu.lu@linux.intel.com>
+Cc: iommu@lists.linux-foundation.org
+Cc: <stable@vger.kernel.org> # 4.14+
+Fixes: 13cf01744608 ("iommu/vt-d: Make use of iova deferred flushing")
+Signed-off-by: Dmitry Safonov <dima@arista.com>
+Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
+Signed-off-by: Joerg Roedel <jroedel@suse.de>
+---
+ drivers/iommu/intel-iommu.c | 3 ++-
+ drivers/iommu/iova.c | 18 ++++++++++++++----
+ include/linux/iova.h | 6 ++++++
+ 3 files changed, 22 insertions(+), 5 deletions(-)
+
+--- a/drivers/iommu/intel-iommu.c
++++ b/drivers/iommu/intel-iommu.c
+@@ -3717,7 +3717,8 @@ static void intel_unmap(struct device *d
+
+ freelist = domain_unmap(domain, start_pfn, last_pfn);
+
+- if (intel_iommu_strict) {
++ if (intel_iommu_strict ||
++ !has_iova_flush_queue(&domain->iovad)) {
+ iommu_flush_iotlb_psi(iommu, domain, start_pfn,
+ nrpages, !freelist, 0);
+ /* free iova */
+--- a/drivers/iommu/iova.c
++++ b/drivers/iommu/iova.c
+@@ -57,9 +57,14 @@ init_iova_domain(struct iova_domain *iov
+ }
+ EXPORT_SYMBOL_GPL(init_iova_domain);
+
++bool has_iova_flush_queue(struct iova_domain *iovad)
++{
++ return !!iovad->fq;
++}
++
+ static void free_iova_flush_queue(struct iova_domain *iovad)
+ {
+- if (!iovad->fq)
++ if (!has_iova_flush_queue(iovad))
+ return;
+
+ if (timer_pending(&iovad->fq_timer))
+@@ -77,13 +82,14 @@ static void free_iova_flush_queue(struct
+ int init_iova_flush_queue(struct iova_domain *iovad,
+ iova_flush_cb flush_cb, iova_entry_dtor entry_dtor)
+ {
++ struct iova_fq __percpu *queue;
+ int cpu;
+
+ atomic64_set(&iovad->fq_flush_start_cnt, 0);
+ atomic64_set(&iovad->fq_flush_finish_cnt, 0);
+
+- iovad->fq = alloc_percpu(struct iova_fq);
+- if (!iovad->fq)
++ queue = alloc_percpu(struct iova_fq);
++ if (!queue)
+ return -ENOMEM;
+
+ iovad->flush_cb = flush_cb;
+@@ -92,13 +98,17 @@ int init_iova_flush_queue(struct iova_do
+ for_each_possible_cpu(cpu) {
+ struct iova_fq *fq;
+
+- fq = per_cpu_ptr(iovad->fq, cpu);
++ fq = per_cpu_ptr(queue, cpu);
+ fq->head = 0;
+ fq->tail = 0;
+
+ spin_lock_init(&fq->lock);
+ }
+
++ smp_wmb();
++
++ iovad->fq = queue;
++
+ setup_timer(&iovad->fq_timer, fq_flush_timeout, (unsigned long)iovad);
+ atomic_set(&iovad->fq_timer_on, 0);
+
+--- a/include/linux/iova.h
++++ b/include/linux/iova.h
+@@ -156,6 +156,7 @@ void init_iova_domain(struct iova_domain
+ unsigned long start_pfn, unsigned long pfn_32bit);
+ int init_iova_flush_queue(struct iova_domain *iovad,
+ iova_flush_cb flush_cb, iova_entry_dtor entry_dtor);
++bool has_iova_flush_queue(struct iova_domain *iovad);
+ struct iova *find_iova(struct iova_domain *iovad, unsigned long pfn);
+ void put_iova_domain(struct iova_domain *iovad);
+ struct iova *split_and_remove_iova(struct iova_domain *iovad,
+@@ -234,6 +235,11 @@ static inline void init_iova_domain(stru
+ {
+ }
+
++bool has_iova_flush_queue(struct iova_domain *iovad)
++{
++ return false;
++}
++
+ static inline int init_iova_flush_queue(struct iova_domain *iovad,
+ iova_flush_cb flush_cb,
+ iova_entry_dtor entry_dtor)
+
diff --git a/series.conf b/series.conf
index c960417b0e..2237f6addc 100644
--- a/series.conf
+++ b/series.conf
@@ -23493,6 +23493,8 @@
patches.fixes/tcp-be-more-careful-in-tcp_fragment.patch
patches.arch/powerpc-tm-Fix-oops-on-sigreturn-on-systems-without-.patch
patches.drivers/hwmon-nct6775-Fix-register-address-and-added-missed-.patch
+ patches.drivers/iommu-vt-d-don-t-queue_iova-if-there-is-no-flush-queue
+ patches.drivers/iommu-iova-fix-compilation-error-with-config_iommu_iova
patches.drivers/ALSA-line6-Fix-wrong-altsetting-for-LINE6_PODHD500_1.patch
patches.drivers/ALSA-line6-Fix-a-typo.patch
patches.drivers/ALSA-compress-Fix-regression-on-compressed-capture-s.patch