diff --git a/configure.ac b/configure.ac index 796721a3c..822a53044 100644 --- a/configure.ac +++ b/configure.ac @@ -39,6 +39,7 @@ if test -z "$GPERF" ; then AC_MSG_ERROR([*** gperf not found]) fi +PKG_CHECK_MODULES(KMOD, [libkmod >= 5]) PKG_CHECK_MODULES(BLKID,[blkid >= 2.20]) # Checks for header files. diff --git a/rules/75-probe_mtd.rules b/rules/75-probe_mtd.rules index a17c8252f..c0e083978 100644 --- a/rules/75-probe_mtd.rules +++ b/rules/75-probe_mtd.rules @@ -3,6 +3,6 @@ ACTION!="add", GOTO="mtd_probe_end" KERNEL=="mtd*ro", IMPORT{program}="mtd_probe $devnode" -KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", RUN+="@sbindir@/modprobe -bv sm_ftl" +KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", IMPORT{builtin}="kmod load sm_ftl" LABEL="mtd_probe_end" diff --git a/rules/80-drivers.rules b/rules/80-drivers.rules index 04e30f5b0..692510c91 100644 --- a/rules/80-drivers.rules +++ b/rules/80-drivers.rules @@ -2,11 +2,11 @@ ACTION=="remove", GOTO="drivers_end" -DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="@sbindir@/modprobe -bv $env{MODALIAS}" -SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="@sbindir@/modprobe -bv tifm_sd" -SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="@sbindir@/modprobe -bv tifm_ms" -SUBSYSTEM=="memstick", RUN+="@sbindir@/modprobe -bv --all ms_block mspro_block" -SUBSYSTEM=="i2o", RUN+="@sbindir@/modprobe -bv i2o_block" -SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="@sbindir@/modprobe -bv ppdev" +DRIVER!="?*", ENV{MODALIAS}=="?*", IMPORT{builtin}="kmod load $env{MODALIAS}" +SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", IMPORT{builtin}="kmod load tifm_sd" +SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", IMPORT{builtin}="kmod load tifm_ms" +SUBSYSTEM=="memstick", IMPORT{builtin}="kmod load ms_block mspro_block" +SUBSYSTEM=="i2o", IMPORT{builtin}="kmod load i2o_block" +SUBSYSTEM=="module", KERNEL=="parport_pc", RUN{builtin}="kmod load ppdev" LABEL="drivers_end" diff --git a/src/test/Makefile.am b/src/test/Makefile.am index ca7fde035..d50200d82 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -28,6 +28,7 @@ test_udev_LDADD = \ $(top_builddir)/src/libudev/libudev-private.la \ $(top_builddir)/src/udev/libudev-core.la \ $(BLKID_LIBS) \ + $(KMOD_LIBS) \ $(SELINUX_LIBS) test_udev_CPPFLAGS = \ diff --git a/src/udev/Makefile.am b/src/udev/Makefile.am index cf0725a19..ab1322a1a 100644 --- a/src/udev/Makefile.am +++ b/src/udev/Makefile.am @@ -49,6 +49,7 @@ libudev_core_la_SOURCES = \ udev-builtin-firmware.c \ udev-builtin-hwdb.c \ udev-builtin-input_id.c \ + udev-builtin-kmod.c \ udev-builtin-net_id.c \ udev-builtin-path_id.c \ udev-builtin-usb_id.c \ @@ -100,11 +101,13 @@ include_HEADERS = \ libudev_core_la_CFLAGS = \ $(AM_CFLAGS) \ - $(BLKID_CFLAGS) + $(BLKID_CFLAGS) \ + $(KMOD_CFLAGS) libudev_core_la_LIBADD = \ $(top_builddir)/src/libudev/libudev-private.la \ - $(BLKID_LIBS) + $(BLKID_LIBS) \ + $(KMOD_LIBS) if HAVE_ACL libudev_core_la_SOURCES += \ diff --git a/src/udev/udev-builtin-kmod.c b/src/udev/udev-builtin-kmod.c new file mode 100644 index 000000000..17aca2944 --- /dev/null +++ b/src/udev/udev-builtin-kmod.c @@ -0,0 +1,134 @@ +/* + * load kernel modules + * + * Copyright (C) 2011-2012 Kay Sievers + * Copyright (C) 2011 ProFUSION embedded systems + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "udev.h" + +static struct kmod_ctx *ctx; + +static int load_module(struct udev *udev, const char *alias) +{ + struct kmod_list *list = NULL; + struct kmod_list *l; + int err; + + err = kmod_module_new_from_lookup(ctx, alias, &list); + if (err < 0) + return err; + + if (list == NULL) + log_debug("no module matches '%s'\n", alias); + + kmod_list_foreach(l, list) { + struct kmod_module *mod = kmod_module_get_module(l); + + err = kmod_module_probe_insert_module(mod, KMOD_PROBE_APPLY_BLACKLIST, NULL, NULL, NULL, NULL); + if (err == KMOD_PROBE_APPLY_BLACKLIST) + log_debug("module '%s' is blacklisted\n", kmod_module_get_name(mod)); + else if (err == 0) + log_debug("inserted '%s'\n", kmod_module_get_name(mod)); + else + log_debug("failed to insert '%s'\n", kmod_module_get_name(mod)); + + kmod_module_unref(mod); + } + + kmod_module_unref_list(list); + return err; +} + +static void udev_kmod_log(void *data, int priority, const char *file, int line, + const char *fn, const char *format, va_list args) +{ + udev_main_log(data, priority, file, line, fn, format, args); +} + +static int builtin_kmod(struct udev_device *dev, int argc, char *argv[], bool test) +{ + struct udev *udev = udev_device_get_udev(dev); + int i; + + if (!ctx) + return 0; + + if (argc < 3 || strcmp(argv[1], "load")) { + log_error("expect: %s load \n", argv[0]); + return EXIT_FAILURE; + } + + for (i = 2; argv[i]; i++) { + log_debug("execute '%s' '%s'\n", argv[1], argv[i]); + load_module(udev, argv[i]); + } + + return EXIT_SUCCESS; +} + +/* called at udev startup and reload */ +static int builtin_kmod_init(struct udev *udev) +{ + if (ctx) + return 0; + + ctx = kmod_new(NULL, NULL); + if (!ctx) + return -ENOMEM; + + log_debug("load module index\n"); + kmod_set_log_fn(ctx, udev_kmod_log, udev); + kmod_load_resources(ctx); + return 0; +} + +/* called on udev shutdown and reload request */ +static void builtin_kmod_exit(struct udev *udev) +{ + log_debug("unload module index\n"); + ctx = kmod_unref(ctx); +} + +/* called every couple of seconds during event activity; 'true' if config has changed */ +static bool builtin_kmod_validate(struct udev *udev) +{ + log_debug("validate module index\n"); + if (!ctx) + return false; + return (kmod_validate_resources(ctx) != KMOD_RESOURCES_OK); +} + +const struct udev_builtin udev_builtin_kmod = { + .name = "kmod", + .cmd = builtin_kmod, + .init = builtin_kmod_init, + .exit = builtin_kmod_exit, + .validate = builtin_kmod_validate, + .help = "kernel module loader", + .run_once = false, +}; diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c index e0e18d4ee..ee81b2d71 100644 --- a/src/udev/udev-builtin.c +++ b/src/udev/udev-builtin.c @@ -35,6 +35,7 @@ static const struct udev_builtin *builtins[] = { [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware, [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb, [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id, + [UDEV_BUILTIN_KMOD] = &udev_builtin_kmod, [UDEV_BUILTIN_NET_ID] = &udev_builtin_net_id, [UDEV_BUILTIN_PATH_ID] = &udev_builtin_path_id, [UDEV_BUILTIN_USB_ID] = &udev_builtin_usb_id, diff --git a/src/udev/udev.h b/src/udev/udev.h index c10610ea2..82cd2ad6d 100644 --- a/src/udev/udev.h +++ b/src/udev/udev.h @@ -139,6 +139,7 @@ enum udev_builtin_cmd { UDEV_BUILTIN_FIRMWARE, UDEV_BUILTIN_HWDB, UDEV_BUILTIN_INPUT_ID, + UDEV_BUILTIN_KMOD, UDEV_BUILTIN_NET_ID, UDEV_BUILTIN_PATH_ID, UDEV_BUILTIN_USB_ID, @@ -161,6 +162,7 @@ extern const struct udev_builtin udev_builtin_btrfs; extern const struct udev_builtin udev_builtin_firmware; extern const struct udev_builtin udev_builtin_hwdb; extern const struct udev_builtin udev_builtin_input_id; +extern const struct udev_builtin udev_builtin_kmod; extern const struct udev_builtin udev_builtin_net_id; extern const struct udev_builtin udev_builtin_path_id; extern const struct udev_builtin udev_builtin_usb_id;