Commit 5a20c096 authored by Oscar Salvador's avatar Oscar Salvador Committed by Andrew Morton
Browse files

mm,slub: use node-notifier instead of memory-notifier 

slub is only concerned when a numa node changes its memory state, so stop
using the memory notifier and use the new numa node notifer instead.

[akpm@linux-foundation.org: slub.c needs node.h for struct node_notify]
  Link: https://lore.kernel.org/oe-kbuild-all/202506202144.dGkFxasv-lkp@intel.com/
Link: https://lkml.kernel.org/r/20250616135158.450136-5-osalvador@suse.de


Signed-off-by: default avatarOscar Salvador <osalvador@suse.de>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarHarry Yoo <harry.yoo@oracle.com>
Reviewed-by: default avatarVlastimil Babka <vbabka@suse.cz>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Cc: Rakie Kim <rakie.kim@sk.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 67929de1

mm/slub.c

+10 −19
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/proc_fs.h>

#include <linux/seq_file.h>

#include <linux/kasan.h>

#include <linux/node.h>

#include <linux/kmsan.h>

#include <linux/cpu.h>

#include <linux/cpuset.h>
@@ -6149,7 +6150,7 @@ int __kmem_cache_shrink(struct kmem_cache *s) 
	return __kmem_cache_do_shrink(s);

}



static int slab_mem_going_offline_callback(void *arg)

static int slab_mem_going_offline_callback(void)

{

	struct kmem_cache *s;
@@ -6163,21 +6164,12 @@ static int slab_mem_going_offline_callback(void *arg) 
	return 0;

}



static int slab_mem_going_online_callback(void *arg)

static int slab_mem_going_online_callback(int nid)

{

	struct kmem_cache_node *n;

	struct kmem_cache *s;

	struct memory_notify *marg = arg;

	int nid = marg->status_change_nid;

	int ret = 0;



	/*

	 * If the node's memory is already available, then kmem_cache_node is

	 * already created. Nothing to do.

	 */

	if (nid < 0)

		return 0;



	/*

	 * We are bringing a node online. No memory is available yet. We must

	 * allocate a kmem_cache_node structure in order to bring the node
@@ -6217,17 +6209,16 @@ static int slab_mem_going_online_callback(void *arg) 
static int slab_memory_callback(struct notifier_block *self,

				unsigned long action, void *arg)

{

	struct node_notify *nn = arg;

	int nid = nn->nid;

	int ret = 0;



	switch (action) {

	case MEM_GOING_ONLINE:

		ret = slab_mem_going_online_callback(arg);

		break;

	case MEM_GOING_OFFLINE:

		ret = slab_mem_going_offline_callback(arg);

	case NODE_ADDING_FIRST_MEMORY:

		ret = slab_mem_going_online_callback(nid);

		break;

	case MEM_ONLINE:

	case MEM_CANCEL_OFFLINE:

	case NODE_REMOVING_LAST_MEMORY:

		ret = slab_mem_going_offline_callback();

		break;

	}

	if (ret)
@@ -6303,7 +6294,7 @@ void __init kmem_cache_init(void) 
			sizeof(struct kmem_cache_node),

			SLAB_HWCACHE_ALIGN | SLAB_NO_OBJ_EXT, 0, 0);



	hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI);

	hotplug_node_notifier(slab_memory_callback, SLAB_CALLBACK_PRI);



	/* Able to allocate the per node structures */

	slab_state = PARTIAL;