Message ID | 1548057848-15136-21-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 662FE6C2 for <patchwork-linux-mm@patchwork.kernel.org>; Mon, 21 Jan 2019 08:06:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5353120415 for <patchwork-linux-mm@patchwork.kernel.org>; Mon, 21 Jan 2019 08:06:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4616729DCB; Mon, 21 Jan 2019 08:06:32 +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 AAB6920415 for <patchwork-linux-mm@patchwork.kernel.org>; Mon, 21 Jan 2019 08:06:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 767468E0028; Mon, 21 Jan 2019 03:06:30 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 7173E8E0025; Mon, 21 Jan 2019 03:06:30 -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 606B38E0028; Mon, 21 Jan 2019 03:06:30 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by kanga.kvack.org (Postfix) with ESMTP id 222C58E0025 for <linux-mm@kvack.org>; Mon, 21 Jan 2019 03:06:30 -0500 (EST) Received: by mail-pf1-f199.google.com with SMTP id p15so15382298pfk.7 for <linux-mm@kvack.org>; Mon, 21 Jan 2019 00:06:30 -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=2sJII4e1upoFOyrcnYmC+9z2fapNjkcGCiyXUZ46T0U=; b=TruC+9fxGHPqxyMnHxlUhMEUXC2uk9LPoWPPTIT48fJruJcuMh0PbzOfS2Td6OjqI2 fTV40erZqb8H/h979Xj0aujdYrF1BQ026I5xy5wzyYNVWHJrZFXMGzk/AfdnbYt89pEo GZz/sQsbkzg1Mazk/ggbhANiFcwAdcexlFWQFv0CUnydLPx8xW53BUxkfbDb99i1jqnt yeyskNop5969dQE0hYHcQGRKsymnnD2/T9ll7djcPFlKGtREoMoKp1oifBGzxZfsUkx2 5vvm40MgbmI1/Tt4xLcVNz9fs2GgopWU3WGBfU+n3hffDIfK3P/IBNXyXbDPTYKUCmDo I9fQ== 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: AJcUukfak3Di0MHtM7tvJ20Kh+UPRPhzCUQ1/ONA8oOzAKf2/3fXH/hC fuHnRgvvzlJiLbbFjHBConX5PRb69DhfS1pAaWrea9cIrti+CUxw+SXbIfxJ2LWTtx+9q4NWx/C mbnBzOypaxdSG6Mr0wbJG6EGc0v8nva/J66rzYAFDWR+2UjQ3yeh7Eilh38xiGxffDA== X-Received: by 2002:a63:4187:: with SMTP id o129mr25519446pga.370.1548057989775; Mon, 21 Jan 2019 00:06:29 -0800 (PST) X-Google-Smtp-Source: ALg8bN4VcT4AExXPVXj/UQo9MkyuUDGdQEx5OGWMi7UzyGCh+8JaOtmRQfDBo5Uvdkah1+MrNHmf X-Received: by 2002:a63:4187:: with SMTP id o129mr25519412pga.370.1548057989024; Mon, 21 Jan 2019 00:06:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548057989; cv=none; d=google.com; s=arc-20160816; b=gkm0lniK7+zdYi2KE3VwNEB5/hFt49M2ELqn5oczdMtWuMNDAl0F8KMMuBUTEjzbkK FEem3V+E+mxBDuBpxvwl5HCWMFY4OdrJTkS3NdQuGT2s2RZd/frxoiBkFEFQrvy8fUoF mK2fLudvtc3Nl0Nvpd1yLs8K1jLokGvPDP7IksoQR29PcX2ZZK7cBS10FoDcXIQUHjDm m9tS1QALUtE79+mIR88ZjvJF3cpWAczkiFDAHeEb7xNCtGmgebIEWuQjpVbX/1xK+fRv mnzLPOopuuhns1We8DuXIsWfU3BUg/xT6qJwTXpJoGpv9iFTyE9ffKUeOmlJN+cvVBjI IrdQ== 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=2sJII4e1upoFOyrcnYmC+9z2fapNjkcGCiyXUZ46T0U=; b=rxY4VGXGSkcU66q60y2i54aMh/hXLH1/M5DiN4Nh2AX407uh/Pjxl2UXGPeHOd9fbX jL7Aaa0NuS3uFlqQDjGmt7BTTRcHpUhPDUE41GvI89aIVH4LYRAj/9jUim87iI/eV5Rz Z3spiPYjQEkTwJzi1+K9UdgP9TlJWT2uVl9WjGKlAApoMBMRUqhVbvmgkECQo55T2p3R 2QJ9ac8mJHvop/ZIbk9UxecquqaNETPy8a7vQ/c+yk0b2e11JuruO4q8+FT/q2Sk7QaM TEITBciAdIRiW/IEhHVumMYbML7UlWjaGL2QXFk3KVsfVpdYtAZ4WVWMd3y3cU51DTLi ya9w== 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 k72si11505947pge.310.2019.01.21.00.06.28 for <linux-mm@kvack.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 00:06:28 -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 (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x0L83n43097029 for <linux-mm@kvack.org>; Mon, 21 Jan 2019 03:06:28 -0500 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0a-001b2d01.pphosted.com with ESMTP id 2q58y4b5sg-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for <linux-mm@kvack.org>; Mon, 21 Jan 2019 03:06:28 -0500 Received: from localhost by e06smtp01.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>; Mon, 21 Jan 2019 08:06:25 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp01.uk.ibm.com (192.168.101.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 21 Jan 2019 08:06:14 -0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x0L86DUX57606264 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 21 Jan 2019 08:06:13 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 095F35204E; Mon, 21 Jan 2019 08:06:13 +0000 (GMT) Received: from rapoport-lnx (unknown [9.148.207.125]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTPS id 2FD2852059; Mon, 21 Jan 2019 08:06:08 +0000 (GMT) Received: by rapoport-lnx (sSMTP sendmail emulation); Mon, 21 Jan 2019 10:06:07 +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 v2 20/21] memblock: memblock_alloc_try_nid: don't panic Date: Mon, 21 Jan 2019 10:04:07 +0200 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1548057848-15136-1-git-send-email-rppt@linux.ibm.com> References: <1548057848-15136-1-git-send-email-rppt@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19012108-4275-0000-0000-00000301EA20 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19012108-4276-0000-0000-0000381015ED Message-Id: <1548057848-15136-21-git-send-email-rppt@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-21_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901210066 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/mm/memblock.c b/mm/memblock.c index 03b3929..7164275 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1526,7 +1526,7 @@ void * __init memblock_alloc_try_nid_nopanic( } /** - * memblock_alloc_try_nid - allocate boot memory block with panicking + * memblock_alloc_try_nid - allocate boot memory block * @size: size of memory block to be allocated in bytes * @align: alignment of the region and block's size * @min_addr: the lower bound of the memory region from where the allocation @@ -1536,9 +1536,8 @@ void * __init memblock_alloc_try_nid_nopanic( * allocate only from memory limited by memblock.current_limit value * @nid: nid of the free area to find, %NUMA_NO_NODE for any node * - * Public panicking version of memblock_alloc_try_nid_nopanic() - * which provides debug information (including caller info), if enabled, - * and panics if the request can not be satisfied. + * Public function, provides additional debug information (including caller + * info), if enabled. This function zeroes the allocated memory. * * Return: * Virtual address of allocated memory block on success, NULL on failure. @@ -1555,14 +1554,10 @@ void * __init memblock_alloc_try_nid( &max_addr, (void *)_RET_IP_); ptr = memblock_alloc_internal(size, align, min_addr, max_addr, nid); - if (ptr) { + if (ptr) memset(ptr, 0, size); - return ptr; - } - panic("%s: Failed to allocate %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa\n", - __func__, (u64)size, (u64)align, nid, &min_addr, &max_addr); - return NULL; + return ptr; } /**
As all the memblock_alloc*() users are now checking the return value and panic() in case of error, the panic() call can be removed from the core memblock allocator, namely memblock_alloc_try_nid(). Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> --- mm/memblock.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)