Commit f95bbfe1 authored by Shyam Saini's avatar Shyam Saini Committed by Petr Pavlu
Browse files

drivers: base: handle module_kobject creation 



module_add_driver() relies on module_kset list for
/sys/module/<built-in-module>/drivers directory creation.

Since,
commit 96a1a241 ("kernel/params.c: defer most of param_sysfs_init() to late_initcall time")
drivers which are initialized from subsys_initcall() or any other
higher precedence initcall couldn't find the related kobject entry
in the module_kset list because module_kset is not fully populated
by the time module_add_driver() refers it. As a consequence,
module_add_driver() returns early without calling make_driver_name().
Therefore, /sys/module/<built-in-module>/drivers is never created.

Fix this issue by letting module_add_driver() handle module_kobject
creation itself.

Fixes: 96a1a241 ("kernel/params.c: defer most of param_sysfs_init() to late_initcall time")
Cc: stable@vger.kernel.org # requires all other patches from the series
Suggested-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarShyam Saini <shyamsaini@linux.microsoft.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20250227184930.34163-5-shyamsaini@linux.microsoft.com


Signed-off-by: default avatarPetr Pavlu <petr.pavlu@suse.com>
parent 7c76c813

drivers/base/module.c

+5 −8
Original line number Diff line number Diff line
@@ -42,16 +42,13 @@ int module_add_driver(struct module *mod, const struct device_driver *drv) 
	if (mod)

		mk = &mod->mkobj;

	else if (drv->mod_name) {

		struct kobject *mkobj;



		/* Lookup built-in module entry in /sys/modules */

		mkobj = kset_find_obj(module_kset, drv->mod_name);

		if (mkobj) {

			mk = container_of(mkobj, struct module_kobject, kobj);

		/* Lookup or create built-in module entry in /sys/modules */

		mk = lookup_or_create_module_kobject(drv->mod_name);

		if (mk) {

			/* remember our module structure */

			drv->p->mkobj = mk;

			/* kset_find_obj took a reference */

			kobject_put(mkobj);

			/* lookup_or_create_module_kobject took a reference */

			kobject_put(&mk->kobj);

		}

	}