On Wed, Dec 05, 2018 at 11:37:44PM +1100, Michael Ellerman wrote:
> Mike Rapoport <rppt@xxxxxxxxxxxxx> writes:
> > On Tue, Dec 04, 2018 at 08:59:41PM +1100, Michael Ellerman wrote:
> >> Hi Mike,
> >>
> >> Thanks for trying to clean these up.
> >>
> >> I think a few could be improved though ...
> >>
> >> Mike Rapoport <rppt@xxxxxxxxxxxxx> writes:
> >> > diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c
> >> > index 913bfca..fa884ad 100644
> >> > --- a/arch/powerpc/kernel/paca.c
> >> > +++ b/arch/powerpc/kernel/paca.c
> >> > @@ -42,17 +42,15 @@ static void *__init alloc_paca_data(unsigned long size, unsigned long align,
> >> > nid = early_cpu_to_node(cpu);
> >> > }
> >> >
> >> > - pa = memblock_alloc_base_nid(size, align, limit, nid, MEMBLOCK_NONE);
> >> > - if (!pa) {
> >> > - pa = memblock_alloc_base(size, align, limit);
> >> > - if (!pa)
> >> > - panic("cannot allocate paca data");
> >> > - }
> >> > + ptr = memblock_alloc_try_nid_raw(size, align, MEMBLOCK_LOW_LIMIT,
> >> > + limit, nid);
> >> > + if (!ptr)
> >> > + panic("cannot allocate paca data");
> >>
> >> The old code doesn't zero, but two of the three callers of
> >> alloc_paca_data() *do* zero the whole allocation, so I'd be happy if we
> >> did it in here instead.
> >
> > I looked at the callers and couldn't tell if zeroing memory in
> > init_lppaca() would be ok.
> > I'll remove the _raw here.
>
> Thanks.
>
> >> That would mean we could use memblock_alloc_try_nid() avoiding the need
> >> to panic() manually.
> >
> > Actual, my plan was to remove panic() from all memblock_alloc* and make all
> > callers to check the returned value.
> > I believe it's cleaner and also allows more meaningful panic messages. Not
> > mentioning the reduction of memblock code.
>
> Hmm, not sure.
>
> I see ~200 calls to the panicking functions, that seems like a lot of
> work to change all those.
Yeah, I know :)
> And I think I disagree on the "more meaningful panic message". This is a
> perfect example, compare:
>
> panic("cannot allocate paca data");
> to:
> 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);
>
> The former is basically useless, whereas the second might at least give
> you a hint as to *why* the allocation failed.
We can easily keep the memblock message, just make it pr_err instead of
panic.
The message at the call site can show where the problem was without the
need to dive into the stack dump.
> I know it's kind of odd for a function to panic() rather than return an
> error, but memblock is kind of special because it's so early in boot.
> Most of these allocations have to succeed to get the system up and
> running.
The downside of having panic() inside some memblock functions is that it
makes the API way too bloated. And, at least currently, it's inconsistent.
For instance memblock_alloc_try_nid_raw() does not panic, but
memblock_alloc_try_nid() does.
When it was about 2 functions and a wrapper, it was perfectly fine, but
since than memblock has three sets of partially overlapping APIs with
endless convenience wrappers.
I believe that patching up ~200 calls is worth the reduction of memblock
API to saner size.
Another thing, the absence of check for return value for memory allocation
is not only odd, but it also makes the code obfuscated.
> cheers
>
--
Sincerely yours,
Mike.
