From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Mike Rapoport <rppt@linux.ibm.com>
Cc: linux-mm@kvack.org, Rich Felker <dalias@libc.org>,
linux-ia64@vger.kernel.org, devicetree@vger.kernel.org,
Catalin Marinas <catalin.marinas@arm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
x86@kernel.org, linux-mips@vger.kernel.org,
Max Filippov <jcmvbkbc@gmail.com>, Guo Ren <guoren@kernel.org>,
sparclinux@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
linux-s390@vger.kernel.org, linux-c6x-dev@linux-c6x.org,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Richard Weinberger <richard@nod.at>,
linux-sh@vger.kernel.org, Russell King <linux@armlinux.org.uk>,
kasan-dev@googlegroups.com,
Geert Uytterhoeven <geert@linux-m68k.org>,
Mark Salter <msalter@redhat.com>, Dennis Zhou <dennis@kernel.org>,
Matt Turner <mattst88@gmail.com>,
linux-snps-arc@lists.infradead.org,
uclinux-h8-devel@lists.sourceforge.jp,
Petr Mladek <pmladek@suse.com>,
linux-xtensa@linux-xtensa.org, linux-alpha@vger.kernel.org,
linux-um@lists.infradead.org, linux-m68k@lists.linux-m68k.org,
Rob Herring <robh+dt@kernel.org>,
Greentime Hu <green.hu@gmail.com>,
xen-devel@lists.xenproject.org, Stafford Horne <shorne@gmail.com>,
Guan Xuetao <gxt@pku.edu.cn>,
linux-arm-kernel@lists.infradead.org,
Michal Simek <monstr@monstr.eu>, Tony Luck <tony.luck@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Paul Burton <paul.burton@mips.com>,
Vineet Gupta <vgupta@synopsys.com>,
Andrew Morton <akpm@linux-foundation.org>,
linuxppc-dev@lists.ozlabs.org,
"David S. Miller" <davem@davemloft.net>,
openrisc@lists.librecores.org,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: [PATCH v2 19/21] treewide: add checks for the return value of memblock_alloc*()
Date: Thu, 31 Jan 2019 08:07:29 +0100 [thread overview]
Message-ID: <d5e4ff5b-d33a-e641-8159-d4f83bc28d0b@c-s.fr> (raw)
In-Reply-To: <8838f7ab-998b-6d78-02a8-a53f8a3619d9@c-s.fr>
Le 31/01/2019 à 07:44, Christophe Leroy a écrit :
>
>
> Le 31/01/2019 à 07:41, Mike Rapoport a écrit :
>> On Thu, Jan 31, 2019 at 07:07:46AM +0100, Christophe Leroy wrote:
>>>
>>>
>>> Le 21/01/2019 à 09:04, Mike Rapoport a écrit :
>>>> 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>
>>>> Reviewed-by: Guo Ren <ren_guo@c-sky.com> # c-sky
>>>> Acked-by: Paul Burton <paul.burton@mips.com> # MIPS
>>>> Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com> # s390
>>>> Reviewed-by: Juergen Gross <jgross@suse.com> # Xen
>>>> ---
>>>
>>> [...]
>>>
>>>> diff --git a/mm/sparse.c b/mm/sparse.c
>>>> index 7ea5dc6..ad94242 100644
>>>> --- a/mm/sparse.c
>>>> +++ b/mm/sparse.c
>>>
>>> [...]
>>>
>>>> @@ -425,6 +436,10 @@ static void __init sparse_buffer_init(unsigned
>>>> long size, int nid)
>>>> memblock_alloc_try_nid_raw(size, PAGE_SIZE,
>>>> __pa(MAX_DMA_ADDRESS),
>>>> MEMBLOCK_ALLOC_ACCESSIBLE, nid);
>>>> + if (!sparsemap_buf)
>>>> + panic("%s: Failed to allocate %lu bytes align=0x%lx nid=%d
>>>> from=%lx\n",
>>>> + __func__, size, PAGE_SIZE, nid, __pa(MAX_DMA_ADDRESS));
>>>> +
>>>
>>> memblock_alloc_try_nid_raw() does not panic (help explicitly says:
>>> Does not
>>> zero allocated memory, does not panic if request cannot be satisfied.).
>>
>> "Does not panic" does not mean it always succeeds.
>
> I agree, but at least here you are changing the behaviour by making it
> panic explicitly. Are we sure there are not cases where the system could
> just continue functionning ? Maybe a WARN_ON() would be enough there ?
Looking more in details, it looks like everything is done to live with
sparsemap_buf NULL, all functions using it check it so having it NULL
shouldn't imply a panic I believe, see code below.
static void *sparsemap_buf __meminitdata;
static void *sparsemap_buf_end __meminitdata;
static void __init sparse_buffer_init(unsigned long size, int nid)
{
WARN_ON(sparsemap_buf); /* forgot to call sparse_buffer_fini()? */
sparsemap_buf =
memblock_alloc_try_nid_raw(size, PAGE_SIZE,
__pa(MAX_DMA_ADDRESS),
MEMBLOCK_ALLOC_ACCESSIBLE, nid);
sparsemap_buf_end = sparsemap_buf + size;
}
static void __init sparse_buffer_fini(void)
{
unsigned long size = sparsemap_buf_end - sparsemap_buf;
if (sparsemap_buf && size > 0)
memblock_free_early(__pa(sparsemap_buf), size);
sparsemap_buf = NULL;
}
void * __meminit sparse_buffer_alloc(unsigned long size)
{
void *ptr = NULL;
if (sparsemap_buf) {
ptr = PTR_ALIGN(sparsemap_buf, size);
if (ptr + size > sparsemap_buf_end)
ptr = NULL;
else
sparsemap_buf = ptr + size;
}
return ptr;
}
Christophe
next prev parent reply other threads:[~2019-01-31 7:07 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-21 8:03 [PATCH v2 00/21] Refine memblock API Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 01/21] openrisc: prefer memblock APIs returning virtual address Mike Rapoport
2019-01-27 3:07 ` Stafford Horne
2019-01-21 8:03 ` [PATCH v2 02/21] powerpc: use memblock functions " Mike Rapoport
2019-01-29 9:52 ` Michael Ellerman
2019-01-21 8:03 ` [PATCH v2 03/21] memblock: replace memblock_alloc_base(ANYWHERE) with memblock_phys_alloc Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 04/21] memblock: drop memblock_alloc_base_nid() Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 05/21] memblock: emphasize that memblock_alloc_range() returns a physical address Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 06/21] memblock: memblock_phys_alloc_try_nid(): don't panic Mike Rapoport
2019-01-25 17:45 ` Catalin Marinas
2019-01-25 19:32 ` Mike Rapoport
2019-01-29 9:56 ` Michael Ellerman
2019-01-29 9:58 ` Michael Ellerman
2019-01-21 8:03 ` [PATCH v2 07/21] memblock: memblock_phys_alloc(): " Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 08/21] memblock: drop __memblock_alloc_base() Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 09/21] memblock: drop memblock_alloc_base() Mike Rapoport
2019-01-29 10:29 ` Michael Ellerman
2019-01-21 8:03 ` [PATCH v2 10/21] memblock: refactor internal allocation functions Mike Rapoport
2019-02-03 9:39 ` Michael Ellerman
2019-02-03 10:04 ` Mike Rapoport
2019-02-03 11:39 ` Mike Rapoport
2019-02-04 8:45 ` Michael Ellerman
2019-02-04 23:08 ` Stephen Rothwell
2019-01-21 8:03 ` [PATCH v2 11/21] memblock: make memblock_find_in_range_node() and choose_memblock_flags() static Mike Rapoport
2019-01-21 8:03 ` [PATCH v2 12/21] arch: use memblock_alloc() instead of memblock_alloc_from(size, align, 0) Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 13/21] arch: don't memset(0) memory returned by memblock_alloc() Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 14/21] ia64: add checks for the return value of memblock_alloc*() Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 15/21] sparc: " Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 16/21] mm/percpu: " Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 17/21] init/main: " Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 18/21] swiotlb: " Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 19/21] treewide: " Mike Rapoport
2019-01-21 8:39 ` Geert Uytterhoeven
2019-01-21 8:39 ` Geert Uytterhoeven
2019-01-21 17:18 ` Rob Herring
2019-01-31 6:07 ` Christophe Leroy
2019-01-31 6:41 ` Mike Rapoport
2019-01-31 6:44 ` Christophe Leroy
2019-01-31 7:07 ` Christophe Leroy [this message]
2019-01-31 7:14 ` Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 20/21] memblock: memblock_alloc_try_nid: don't panic Mike Rapoport
2019-01-21 8:04 ` [PATCH v2 21/21] memblock: drop memblock_alloc_*_nopanic() variants Mike Rapoport
2019-01-30 13:38 ` Petr Mladek
2019-09-24 17:52 ` [PATCH v2 00/21] Refine memblock API Adam Ford
2019-09-25 6:42 ` Mike Rapoport
2019-09-25 12:12 ` Fabio Estevam
2019-09-25 12:17 ` Adam Ford
2019-09-25 15:17 ` Fabio Estevam
2019-09-26 13:09 ` Adam Ford
2019-09-26 16:04 ` Mike Rapoport
2019-09-26 19:35 ` Adam Ford
2019-09-28 7:33 ` Mike Rapoport
2019-09-29 13:33 ` Adam Ford
2019-10-02 0:14 ` Adam Ford
2019-10-02 7:36 ` Mike Rapoport
2019-10-02 11:14 ` Adam Ford
2019-10-03 5:34 ` Mike Rapoport
2019-10-03 8:49 ` Russell King - ARM Linux admin
2019-10-03 11:30 ` Mike Rapoport
2019-10-03 13:17 ` Lucas Stach
2019-10-04 9:27 ` Russell King - ARM Linux admin
2019-10-04 13:21 ` Lucas Stach
2019-10-04 13:58 ` Adam Ford
2019-10-04 17:10 ` Mike Rapoport
2019-10-04 17:29 ` Mike Rapoport
2019-10-03 14:46 ` Chris Healy
2019-10-04 9:12 ` Russell King - ARM Linux admin
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=d5e4ff5b-d33a-e641-8159-d4f83bc28d0b@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=dalias@libc.org \
--cc=davem@davemloft.net \
--cc=dennis@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=geert@linux-m68k.org \
--cc=green.hu@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=guoren@kernel.org \
--cc=gxt@pku.edu.cn \
--cc=hch@lst.de \
--cc=heiko.carstens@de.ibm.com \
--cc=jcmvbkbc@gmail.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-c6x-dev@linux-c6x.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linux-um@lists.infradead.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linux@armlinux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mattst88@gmail.com \
--cc=monstr@monstr.eu \
--cc=msalter@redhat.com \
--cc=openrisc@lists.librecores.org \
--cc=paul.burton@mips.com \
--cc=pmladek@suse.com \
--cc=richard@nod.at \
--cc=robh+dt@kernel.org \
--cc=rppt@linux.ibm.com \
--cc=sfr@canb.auug.org.au \
--cc=shorne@gmail.com \
--cc=sparclinux@vger.kernel.org \
--cc=tony.luck@intel.com \
--cc=uclinux-h8-devel@lists.sourceforge.jp \
--cc=vgupta@synopsys.com \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.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).