Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

module: Move modprobe_path and modules_disabled ctl_tables into the module subsys 

Move module sysctl (modprobe_path and modules_disabled) out of sysctl.c
and into the modules subsystem. Make modules_disabled static as it no
longer needs to be exported. Remove module.h from the includes in sysctl
as it no longer uses any module exported variables.

This is part of a greater effort to move ctl tables into their
respective subsystems which will reduce the merge conflicts in
kernel/sysctl.c.

Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Reviewed-by: Petr Pavlu <petr.pavlu@suse.com>
Signed-off-by: Joel Granados <joel.granados@kernel.org>
This commit is contained in:
Joel Granados 2025-04-29 14:30:00 +02:00
parent 19272b37aa
commit d0d05f602c
5 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/kmod.h
View File

@ -14,10 +14,7 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#define KMOD_PATH_LEN 256
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
extern char modprobe_path[]; /* for sysctl */
/* modprobe exit status on success, -ve on error. Return value /* modprobe exit status on success, -ve on error. Return value
* usually useless though. */ * usually useless though. */
extern __printf(2, 3) extern __printf(2, 3)

1
include/linux/module.h
View File

@ -304,7 +304,6 @@ struct notifier_block;
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
extern int modules_disabled; /* for sysctl */
/* Get/put a kernel symbol (calls must be symmetric) */ /* Get/put a kernel symbol (calls must be symmetric) */
void *__symbol_get(const char *symbol); void *__symbol_get(const char *symbol);
void *__symbol_get_gpl(const char *symbol); void *__symbol_get_gpl(const char *symbol);

3
kernel/module/internal.h
View File

@ -58,6 +58,9 @@ extern const struct kernel_symbol __stop___ksymtab_gpl[];
extern const u32 __start___kcrctab[]; extern const u32 __start___kcrctab[];
extern const u32 __start___kcrctab_gpl[]; extern const u32 __start___kcrctab_gpl[];
#define KMOD_PATH_LEN 256
extern char modprobe_path[];
struct load_info { struct load_info {
const char *name; const char *name;
/* pointer to module in temporary copy, freed at end of load_module() */ /* pointer to module in temporary copy, freed at end of load_module() */

30
kernel/module/main.c
View File

@ -126,9 +126,37 @@ static void mod_update_bounds(struct module *mod)
} }
/* Block module loading/unloading? */ /* Block module loading/unloading? */
int modules_disabled; static int modules_disabled;
core_param(nomodule, modules_disabled, bint, 0); core_param(nomodule, modules_disabled, bint, 0);
static const struct ctl_table module_sysctl_table[] = {
{
.procname = "modprobe",
.data = &modprobe_path,
.maxlen = KMOD_PATH_LEN,
.mode = 0644,
.proc_handler = proc_dostring,
},
{
.procname = "modules_disabled",
.data = &modules_disabled,
.maxlen = sizeof(int),
.mode = 0644,
/* only handle a transition from default "0" to "1" */
.proc_handler = proc_dointvec_minmax,
.extra1 = SYSCTL_ONE,
.extra2 = SYSCTL_ONE,
},
};
static int __init init_module_sysctl(void)
{
register_sysctl_init("kernel", module_sysctl_table);
return 0;
}
subsys_initcall(init_module_sysctl);
/* Waiting for a module to finish initializing? */ /* Waiting for a module to finish initializing? */
static DECLARE_WAIT_QUEUE_HEAD(module_wq); static DECLARE_WAIT_QUEUE_HEAD(module_wq);

20
kernel/sysctl.c
View File

@ -19,7 +19,6 @@
* Removed it and replaced it with older style, 03/23/00, Bill Wendling * Removed it and replaced it with older style, 03/23/00, Bill Wendling
*/ */
#include <linux/module.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/bitmap.h> #include <linux/bitmap.h>
#include <linux/printk.h> #include <linux/printk.h>
@ -1616,25 +1615,6 @@ static const struct ctl_table kern_table[] = {
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec,
}, },
#endif #endif
#ifdef CONFIG_MODULES
{
.procname = "modprobe",
.data = &modprobe_path,
.maxlen = KMOD_PATH_LEN,
.mode = 0644,
.proc_handler = proc_dostring,
},
{
.procname = "modules_disabled",
.data = &modules_disabled,
.maxlen = sizeof(int),
.mode = 0644,
/* only handle a transition from default "0" to "1" */
.proc_handler = proc_dointvec_minmax,
.extra1 = SYSCTL_ONE,
.extra2 = SYSCTL_ONE,
},
#endif
#ifdef CONFIG_UEVENT_HELPER #ifdef CONFIG_UEVENT_HELPER
{ {
.procname = "hotplug", .procname = "hotplug",