Unverified Commit 8a397b27 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9775 mm/slub: Reduce memory consumption in extreme scenarios 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Shixin <liushixin2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PVWS76YS3TH5AW6NJU5AOMGSP22OAZV7/ 
 
https://gitee.com/openeuler/kernel/issues/IAATAS 
 
Link:https://gitee.com/openeuler/kernel/pulls/9775

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 30c40a92 bbbd2bb2

mm/slub.c

+23 −2
Original line number Diff line number Diff line
@@ -2392,7 +2392,7 @@ static struct slab *get_partial(struct kmem_cache *s, int node, 
		searchnode = numa_mem_id();



	slab = get_partial_node(s, get_node(s, searchnode), pc);

	if (slab || node != NUMA_NO_NODE)

	if (slab || (node != NUMA_NO_NODE && (pc->flags & __GFP_THISNODE)))

		return slab;



	return get_any_partial(s, pc);
@@ -3068,6 +3068,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, 
	struct slab *slab;

	unsigned long flags;

	struct partial_context pc;

	bool try_thisnode = true;



	stat(s, ALLOC_SLOWPATH);
@@ -3194,6 +3195,21 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, 
new_objects:



	pc.flags = gfpflags;

	/*

	 * When a preferred node is indicated but no __GFP_THISNODE

	 *

	 * 1) try to get a partial slab from target node only by having

	 *    __GFP_THISNODE in pc.flags for get_partial()

	 * 2) if 1) failed, try to allocate a new slab from target node with

	 *    GPF_NOWAIT | __GFP_THISNODE opportunistically

	 * 3) if 2) failed, retry with original gfpflags which will allow

	 *    get_partial() try partial lists of other nodes before potentially

	 *    allocating new page from other nodes

	 */

	if (unlikely(node != NUMA_NO_NODE && !(gfpflags & __GFP_THISNODE)

		     && try_thisnode))

		pc.flags = GFP_NOWAIT | __GFP_THISNODE;



	pc.orig_size = orig_size;

	slab = get_partial(s, node, &pc);

	if (slab) {
@@ -3215,10 +3231,15 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, 
	}



	slub_put_cpu_ptr(s->cpu_slab);

	slab = new_slab(s, gfpflags, node);

	slab = new_slab(s, pc.flags, node);

	c = slub_get_cpu_ptr(s->cpu_slab);



	if (unlikely(!slab)) {

		if (node != NUMA_NO_NODE && !(gfpflags & __GFP_THISNODE)

		    && try_thisnode) {

			try_thisnode = false;

			goto new_objects;

		}

		slab_out_of_memory(s, gfpflags, node);

		return NULL;

	}