From: <zhe.he@windriver.com>
To: <konrad@darnok.org>, <konrad.wilk@oracle.com>, <hch@lst.de>,
<m.szyprowski@samsung.com>, <robin.murphy@arm.com>,
<iommu@lists.linux-foundation.org>,
<linux-kernel@vger.kernel.org>, <zhe.he@windriver.com>
Subject: [PATCH v2] kernel/dma: Fix panic caused by passing swiotlb to command line
Date: Mon, 3 Dec 2018 18:22:51 +0800 [thread overview]
Message-ID: <1543832571-121638-1-git-send-email-zhe.he@windriver.com> (raw)
From: He Zhe <zhe.he@windriver.com>
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@windriver.com>
Cc: stable@vger.kernel.org
Cc: konrad.wilk@oracle.com
Cc: hch@lst.de
Cc: m.szyprowski@samsung.com
Cc: robin.murphy@arm.com
Signed-off-by: He Zhe <zhe.he@windriver.com>
---
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
next reply other threads:[~2018-12-03 10:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-03 10:22 zhe.he [this message]
2019-01-07 8:46 ` He Zhe
2019-01-07 9:07 ` Christoph Hellwig
[not found] ` <CAPbh3rupHC_G0=5dBhhpoXvXO_=i-Y6p=9WdRtn9W19jRpVVcg@mail.gmail.com>
2019-01-11 1:46 ` He Zhe
2019-01-11 1:49 ` He Zhe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1543832571-121638-1-git-send-email-zhe.he@windriver.com \
--to=zhe.he@windriver.com \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=konrad.wilk@oracle.com \
--cc=konrad@darnok.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=robin.murphy@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®