mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
f95bbfe185
module_add_driver() relies on module_kset list for /sys/module/<built-in-module>/drivers directory creation. Since, commit96a1a2412a("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:96a1a2412a("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: Rasmus Villemoes <linux@rasmusvillemoes.dk> Signed-off-by: Shyam Saini <shyamsaini@linux.microsoft.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Link: https://lore.kernel.org/r/20250227184930.34163-5-shyamsaini@linux.microsoft.com Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>
114 lines
2.3 KiB
C
114 lines
2.3 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* module.c - module sysfs fun for drivers
|
|
*/
|
|
#include <linux/device.h>
|
|
#include <linux/module.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/string.h>
|
|
#include "base.h"
|
|
|
|
static char *make_driver_name(const struct device_driver *drv)
|
|
{
|
|
char *driver_name;
|
|
|
|
driver_name = kasprintf(GFP_KERNEL, "%s:%s", drv->bus->name, drv->name);
|
|
if (!driver_name)
|
|
return NULL;
|
|
|
|
return driver_name;
|
|
}
|
|
|
|
static void module_create_drivers_dir(struct module_kobject *mk)
|
|
{
|
|
static DEFINE_MUTEX(drivers_dir_mutex);
|
|
|
|
mutex_lock(&drivers_dir_mutex);
|
|
if (mk && !mk->drivers_dir)
|
|
mk->drivers_dir = kobject_create_and_add("drivers", &mk->kobj);
|
|
mutex_unlock(&drivers_dir_mutex);
|
|
}
|
|
|
|
int module_add_driver(struct module *mod, const struct device_driver *drv)
|
|
{
|
|
char *driver_name;
|
|
struct module_kobject *mk = NULL;
|
|
int ret;
|
|
|
|
if (!drv)
|
|
return 0;
|
|
|
|
if (mod)
|
|
mk = &mod->mkobj;
|
|
else if (drv->mod_name) {
|
|
/* 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;
|
|
/* lookup_or_create_module_kobject took a reference */
|
|
kobject_put(&mk->kobj);
|
|
}
|
|
}
|
|
|
|
if (!mk)
|
|
return 0;
|
|
|
|
ret = sysfs_create_link(&drv->p->kobj, &mk->kobj, "module");
|
|
if (ret)
|
|
return ret;
|
|
|
|
driver_name = make_driver_name(drv);
|
|
if (!driver_name) {
|
|
ret = -ENOMEM;
|
|
goto out_remove_kobj;
|
|
}
|
|
|
|
module_create_drivers_dir(mk);
|
|
if (!mk->drivers_dir) {
|
|
ret = -EINVAL;
|
|
goto out_free_driver_name;
|
|
}
|
|
|
|
ret = sysfs_create_link(mk->drivers_dir, &drv->p->kobj, driver_name);
|
|
if (ret)
|
|
goto out_remove_drivers_dir;
|
|
|
|
kfree(driver_name);
|
|
|
|
return 0;
|
|
|
|
out_remove_drivers_dir:
|
|
sysfs_remove_link(mk->drivers_dir, driver_name);
|
|
|
|
out_free_driver_name:
|
|
kfree(driver_name);
|
|
|
|
out_remove_kobj:
|
|
sysfs_remove_link(&drv->p->kobj, "module");
|
|
return ret;
|
|
}
|
|
|
|
void module_remove_driver(const struct device_driver *drv)
|
|
{
|
|
struct module_kobject *mk = NULL;
|
|
char *driver_name;
|
|
|
|
if (!drv)
|
|
return;
|
|
|
|
sysfs_remove_link(&drv->p->kobj, "module");
|
|
|
|
if (drv->owner)
|
|
mk = &drv->owner->mkobj;
|
|
else if (drv->p->mkobj)
|
|
mk = drv->p->mkobj;
|
|
if (mk && mk->drivers_dir) {
|
|
driver_name = make_driver_name(drv);
|
|
if (driver_name) {
|
|
sysfs_remove_link(mk->drivers_dir, driver_name);
|
|
kfree(driver_name);
|
|
}
|
|
}
|
|
}
|