From: Bharata B Rao <bharata@linux•ibm.com>
To: Vlastimil Babka <vbabka@suse•cz>
Cc: Sachin Sant <sachinp@linux•vnet.ibm.com>,
Nathan Lynch <nathanl@linux•ibm.com>,
Srikar Dronamraju <srikar@linux•vnet.ibm.com>,
puvichakravarthy@in•ibm.com,
Mel Gorman <mgorman@techsingularity•net>,
Michal Hocko <mhocko@kernel•org>,
Pekka Enberg <penberg@kernel•org>,
linux-mm@kvack•org, Kirill Tkhai <ktkhai@virtuozzo•com>,
David Rientjes <rientjes@google•com>,
Christopher Lameter <cl@linux•com>,
linuxppc-dev@lists•ozlabs.org,
Joonsoo Kim <iamjoonsoo.kim@lge•com>
Subject: Re: [RFC 1/2] mm, slub: prevent kmalloc_node crashes and memory leaks
Date: Fri, 20 Mar 2020 14:14:47 +0530 [thread overview]
Message-ID: <20200320084447.GF26049@in.ibm.com> (raw)
In-Reply-To: <bc0a11e9-65b1-9862-9be9-9c73b84e9b23@suse.cz>
On Fri, Mar 20, 2020 at 09:37:18AM +0100, Vlastimil Babka wrote:
> On 3/20/20 4:42 AM, Bharata B Rao wrote:
> > On Thu, Mar 19, 2020 at 02:47:58PM +0100, Vlastimil Babka wrote:
> >> diff --git a/mm/slub.c b/mm/slub.c
> >> index 17dc00e33115..7113b1f9cd77 100644
> >> --- a/mm/slub.c
> >> +++ b/mm/slub.c
> >> @@ -1973,8 +1973,6 @@ static void *get_partial(struct kmem_cache *s, gfp_t flags, int node,
> >>
> >> if (node == NUMA_NO_NODE)
> >> searchnode = numa_mem_id();
> >> - else if (!node_present_pages(node))
> >> - searchnode = node_to_mem_node(node);
> >>
> >> object = get_partial_node(s, get_node(s, searchnode), c, flags);
> >> if (object || node != NUMA_NO_NODE)
> >> @@ -2563,17 +2561,27 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
> >> struct page *page;
> >>
> >> page = c->page;
> >> - if (!page)
> >> + if (!page) {
> >> + /*
> >> + * if the node is not online or has no normal memory, just
> >> + * ignore the node constraint
> >> + */
> >> + if (unlikely(node != NUMA_NO_NODE &&
> >> + !node_state(node, N_NORMAL_MEMORY)))
> >> + node = NUMA_NO_NODE;
> >> goto new_slab;
> >> + }
> >> redo:
> >>
> >> if (unlikely(!node_match(page, node))) {
> >> - int searchnode = node;
> >> -
> >> - if (node != NUMA_NO_NODE && !node_present_pages(node))
> >> - searchnode = node_to_mem_node(node);
> >> -
> >> - if (unlikely(!node_match(page, searchnode))) {
> >> + /*
> >> + * same as above but node_match() being false already
> >> + * implies node != NUMA_NO_NODE
> >> + */
> >> + if (!node_state(node, N_NORMAL_MEMORY)) {
> >> + node = NUMA_NO_NODE;
> >> + goto redo;
> >> + } else {
> >> stat(s, ALLOC_NODE_MISMATCH);
> >> deactivate_slab(s, page, c->freelist, c);
> >> goto new_slab;
> >
> > This fixes the problem I reported at
> > https://lore.kernel.org/linux-mm/20200317092624.GB22538@in.ibm.com/
>
> Thanks, I hope it means I can make it Reported-and-tested-by: you
It was reeported first by PUVICHAKRAVARTHY RAMACHANDRAN <puvichakravarthy@in•ibm.com>
You can add my tested-by.
Regards,
Bharata.
prev parent reply other threads:[~2020-03-20 8:46 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-18 14:42 [RFC 1/2] mm, slub: prevent kmalloc_node crashes and memory leaks Vlastimil Babka
2020-03-18 16:06 ` Bharata B Rao
2020-03-18 16:10 ` Vlastimil Babka
2020-03-18 16:51 ` Vlastimil Babka
2020-03-19 8:52 ` Sachin Sant
2020-03-19 13:23 ` Vlastimil Babka
2020-03-19 13:26 ` Sachin Sant
2020-03-19 13:47 ` Vlastimil Babka
2020-03-19 14:05 ` Srikar Dronamraju
2020-03-19 14:10 ` Vlastimil Babka
2020-03-20 7:46 ` Srikar Dronamraju
2020-03-20 8:43 ` Vlastimil Babka
2020-03-20 10:10 ` Srikar Dronamraju
2020-03-19 14:59 ` Sachin Sant
2020-03-20 3:42 ` Bharata B Rao
2020-03-20 8:37 ` Vlastimil Babka
2020-03-20 8:44 ` Bharata B Rao [this message]
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=20200320084447.GF26049@in.ibm.com \
--to=bharata@linux$(echo .)ibm.com \
--cc=cl@linux$(echo .)com \
--cc=iamjoonsoo.kim@lge$(echo .)com \
--cc=ktkhai@virtuozzo$(echo .)com \
--cc=linux-mm@kvack$(echo .)org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=mgorman@techsingularity$(echo .)net \
--cc=mhocko@kernel$(echo .)org \
--cc=nathanl@linux$(echo .)ibm.com \
--cc=penberg@kernel$(echo .)org \
--cc=puvichakravarthy@in$(echo .)ibm.com \
--cc=rientjes@google$(echo .)com \
--cc=sachinp@linux$(echo .)vnet.ibm.com \
--cc=srikar@linux$(echo .)vnet.ibm.com \
--cc=vbabka@suse$(echo .)cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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