From: Dong Aisheng <dongas86@gmail.com>
To: Liam Howlett <liam.howlett@oracle.com>
Cc: Dong Aisheng <aisheng.dong@nxp.com>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Mike Rapoport <rppt@kernel.org>
Subject: Re: [PATCH V2 2/6] mm/sparse: free section usage memory in case populate_section_memmap failed
Date: Tue, 1 Jun 2021 10:37:54 +0800 [thread overview]
Message-ID: <CAA+hA=SyzhHyU5SMgz2Y29YahOut9WUZEs6h5cXrsBCj_YZ9iw@mail.gmail.com> (raw)
In-Reply-To: <20210531150542.inopmezthosooy5u@revolver>
On Mon, May 31, 2021 at 11:06 PM Liam Howlett <liam.howlett@oracle.com> wrote:
>
> * Dong Aisheng <aisheng.dong@nxp.com> [210531 05:20]:
> > Free section usage memory in case populate_section_memmap failed.
> > We use map_count to track the remain unused memory to be freed.
> >
> > Cc: Andrew Morton <akpm@linux-foundation.org>
> > Cc: Mike Rapoport <rppt@kernel.org>
> > Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
> > ---
> > ChangeLog:
> > v1->v2:
> > * using goto + lable according to Mike's suggestion
> > ---
> > mm/sparse.c | 11 +++++++----
> > 1 file changed, 7 insertions(+), 4 deletions(-)
> >
> > diff --git a/mm/sparse.c b/mm/sparse.c
> > index 7ac481353b6b..408b737e168e 100644
> > --- a/mm/sparse.c
> > +++ b/mm/sparse.c
> > @@ -533,7 +533,7 @@ static void __init sparse_init_nid(int nid, unsigned long pnum_begin,
> > mem_section_usage_size() * map_count);
> > if (!usage) {
> > pr_err("%s: node[%d] usemap allocation failed", __func__, nid);
> > - goto failed;
> > + goto failed1;
>
> Please use better labels for goto statements. Perhaps usemap_failed ?
>
Thanks, I will improve it.
Regards
Aisheng
>
> > }
> > sparse_buffer_init(map_count * section_map_size(), nid);
> > for_each_present_section_nr(pnum_begin, pnum) {
> > @@ -548,17 +548,20 @@ static void __init sparse_init_nid(int nid, unsigned long pnum_begin,
> > pr_err("%s: node[%d] memory map backing failed. Some memory will not be available.",
> > __func__, nid);
> > pnum_begin = pnum;
> > - sparse_buffer_fini();
> > - goto failed;
> > + goto failed2;
>
> Again, this goto label is not descriptive.
>
> > }
> > check_usemap_section_nr(nid, usage);
> > sparse_init_one_section(__nr_to_section(pnum), pnum, map, usage,
> > SECTION_IS_EARLY);
> > usage = (void *) usage + mem_section_usage_size();
> > + map_count--;
> > }
> > sparse_buffer_fini();
> > return;
> > -failed:
> > +failed2:
> > + sparse_buffer_fini();
> > + memblock_free_early(__pa(usage), map_count * mem_section_usage_size());
> > +failed1:
> > /* We failed to allocate, mark all the following pnums as not present */
> > for_each_present_section_nr(pnum_begin, pnum) {
> > struct mem_section *ms;
> > --
> > 2.25.1
> >
> >
next prev parent reply other threads:[~2021-06-01 2:39 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-31 9:19 [PATCH V2 0/6] mm/sparse: a few minor fixes and improvements Dong Aisheng
2021-05-31 9:19 ` [PATCH V2 1/6] mm: drop SECTION_SHIFT in code comments Dong Aisheng
2021-05-31 9:19 ` [PATCH V2 2/6] mm/sparse: free section usage memory in case populate_section_memmap failed Dong Aisheng
2021-05-31 15:06 ` Liam Howlett
2021-06-01 2:37 ` Dong Aisheng [this message]
2021-06-01 8:19 ` David Hildenbrand
2021-05-31 9:19 ` [PATCH V2 3/6] mm/sparse: move mem_sections allocation out of memory_present() Dong Aisheng
2021-05-31 14:39 ` Liam Howlett
2021-06-01 2:38 ` Dong Aisheng
2021-06-01 8:22 ` David Hildenbrand
2021-05-31 9:19 ` [PATCH V2 4/6] mm: rename the global section array to mem_sections Dong Aisheng
2021-06-01 8:22 ` David Hildenbrand
2021-06-01 8:37 ` Dong Aisheng
2021-06-01 8:40 ` David Hildenbrand
2021-06-01 8:44 ` Dong Aisheng
2021-06-01 23:52 ` Andrew Morton
2021-06-02 1:11 ` HAGIO KAZUHITO(萩尾 一仁)
2021-06-02 2:26 ` Andrew Morton
2021-06-02 3:03 ` Baoquan He
2021-06-02 5:02 ` HAGIO KAZUHITO(萩尾 一仁)
2021-06-02 5:22 ` Baoquan He
2021-05-31 9:19 ` [PATCH V2 5/6] mm/page_alloc: improve memmap_pages dbg msg Dong Aisheng
2021-06-01 8:23 ` David Hildenbrand
2021-05-31 9:19 ` [PATCH V2 6/6] mm/sparse: remove one duplicated #ifdef CONFIG_SPARSEMEM_EXTREME Dong Aisheng
2021-06-01 8:26 ` David Hildenbrand
2021-06-01 8:39 ` Dong Aisheng
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='CAA+hA=SyzhHyU5SMgz2Y29YahOut9WUZEs6h5cXrsBCj_YZ9iw@mail.gmail.com' \
--to=dongas86@gmail.com \
--cc=aisheng.dong@nxp.com \
--cc=akpm@linux-foundation.org \
--cc=liam.howlett@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=rppt@kernel.org \
/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).