From: Greg Kroah-Hartman Date: Mon, 8 Feb 2021 12:47:43 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.4.257~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02ea26b7a2a04c6d3da237e66bd71a9b50789a18;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: input-xpad-sync-supported-devices-with-fork-on-github.patch iommu-vt-d-do-not-use-flush-queue-when-caching-mode-is-on.patch --- diff --git a/queue-4.14/input-xpad-sync-supported-devices-with-fork-on-github.patch b/queue-4.14/input-xpad-sync-supported-devices-with-fork-on-github.patch new file mode 100644 index 00000000000..b4b78df0808 --- /dev/null +++ b/queue-4.14/input-xpad-sync-supported-devices-with-fork-on-github.patch @@ -0,0 +1,69 @@ +From 9bbd77d5bbc9aff8cb74d805c31751f5f0691ba8 Mon Sep 17 00:00:00 2001 +From: Benjamin Valentin +Date: Thu, 21 Jan 2021 19:24:17 -0800 +Subject: Input: xpad - sync supported devices with fork on GitHub + +From: Benjamin Valentin + +commit 9bbd77d5bbc9aff8cb74d805c31751f5f0691ba8 upstream. + +There is a fork of this driver on GitHub [0] that has been updated +with new device IDs. + +Merge those into the mainline driver, so the out-of-tree fork is not +needed for users of those devices anymore. + +[0] https://github.com/paroj/xpad + +Signed-off-by: Benjamin Valentin +Link: https://lore.kernel.org/r/20210121142523.1b6b050f@rechenknecht2k11 +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman +--- + drivers/input/joystick/xpad.c | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +--- a/drivers/input/joystick/xpad.c ++++ b/drivers/input/joystick/xpad.c +@@ -232,9 +232,17 @@ static const struct xpad_device { + { 0x0e6f, 0x0213, "Afterglow Gamepad for Xbox 360", 0, XTYPE_XBOX360 }, + { 0x0e6f, 0x021f, "Rock Candy Gamepad for Xbox 360", 0, XTYPE_XBOX360 }, + { 0x0e6f, 0x0246, "Rock Candy Gamepad for Xbox One 2015", 0, XTYPE_XBOXONE }, +- { 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE }, ++ { 0x0e6f, 0x02a0, "PDP Xbox One Controller", 0, XTYPE_XBOXONE }, ++ { 0x0e6f, 0x02a1, "PDP Xbox One Controller", 0, XTYPE_XBOXONE }, ++ { 0x0e6f, 0x02a2, "PDP Wired Controller for Xbox One - Crimson Red", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02a4, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02a6, "PDP Wired Controller for Xbox One - Camo Series", 0, XTYPE_XBOXONE }, ++ { 0x0e6f, 0x02a7, "PDP Xbox One Controller", 0, XTYPE_XBOXONE }, ++ { 0x0e6f, 0x02a8, "PDP Xbox One Controller", 0, XTYPE_XBOXONE }, ++ { 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE }, ++ { 0x0e6f, 0x02ad, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE }, ++ { 0x0e6f, 0x02b3, "Afterglow Prismatic Wired Controller", 0, XTYPE_XBOXONE }, ++ { 0x0e6f, 0x02b8, "Afterglow Prismatic Wired Controller", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x0301, "Logic3 Controller", 0, XTYPE_XBOX360 }, + { 0x0e6f, 0x0346, "Rock Candy Gamepad for Xbox One 2016", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x0401, "Logic3 Controller", 0, XTYPE_XBOX360 }, +@@ -313,6 +321,9 @@ static const struct xpad_device { + { 0x1bad, 0xfa01, "MadCatz GamePad", 0, XTYPE_XBOX360 }, + { 0x1bad, 0xfd00, "Razer Onza TE", 0, XTYPE_XBOX360 }, + { 0x1bad, 0xfd01, "Razer Onza", 0, XTYPE_XBOX360 }, ++ { 0x20d6, 0x2001, "BDA Xbox Series X Wired Controller", 0, XTYPE_XBOXONE }, ++ { 0x20d6, 0x281f, "PowerA Wired Controller For Xbox 360", 0, XTYPE_XBOX360 }, ++ { 0x2e24, 0x0652, "Hyperkin Duke X-Box One pad", 0, XTYPE_XBOXONE }, + { 0x24c6, 0x5000, "Razer Atrox Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, + { 0x24c6, 0x5300, "PowerA MINI PROEX Controller", 0, XTYPE_XBOX360 }, + { 0x24c6, 0x5303, "Xbox Airflo wired controller", 0, XTYPE_XBOX360 }, +@@ -446,8 +457,12 @@ static const struct usb_device_id xpad_t + XPAD_XBOX360_VENDOR(0x162e), /* Joytech X-Box 360 controllers */ + XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */ + XPAD_XBOX360_VENDOR(0x1bad), /* Harminix Rock Band Guitar and Drums */ ++ XPAD_XBOX360_VENDOR(0x20d6), /* PowerA Controllers */ ++ XPAD_XBOXONE_VENDOR(0x20d6), /* PowerA Controllers */ + XPAD_XBOX360_VENDOR(0x24c6), /* PowerA Controllers */ + XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */ ++ XPAD_XBOXONE_VENDOR(0x2e24), /* Hyperkin Duke X-Box One pad */ ++ XPAD_XBOX360_VENDOR(0x2f24), /* GameSir Controllers */ + { } + }; + diff --git a/queue-4.14/iommu-vt-d-do-not-use-flush-queue-when-caching-mode-is-on.patch b/queue-4.14/iommu-vt-d-do-not-use-flush-queue-when-caching-mode-is-on.patch new file mode 100644 index 00000000000..0b9bb446983 --- /dev/null +++ b/queue-4.14/iommu-vt-d-do-not-use-flush-queue-when-caching-mode-is-on.patch @@ -0,0 +1,76 @@ +From 29b32839725f8c89a41cb6ee054c85f3116ea8b5 Mon Sep 17 00:00:00 2001 +From: Nadav Amit +Date: Wed, 27 Jan 2021 09:53:17 -0800 +Subject: iommu/vt-d: Do not use flush-queue when caching-mode is on + +From: Nadav Amit + +commit 29b32839725f8c89a41cb6ee054c85f3116ea8b5 upstream. + +When an Intel IOMMU is virtualized, and a physical device is +passed-through to the VM, changes of the virtual IOMMU need to be +propagated to the physical IOMMU. The hypervisor therefore needs to +monitor PTE mappings in the IOMMU page-tables. Intel specifications +provide "caching-mode" capability that a virtual IOMMU uses to report +that the IOMMU is virtualized and a TLB flush is needed after mapping to +allow the hypervisor to propagate virtual IOMMU mappings to the physical +IOMMU. To the best of my knowledge no real physical IOMMU reports +"caching-mode" as turned on. + +Synchronizing the virtual and the physical IOMMU tables is expensive if +the hypervisor is unaware which PTEs have changed, as the hypervisor is +required to walk all the virtualized tables and look for changes. +Consequently, domain flushes are much more expensive than page-specific +flushes on virtualized IOMMUs with passthrough devices. The kernel +therefore exploited the "caching-mode" indication to avoid domain +flushing and use page-specific flushing in virtualized environments. See +commit 78d5f0f500e6 ("intel-iommu: Avoid global flushes with caching +mode.") + +This behavior changed after commit 13cf01744608 ("iommu/vt-d: Make use +of iova deferred flushing"). Now, when batched TLB flushing is used (the +default), full TLB domain flushes are performed frequently, requiring +the hypervisor to perform expensive synchronization between the virtual +TLB and the physical one. + +Getting batched TLB flushes to use page-specific invalidations again in +such circumstances is not easy, since the TLB invalidation scheme +assumes that "full" domain TLB flushes are performed for scalability. + +Disable batched TLB flushes when caching-mode is on, as the performance +benefit from using batched TLB invalidations is likely to be much +smaller than the overhead of the virtual-to-physical IOMMU page-tables +synchronization. + +Fixes: 13cf01744608 ("iommu/vt-d: Make use of iova deferred flushing") +Signed-off-by: Nadav Amit +Cc: David Woodhouse +Cc: Lu Baolu +Cc: Joerg Roedel +Cc: Will Deacon +Cc: stable@vger.kernel.org +Acked-by: Lu Baolu +Link: https://lore.kernel.org/r/20210127175317.1600473-1-namit@vmware.com +Signed-off-by: Joerg Roedel +Signed-off-by: Nadav Amit +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/iommu/intel-iommu.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/iommu/intel-iommu.c ++++ b/drivers/iommu/intel-iommu.c +@@ -3338,6 +3338,12 @@ static int __init init_dmars(void) + + if (!ecap_pass_through(iommu->ecap)) + hw_pass_through = 0; ++ ++ if (!intel_iommu_strict && cap_caching_mode(iommu->cap)) { ++ pr_info("Disable batched IOTLB flush due to virtualization"); ++ intel_iommu_strict = 1; ++ } ++ + #ifdef CONFIG_INTEL_IOMMU_SVM + if (pasid_enabled(iommu)) + intel_svm_alloc_pasid_tables(iommu); diff --git a/queue-4.14/series b/queue-4.14/series index b35e1fb48a3..a046f32a5ca 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -25,3 +25,5 @@ mm-hugetlb-remove-vm_bug_on_page-from-page_huge_active.patch mm-thp-fix-madv_remove-deadlock-on-shmem-thp.patch x86-build-disable-cet-instrumentation-in-the-kernel.patch x86-apic-add-extra-serialization-for-non-serializing-msrs.patch +input-xpad-sync-supported-devices-with-fork-on-github.patch +iommu-vt-d-do-not-use-flush-queue-when-caching-mode-is-on.patch