Linux 4.14.111

[thirdparty/kernel/stable-queue.git] / releases / 4.14.111 / iommu-io-pgtable-arm-v7s-only-kmemleak_ignore-l2-tab.patch

diff --git a/releases/4.14.111/iommu-io-pgtable-arm-v7s-only-kmemleak_ignore-l2-tab.patch b/releases/4.14.111/iommu-io-pgtable-arm-v7s-only-kmemleak_ignore-l2-tab.patch
new file mode 100644 (file)
index 0000000..20805da
--- /dev/null
+++ b/releases/4.14.111/iommu-io-pgtable-arm-v7s-only-kmemleak_ignore-l2-tab.patch
@@ -0,0 +1,51 @@
+From 16af174f32b4075355d2635175a36ab11dc7b2f7 Mon Sep 17 00:00:00 2001
+From: Nicolas Boichat <drinkcat@chromium.org>
+Date: Mon, 28 Jan 2019 17:43:01 +0800
+Subject: iommu/io-pgtable-arm-v7s: Only kmemleak_ignore L2 tables
+
+[ Upstream commit 032ebd8548c9d05e8d2bdc7a7ec2fe29454b0ad0 ]
+
+L1 tables are allocated with __get_dma_pages, and therefore already
+ignored by kmemleak.
+
+Without this, the kernel would print this error message on boot,
+when the first L1 table is allocated:
+
+[    2.810533] kmemleak: Trying to color unknown object at 0xffffffd652388000 as Black
+[    2.818190] CPU: 5 PID: 39 Comm: kworker/5:0 Tainted: G S                4.19.16 #8
+[    2.831227] Workqueue: events deferred_probe_work_func
+[    2.836353] Call trace:
+...
+[    2.852532]  paint_ptr+0xa0/0xa8
+[    2.855750]  kmemleak_ignore+0x38/0x6c
+[    2.859490]  __arm_v7s_alloc_table+0x168/0x1f4
+[    2.863922]  arm_v7s_alloc_pgtable+0x114/0x17c
+[    2.868354]  alloc_io_pgtable_ops+0x3c/0x78
+...
+
+Fixes: e5fc9753b1a8314 ("iommu/io-pgtable: Add ARMv7 short descriptor support")
+Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
+Acked-by: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Joerg Roedel <jroedel@suse.de>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/iommu/io-pgtable-arm-v7s.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c
+index 29b7a6755fcd..56368c8bd791 100644
+--- a/drivers/iommu/io-pgtable-arm-v7s.c
++++ b/drivers/iommu/io-pgtable-arm-v7s.c
+@@ -217,7 +217,8 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp,
+               if (dma != phys)
+                       goto out_unmap;
+       }
+-      kmemleak_ignore(table);
++      if (lvl == 2)
++              kmemleak_ignore(table);
+       return table;
+ 
+ out_unmap:
+-- 
+2.19.1
+