From: Mike Rapoport <rppt@linux.ibm.com>
To: Vlastimil Babka <vbabka@suse.cz>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Peng Fan <peng.fan@nxp.com>,
"labbott@redhat.com" <labbott@redhat.com>,
"mhocko@suse.com" <mhocko@suse.com>,
"iamjoonsoo.kim@lge.com" <iamjoonsoo.kim@lge.com>,
"rppt@linux.vnet.ibm.com" <rppt@linux.vnet.ibm.com>,
"m.szyprowski@samsung.com" <m.szyprowski@samsung.com>,
"rdunlap@infradead.org" <rdunlap@infradead.org>,
"andreyknvl@google.com" <andreyknvl@google.com>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"van.freenix@gmail.com" <van.freenix@gmail.com>,
Catalin Marinas <catalin.marinas@arm.com>
Subject: Re: [PATCH] mm/cma: cma_declare_contiguous: correct err handling
Date: Tue, 19 Feb 2019 19:46:11 +0200 [thread overview]
Message-ID: <20190219174610.GA32749@rapoport-lnx> (raw)
In-Reply-To: <b78470e8-b204-4a7e-f9cc-eff9c609f480@suse.cz>
On Tue, Feb 19, 2019 at 05:55:33PM +0100, Vlastimil Babka wrote:
> On 2/14/19 9:38 PM, Andrew Morton wrote:
> > On Thu, 14 Feb 2019 12:45:51 +0000 Peng Fan <peng.fan@nxp.com> wrote:
> >
> >> In case cma_init_reserved_mem failed, need to free the memblock allocated
> >> by memblock_reserve or memblock_alloc_range.
> >>
> >> ...
> >>
> >> --- a/mm/cma.c
> >> +++ b/mm/cma.c
> >> @@ -353,12 +353,14 @@ int __init cma_declare_contiguous(phys_addr_t base,
> >>
> >> ret = cma_init_reserved_mem(base, size, order_per_bit, name, res_cma);
> >> if (ret)
> >> - goto err;
> >> + goto free_mem;
> >>
> >> pr_info("Reserved %ld MiB at %pa\n", (unsigned long)size / SZ_1M,
> >> &base);
> >> return 0;
> >>
> >> +free_mem:
> >> + memblock_free(base, size);
> >> err:
> >> pr_err("Failed to reserve %ld MiB\n", (unsigned long)size / SZ_1M);
> >> return ret;
> >
> > This doesn't look right to me. In the `fixed==true' case we didn't
> > actually allocate anything and in the `fixed==false' case, the
> > allocated memory is at `addr', not at `base'.
>
> I think it's ok as the fixed==true path has "memblock_reserve()", but
> better leave this to the memblock maintainer :)
As Peng Fan noted in the other e-mail, fixed==true has memblock_reserve()
and fixed==false resets base = addr, so this is Ok.
> There's also 'kmemleak_ignore_phys(addr)' which should probably be
> undone (or not called at all) in the failure case. But it seems to be
> missing from the fixed==true path?
Well, memblock and kmemleak interaction does not seem to have clear
semantics anyway. memblock_free() calls kmemleak_free_part_phys() which
does not seem to care about ignored objects.
As for the fixed==true path, memblock_reserve() does not register the area
with kmemleak, so there would be no object to free in memblock_free().
AFAIU, kmemleak simply ignores this.
Catalin, can you comment please?
--
Sincerely yours,
Mike.
next prev parent reply other threads:[~2019-02-19 17:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-14 12:45 [PATCH] mm/cma: cma_declare_contiguous: correct err handling Peng Fan
2019-02-14 20:38 ` Andrew Morton
2019-02-15 1:30 ` Peng Fan
2019-02-19 16:55 ` Vlastimil Babka
2019-02-19 17:46 ` Mike Rapoport [this message]
2019-02-22 12:55 ` Peng Fan
2019-02-26 11:11 ` Mike Rapoport
2019-02-26 14:52 ` Catalin Marinas
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=20190219174610.GA32749@rapoport-lnx \
--to=rppt@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@google.com \
--cc=catalin.marinas@arm.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=labbott@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=m.szyprowski@samsung.com \
--cc=mhocko@suse.com \
--cc=peng.fan@nxp.com \
--cc=rdunlap@infradead.org \
--cc=rppt@linux.vnet.ibm.com \
--cc=van.freenix@gmail.com \
--cc=vbabka@suse.cz \
/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).