[PATCH v2] kernel/dma: Fix panic caused by passing swiotlb to command line

* [PATCH v2] kernel/dma: Fix panic caused by passing swiotlb to command line
@ 2018-12-03 10:22 zhe.he-CWA4WttNNZF54TAoqtyWWQ
       [not found] ` <1543832571-121638-1-git-send-email-zhe.he-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org>
  0 siblings, 1 reply; 6+ messages in thread
From: zhe.he-CWA4WttNNZF54TAoqtyWWQ @ 2018-12-03 10:22 UTC (permalink / raw)
  To: konrad-Gq0aWv8utHQdnm+yROfE0A,
	konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA, hch-jcswGhMUV9g,
	m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ, robin.murphy-5wv7dgnIgG8,
	iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA,
	zhe.he-CWA4WttNNZF54TAoqtyWWQ

From: He Zhe <zhe.he-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org>

setup_io_tlb_npages does not check input argument before passing it
to isdigit. The argument would be a NULL pointer if "swiotlb", without
its value, is set in command line and thus causes the following panic.

PANIC: early exception 0xe3 IP 10:ffffffffbb9b8e9f error 0 cr2 0x0
[    0.000000] CPU: 0 PID: 0 Comm: swapper Not tainted 4.19.0-rc3-yocto-standard+ #9
[    0.000000] RIP: 0010:setup_io_tlb_npages+0xf/0x95
...
[    0.000000] Call Trace:
[    0.000000]  do_early_param+0x57/0x8e
[    0.000000]  parse_args+0x208/0x320
[    0.000000]  ? rdinit_setup+0x30/0x30
[    0.000000]  parse_early_options+0x29/0x2d
[    0.000000]  ? rdinit_setup+0x30/0x30
[    0.000000]  parse_early_param+0x36/0x4d
[    0.000000]  setup_arch+0x336/0x99e
[    0.000000]  start_kernel+0x6f/0x4e6
[    0.000000]  x86_64_start_reservations+0x24/0x26
[    0.000000]  x86_64_start_kernel+0x6f/0x72
[    0.000000]  secondary_startup_64+0xa4/0xb0

This patch adds a check to prevent the panic and sets it for 4MB by default.

Signed-off-by: He Zhe <zhe.he-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org>
Cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org
Cc: hch-jcswGhMUV9g@public.gmane.org
Cc: m.szyprowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org
Cc: robin.murphy-5wv7dgnIgG8@public.gmane.org

Signed-off-by: He Zhe <zhe.he-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org>
---
v2: Set swiotlb for 4MB by default

 kernel/dma/swiotlb.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index 045930e..0e18cd4 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -58,6 +58,9 @@
  */
 #define IO_TLB_MIN_SLABS ((1<<20) >> IO_TLB_SHIFT)
 
+#define IO_TLB_DEFAULT_MB 4
+#define IO_TLB_DEFAULT_SLABS ((IO_TLB_DEFAULT_MB<<20) >> IO_TLB_SHIFT)
+
 enum swiotlb_force swiotlb_force;
 
 /*
@@ -103,6 +106,14 @@ static int late_alloc;
 static int __init
 setup_io_tlb_npages(char *str)
 {
+	if (!str) {
+		pr_err("No value provided for swiotlb, "
+		       "set it to %d slabs for %dMB by default.\n",
+		       IO_TLB_DEFAULT_SLABS, IO_TLB_DEFAULT_MB);
+		io_tlb_nslabs = IO_TLB_DEFAULT_SLABS;
+		return 0;
+	}
+
 	if (isdigit(*str)) {
 		io_tlb_nslabs = simple_strtoul(str, &str, 0);
 		/* avoid tail segment of size < IO_TLB_SEGSIZE */
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread