Commit 8ad018db authored by Petr Tesarik's avatar Petr Tesarik Committed by Vlastimil Babka
Browse files

slab: use new API for remaining command line parameters 



Use core_param() and __core_param_cb() instead of __setup() or
__setup_param() to improve syntax checking and error messages.

Replace get_option() with kstrtouint(), because:
* the latter accepts a pointer to const char,
* these parameters should not accept ranges,
* error value can be passed directly to parser.

There is one more change apart from the parsing of numeric parameters:
slab_strict_numa parameter name must match exactly. Before this patch the
kernel would silently accept any option that starts with the name as an
undocumented alias.

Signed-off-by: default avatarPetr Tesarik <ptesarik@suse.com>
Link: https://patch.msgid.link/6ae7e0ddc72b7619203c07dd5103a598e12f713b.1761324765.git.ptesarik@suse.com


Reviewed-by: default avatarHarry Yoo <harry.yoo@oracle.com>
Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
parent aed760df

mm/slub.c

+34 −23
Original line number Diff line number Diff line
@@ -8131,46 +8131,53 @@ void __kmem_obj_info(struct kmem_obj_info *kpp, void *object, struct slab *slab) 
 *		Kmalloc subsystem

 *******************************************************************/



static int __init setup_slub_min_order(char *str)

static int __init setup_slub_min_order(const char *str, const struct kernel_param *kp)

{

	get_option(&str, (int *)&slub_min_order);

	int ret;



	ret = kstrtouint(str, 0, &slub_min_order);

	if (ret)

		return ret;



	if (slub_min_order > slub_max_order)

		slub_max_order = slub_min_order;



	return 1;

	return 0;

}



__setup("slab_min_order=", setup_slub_min_order);

__setup_param("slub_min_order=", slub_min_order, setup_slub_min_order, 0);



static const struct kernel_param_ops param_ops_slab_min_order __initconst = {

	.set = setup_slub_min_order,

};

__core_param_cb(slab_min_order, &param_ops_slab_min_order, &slub_min_order, 0);

__core_param_cb(slub_min_order, &param_ops_slab_min_order, &slub_min_order, 0);



static int __init setup_slub_max_order(char *str)

static int __init setup_slub_max_order(const char *str, const struct kernel_param *kp)

{

	get_option(&str, (int *)&slub_max_order);

	int ret;



	ret = kstrtouint(str, 0, &slub_max_order);

	if (ret)

		return ret;



	slub_max_order = min_t(unsigned int, slub_max_order, MAX_PAGE_ORDER);



	if (slub_min_order > slub_max_order)

		slub_min_order = slub_max_order;



	return 1;

	return 0;

}



__setup("slab_max_order=", setup_slub_max_order);

__setup_param("slub_max_order=", slub_max_order, setup_slub_max_order, 0);



static int __init setup_slub_min_objects(char *str)

{

	get_option(&str, (int *)&slub_min_objects);



	return 1;

}

static const struct kernel_param_ops param_ops_slab_max_order __initconst = {

	.set = setup_slub_max_order,

};

__core_param_cb(slab_max_order, &param_ops_slab_max_order, &slub_max_order, 0);

__core_param_cb(slub_max_order, &param_ops_slab_max_order, &slub_max_order, 0);



__setup("slab_min_objects=", setup_slub_min_objects);

__setup_param("slub_min_objects=", slub_min_objects, setup_slub_min_objects, 0);

core_param(slab_min_objects, slub_min_objects, uint, 0);

core_param(slub_min_objects, slub_min_objects, uint, 0);



#ifdef CONFIG_NUMA

static int __init setup_slab_strict_numa(char *str)

static int __init setup_slab_strict_numa(const char *str, const struct kernel_param *kp)

{

	if (nr_node_ids > 1) {

		static_branch_enable(&strict_numa);
@@ -8179,10 +8186,14 @@ static int __init setup_slab_strict_numa(char *str) 
		pr_warn("slab_strict_numa parameter set on non NUMA system.\n");

	}



	return 1;

	return 0;

}



__setup("slab_strict_numa", setup_slab_strict_numa);

static const struct kernel_param_ops param_ops_slab_strict_numa __initconst = {

	.flags = KERNEL_PARAM_OPS_FL_NOARG,

	.set = setup_slab_strict_numa,

};

__core_param_cb(slab_strict_numa, &param_ops_slab_strict_numa, NULL, 0);

#endif