From: Paul Burton <paul.burton@mips.com>
To: Mike Rapoport <rppt@linux.ibm.com>
Cc: Rich Felker <dalias@libc.org>,
"linux-ia64@vger.kernel.org" <linux-ia64@vger.kernel.org>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
"x86@kernel.org" <x86@kernel.org>,
"linux-mips@vger.kernel.org" <linux-mips@vger.kernel.org>,
Max Filippov <jcmvbkbc@gmail.com>, Guo Ren <guoren@kernel.org>,
"sparclinux@vger.kernel.org" <sparclinux@vger.kernel.org>,
Christoph Hellwig <hch@lst.de>,
"linux-s390@vger.kernel.org" <linux-s390@vger.kernel.org>,
"linux-c6x-dev@linux-c6x.org" <linux-c6x-dev@linux-c6x.org>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Richard Weinberger <richard@nod.at>,
"linux-sh@vger.kernel.org" <linux-sh@vger.kernel.org>,
Russell King <linux@armlinux.org.uk>,
"kasan-dev@googlegroups.com" <kasan-dev@googlegroups.com>,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: Re: [PATCH 19/21] treewide: add checks for the return value of memblock_alloc*()
Date: Fri, 18 Jan 2019 18:02:03 +0000 [thread overview]
Message-ID: <20190118180201.uva5nhf2g23uamkn@pburton-laptop> (raw)
In-Reply-To: <1547646261-32535-20-git-send-email-rppt@linux.ibm.com>
Hi Mike,
On Wed, Jan 16, 2019 at 03:44:19PM +0200, Mike Rapoport wrote:
> Add check for the return value of memblock_alloc*() functions and call
> panic() in case of error.
> The panic message repeats the one used by panicing memblock allocators with
> adjustment of parameters to include only relevant ones.
>
> The replacement was mostly automated with semantic patches like the one
> below with manual massaging of format strings.
>
> @@
> expression ptr, size, align;
> @@
> ptr = memblock_alloc(size, align);
> + if (!ptr)
> + panic("%s: Failed to allocate %lu bytes align=0x%lx\n", __func__,
> size, align);
>
> Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
> ---
>%
> diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
> index e8eb60e..db1deb2 100644
> --- a/arch/mips/cavium-octeon/dma-octeon.c
> +++ b/arch/mips/cavium-octeon/dma-octeon.c
> @@ -245,6 +245,9 @@ void __init plat_swiotlb_setup(void)
> swiotlbsize = swiotlb_nslabs << IO_TLB_SHIFT;
>
> octeon_swiotlb = memblock_alloc_low(swiotlbsize, PAGE_SIZE);
> + if (!octeon_swiotlb)
> + panic("%s: Failed to allocate %lu bytes align=%lx\n",
> + __func__, swiotlbsize, PAGE_SIZE);
>
> if (swiotlb_init_with_tbl(octeon_swiotlb, swiotlb_nslabs, 1) == -ENOMEM)
> panic("Cannot allocate SWIOTLB buffer");
That one should be %zu rather than %lu. The rest looks good, so with
that one tweak:
Acked-by: Paul Burton <paul.burton@mips.com> # MIPS parts
Thanks,
Paul
next prev parent reply other threads:[~2019-01-18 18:02 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-16 13:44 [PATCH 00/21] Refine memblock API Mike Rapoport
2019-01-16 13:44 ` [PATCH 01/21] openrisc: prefer memblock APIs returning virtual address Mike Rapoport
2019-01-16 13:44 ` [PATCH 02/21] powerpc: use memblock functions " Mike Rapoport
2019-01-16 13:44 ` [PATCH 03/21] memblock: replace memblock_alloc_base(ANYWHERE) with memblock_phys_alloc Mike Rapoport
2019-01-16 13:44 ` [PATCH 04/21] memblock: drop memblock_alloc_base_nid() Mike Rapoport
2019-01-16 13:44 ` [PATCH 05/21] memblock: emphasize that memblock_alloc_range() returns a physical address Mike Rapoport
2019-01-16 13:44 ` [PATCH 06/21] memblock: memblock_phys_alloc_try_nid(): don't panic Mike Rapoport
2019-01-16 13:44 ` [PATCH 07/21] memblock: memblock_phys_alloc(): " Mike Rapoport
2019-01-16 13:44 ` [PATCH 08/21] memblock: drop __memblock_alloc_base() Mike Rapoport
2019-01-16 15:15 ` Rob Herring
2019-01-16 13:44 ` [PATCH 09/21] memblock: drop memblock_alloc_base() Mike Rapoport
2019-01-16 13:44 ` [PATCH 10/21] memblock: refactor internal allocation functions Mike Rapoport
2019-01-16 13:44 ` [PATCH 11/21] memblock: make memblock_find_in_range_node() and choose_memblock_flags() static Mike Rapoport
2019-01-16 13:44 ` [PATCH 12/21] arch: use memblock_alloc() instead of memblock_alloc_from(size, align, 0) Mike Rapoport
2019-01-18 17:53 ` Paul Burton
2019-01-16 13:44 ` [PATCH 13/21] arch: don't memset(0) memory returned by memblock_alloc() Mike Rapoport
2019-01-16 14:17 ` Geert Uytterhoeven
2019-01-16 13:44 ` [PATCH 14/21] ia64: add checks for the return value of memblock_alloc*() Mike Rapoport
2019-01-16 13:44 ` [PATCH 15/21] sparc: " Mike Rapoport
2019-01-16 17:21 ` David Miller
2019-01-16 13:44 ` [PATCH 16/21] mm/percpu: " Mike Rapoport
2019-01-16 13:44 ` [PATCH 17/21] init/main: " Mike Rapoport
2019-01-16 13:44 ` [PATCH 18/21] swiotlb: " Mike Rapoport
2019-01-16 13:44 ` [PATCH 19/21] treewide: " Mike Rapoport
2019-01-16 14:27 ` Geert Uytterhoeven
2019-01-16 15:13 ` Mike Rapoport
2019-01-16 14:32 ` [Xen-devel] " Juergen Gross
2019-01-16 15:18 ` Rob Herring
2019-01-17 7:06 ` Guo Ren
2019-01-18 8:43 ` Heiko Carstens
2019-01-18 18:02 ` Paul Burton [this message]
2019-01-16 13:44 ` [PATCH 20/21] memblock: memblock_alloc_try_nid: don't panic Mike Rapoport
2019-01-16 13:44 ` [PATCH 21/21] memblock: drop memblock_alloc_*_nopanic() variants Mike Rapoport
2019-01-17 9:28 ` Petr Mladek
2019-01-18 8:42 ` Greg Kroah-Hartman
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=20190118180201.uva5nhf2g23uamkn@pburton-laptop \
--to=paul.burton@mips.com \
--cc=catalin.marinas@arm.com \
--cc=dalias@libc.org \
--cc=devicetree@vger.kernel.org \
--cc=geert@linux-m68k.org \
--cc=guoren@kernel.org \
--cc=hch@lst.de \
--cc=heiko.carstens@de.ibm.com \
--cc=jcmvbkbc@gmail.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-c6x-dev@linux-c6x.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=richard@nod.at \
--cc=rppt@linux.ibm.com \
--cc=sparclinux@vger.kernel.org \
--cc=x86@kernel.org \
--cc=ysato@users.sourceforge.jp \
/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;
as well as URLs for NNTP newsgroup(s).