Message ID | 1547646261-32535-19-git-send-email-rppt@linux.ibm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6831B13BF for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 16 Jan 2019 13:46:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57ACD286BF for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 16 Jan 2019 13:46:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B0522BBD4; Wed, 16 Jan 2019 13:46:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3218286BF for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 16 Jan 2019 13:46:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2F2928E000A; Wed, 16 Jan 2019 08:46:13 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2A0298E0002; Wed, 16 Jan 2019 08:46:13 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 141298E000A; Wed, 16 Jan 2019 08:46:13 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by kanga.kvack.org (Postfix) with ESMTP id C678F8E0002 for <linux-mm@kvack.org>; Wed, 16 Jan 2019 08:46:12 -0500 (EST) Received: by mail-pg1-f197.google.com with SMTP id y8so3881945pgq.12 for <linux-mm@kvack.org>; Wed, 16 Jan 2019 05:46:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:in-reply-to:references:message-id; bh=kGEoz9PqFrl8WF8g+AZPK28J9wib4/3qVxmODZ1mnNM=; b=HdGbo7f/nDNbzLulN5c2p4bBw6v7qCDl/duNKryS2JFDH3q4ioL5dVN/fnQ7sDOHnz q7+kLss79o1kO1uunBRaymIR6CyQncwOl+5iIjAN7eHGp2W8u+SP8nOxD+tYTb09UbNj Ndstt1phnRpqS9afXc+H98Veyu1TnU5t8xUs4d0Dv23xcdhVagt9yehjheZ4E0a9DbFG XVJ+ywUxh8g5c9K+FzVkS1jxnE+jhsDq1j+SynTXr33zYdOuZABKn2ZA/J8PTy7OGDKb qX2ppUT4d9DRxobugtDa9182I2ymxtv8rjpk4sRbvhr3gDP0pm6l92PGbdIU4U9yOOYD jKqg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of rppt@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com X-Gm-Message-State: AJcUukcv5MAp0cHRbBeA7+APAtdnsoQ5s9uMPoYN2WIEbO6pDd5bObHZ dIiQYlMoj6N2xGvZgtK/WdYAHbHUnDAEOo6DMB1w6sCzb0VncMMWMQTZh/dbyV5NcTijaehtGrI w9DEdD2vitx9w7gAtm/IykukDwbhaSO5yIsofe1ce6YddUjeXCNjtNFr9WrjNiSZwmw== X-Received: by 2002:a63:eb52:: with SMTP id b18mr8729538pgk.213.1547646372457; Wed, 16 Jan 2019 05:46:12 -0800 (PST) X-Google-Smtp-Source: ALg8bN6+ytUXpeZyjqYUAGsbF6E+EixoWB0VmRZHYxV8zG2DuLa6U8Q/zePEONzpfHEaKvdBSNdC X-Received: by 2002:a63:eb52:: with SMTP id b18mr8729492pgk.213.1547646371716; Wed, 16 Jan 2019 05:46:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547646371; cv=none; d=google.com; s=arc-20160816; b=MOf/2er0/6sHTeIDCS0SZmCqSZOgAQK+KGQiy63e/bfbrp3wIdYvU9xl9OIW/AyEmX HHa8kemPeiKRLU+aeEWDIrXMMBu+ps00dMJudkvabLDxP7/PFQkz3w0T0xABd1wxtTO+ 53jZBT2OsEzFMnbhKf1oCbrJXDJMsWPIZ8UNGFkxQz7i9H7EnZL55lGFwH0Ybw1nHm/i rhcEWiRjjgeAkH9YWFTCnyngW+pSc3I08h0IiWvGHCdQK2FlXEe+FmZ7a1Gj2meGISOl SXw1ZfTo2ECT83J7wrT8TppdzaoBiO0vZY/m9RRgXPC3P30D7Fx7fXj7dnUpWQ0vsSOh CHfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:references:in-reply-to:date:subject:cc:to:from; bh=kGEoz9PqFrl8WF8g+AZPK28J9wib4/3qVxmODZ1mnNM=; b=BE7GkcZ589WkcV36bfrtBSfa7RgqB4W4l7BTMMLJ6sft22PmSrDOJlR2m8j3AgpwJR 4xeoVH+FxDmxYPjNRiwDFj9ES9ys+BUqxPhvSePb1ZfNlvWloq0q9mrsYC58AdB+dVKB Le9JrBsck1nFhT9dMdZ8+KC/aKl0A+NyPX7b8AWdnFZwovhhi8o5CM2Rvd/r4RA+TBGK jcEmB2a6W8EZzGdEXxHJ57qTL3x7i4g9JgLhS5hpa1T0AqMIUsEQxBFu2U+pzLwvaiZc QYINtr8v8IfvT6jDZ1gWBmPUjYhLOagqL3bgTPhTqpLBpCS52GyNduuw7jav+Fcjwal0 +cQQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of rppt@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com. [148.163.156.1]) by mx.google.com with ESMTPS id d19si6938168pfd.196.2019.01.16.05.46.11 for <linux-mm@kvack.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 05:46:11 -0800 (PST) Received-SPF: pass (google.com: domain of rppt@linux.ibm.com designates 148.163.156.1 as permitted sender) client-ip=148.163.156.1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of rppt@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id x0GDehME127563 for <linux-mm@kvack.org>; Wed, 16 Jan 2019 08:46:11 -0500 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2q23ejpuvc-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for <linux-mm@kvack.org>; Wed, 16 Jan 2019 08:46:10 -0500 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for <linux-mm@kvack.org> from <rppt@linux.ibm.com>; Wed, 16 Jan 2019 13:46:07 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 16 Jan 2019 13:45:55 -0000 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x0GDjsO65046570 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 16 Jan 2019 13:45:54 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6076642045; Wed, 16 Jan 2019 13:45:54 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1E6D642041; Wed, 16 Jan 2019 13:45:50 +0000 (GMT) Received: from rapoport-lnx (unknown [9.148.8.226]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Wed, 16 Jan 2019 13:45:50 +0000 (GMT) Received: by rapoport-lnx (sSMTP sendmail emulation); Wed, 16 Jan 2019 15:45:49 +0200 From: Mike Rapoport <rppt@linux.ibm.com> To: linux-mm@kvack.org Cc: Andrew Morton <akpm@linux-foundation.org>, Catalin Marinas <catalin.marinas@arm.com>, Christoph Hellwig <hch@lst.de>, "David S. Miller" <davem@davemloft.net>, Dennis Zhou <dennis@kernel.org>, Geert Uytterhoeven <geert@linux-m68k.org>, Greentime Hu <green.hu@gmail.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Guan Xuetao <gxt@pku.edu.cn>, Guo Ren <guoren@kernel.org>, Heiko Carstens <heiko.carstens@de.ibm.com>, Mark Salter <msalter@redhat.com>, Matt Turner <mattst88@gmail.com>, Max Filippov <jcmvbkbc@gmail.com>, Michael Ellerman <mpe@ellerman.id.au>, Michal Simek <monstr@monstr.eu>, Paul Burton <paul.burton@mips.com>, Petr Mladek <pmladek@suse.com>, Rich Felker <dalias@libc.org>, Richard Weinberger <richard@nod.at>, Rob Herring <robh+dt@kernel.org>, Russell King <linux@armlinux.org.uk>, Stafford Horne <shorne@gmail.com>, Tony Luck <tony.luck@intel.com>, Vineet Gupta <vgupta@synopsys.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, devicetree@vger.kernel.org, kasan-dev@googlegroups.com, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-um@lists.infradead.org, linux-usb@vger.kernel.org, linux-xtensa@linux-xtensa.org, linuxppc-dev@lists.ozlabs.org, openrisc@lists.librecores.org, sparclinux@vger.kernel.org, uclinux-h8-devel@lists.sourceforge.jp, x86@kernel.org, xen-devel@lists.xenproject.org, Mike Rapoport <rppt@linux.ibm.com> Subject: [PATCH 18/21] swiotlb: add checks for the return value of memblock_alloc*() Date: Wed, 16 Jan 2019 15:44:18 +0200 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547646261-32535-1-git-send-email-rppt@linux.ibm.com> References: <1547646261-32535-1-git-send-email-rppt@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19011613-0020-0000-0000-0000030747DE X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19011613-0021-0000-0000-00002158647E Message-Id: <1547646261-32535-19-git-send-email-rppt@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-16_05:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=3 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=996 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901160114 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: <linux-mm.kvack.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
Refine memblock API
|
expand
|
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index d636177..e78835c8 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -191,6 +191,7 @@ void __init swiotlb_update_mem_attributes(void) int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose) { unsigned long i, bytes; + size_t alloc_size; bytes = nslabs << IO_TLB_SHIFT; @@ -203,12 +204,18 @@ int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose) * to find contiguous free memory regions of size up to IO_TLB_SEGSIZE * between io_tlb_start and io_tlb_end. */ - io_tlb_list = memblock_alloc( - PAGE_ALIGN(io_tlb_nslabs * sizeof(int)), - PAGE_SIZE); - io_tlb_orig_addr = memblock_alloc( - PAGE_ALIGN(io_tlb_nslabs * sizeof(phys_addr_t)), - PAGE_SIZE); + alloc_size = PAGE_ALIGN(io_tlb_nslabs * sizeof(int)); + io_tlb_list = memblock_alloc(alloc_size, PAGE_SIZE); + if (!io_tlb_list) + panic("%s: Failed to allocate %lu bytes align=0x%lx\n", + __func__, alloc_size, PAGE_SIZE); + + alloc_size = PAGE_ALIGN(io_tlb_nslabs * sizeof(phys_addr_t)); + io_tlb_orig_addr = memblock_alloc(alloc_size, PAGE_SIZE); + if (!io_tlb_orig_addr) + panic("%s: Failed to allocate %lu bytes align=0x%lx\n", + __func__, alloc_size, PAGE_SIZE); + for (i = 0; i < io_tlb_nslabs; i++) { io_tlb_list[i] = IO_TLB_SEGSIZE - OFFSET(i, IO_TLB_SEGSIZE); io_tlb_orig_addr[i] = INVALID_PHYS_ADDR;
Add panic() calls if memblock_alloc() returns NULL. The panic() format duplicates the one used by memblock itself and in order to avoid explosion with long parameters list replace open coded allocation size calculations with a local variable. Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> --- kernel/dma/swiotlb.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)