static int force = 0;
static int strip_modversion = 0;
static int strip_vermagic = 0;
-static int remove_dependencies = 0;
+static int remove_holders = 0;
static int quiet_inuse = 0;
static const char cmdopts_s[] = "arRibfDcnC:d:S:sqvVh";
{"all", no_argument, 0, 'a'},
{"remove", no_argument, 0, 'r'},
{"remove-dependencies", no_argument, 0, 5},
+ {"remove-holders", no_argument, 0, 5},
{"resolve-alias", no_argument, 0, 'R'},
{"first-time", no_argument, 0, 3},
{"ignore-install", no_argument, 0, 'i'},
{"show-config", no_argument, 0, 'c'},
{"show-modversions", no_argument, 0, 4},
{"dump-modversions", no_argument, 0, 4},
+ {"show-exports", no_argument, 0, 6},
{"dry-run", no_argument, 0, 'n'},
{"show", no_argument, 0, 'n'},
"\t be a module name to be inserted\n"
"\t or removed (-r)\n"
"\t-r, --remove Remove modules instead of inserting\n"
- "\t --remove-dependencies Also remove modules depending on it\n"
- "\t-R, --resolve-alias Only lookup and print alias and exit\n"
+ "\t --remove-dependencies Deprecated: use --remove-holders\n"
+ "\t --remove-holders Also remove module holders (use together with -r)\n"
"\t --first-time Fail if module already inserted or removed\n"
"\t-i, --ignore-install Ignore install commands\n"
"\t-i, --ignore-remove Ignore remove commands\n"
"\t --force-vermagic Ignore module's version magic\n"
"\n"
"Query Options:\n"
+ "\t-R, --resolve-alias Only lookup and print alias and exit\n"
"\t-D, --show-depends Only print module dependencies and exit\n"
"\t-c, --showconfig Print out known configuration and exit\n"
"\t-c, --show-config Same as --showconfig\n"
"\t --show-modversions Dump module symbol version and exit\n"
"\t --dump-modversions Same as --show-modversions\n"
+ "\t --show-exports Only print module exported symbol versions and exit\n"
"\n"
"General Options:\n"
"\t-n, --dry-run Do not execute operations, just print out\n"
return 0;
}
+static int show_exports(struct kmod_ctx *ctx, const char *filename)
+{
+ struct kmod_list *l, *list = NULL;
+ struct kmod_module *mod;
+ int err = kmod_module_new_from_path(ctx, filename, &mod);
+ if (err < 0) {
+ LOG("Module %s not found.\n", filename);
+ return err;
+ }
+
+ err = kmod_module_get_symbols(mod, &list);
+ if (err < 0) {
+ LOG("could not get symbols of %s: %s\n",
+ filename, strerror(-err));
+ kmod_module_unref(mod);
+ return err;
+ }
+
+ kmod_list_foreach(l, list) {
+ const char *symbol = kmod_module_symbol_get_symbol(l);
+ uint64_t crc = kmod_module_symbol_get_crc(l);
+ printf("0x%08"PRIx64"\t%s\n", crc, symbol);
+ }
+ kmod_module_symbols_free_list(list);
+ kmod_module_unref(mod);
+ return 0;
+}
+
static int command_do(struct kmod_module *module, const char *type,
const char *command, const char *cmdline_opts)
{
static int rmmod_do_remove_module(struct kmod_module *mod)
{
const char *modname = kmod_module_get_name(mod);
- struct kmod_list *deps, *itr;
int flags = 0, err;
- SHOW("rmmod %s\n", kmod_module_get_name(mod));
+ SHOW("rmmod %s\n", modname);
if (dry_run)
return 0;
LOG("Module %s is not in kernel.\n", modname);
}
- deps = kmod_module_get_dependencies(mod);
- if (deps != NULL) {
- kmod_list_foreach(itr, deps) {
- struct kmod_module *dep = kmod_module_get_module(itr);
- if (kmod_module_get_refcnt(dep) == 0)
- rmmod_do_remove_module(dep);
- kmod_module_unref(dep);
- }
- kmod_module_unref_list(deps);
- }
-
return err;
}
-static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies);
+#define RMMOD_FLAG_REMOVE_HOLDERS 0x1
+#define RMMOD_FLAG_IGNORE_BUILTIN 0x2
+static int rmmod_do_module(struct kmod_module *mod, int flags);
-static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors)
+/* Remove modules in reverse order */
+static int rmmod_do_modlist(struct kmod_list *list, bool stop_on_errors)
{
struct kmod_list *l;
kmod_list_foreach_reverse(l, list) {
struct kmod_module *m = kmod_module_get_module(l);
- int r = rmmod_do_module(m, false);
+ int r = rmmod_do_module(m, RMMOD_FLAG_IGNORE_BUILTIN);
kmod_module_unref(m);
if (r < 0 && stop_on_errors)
return 0;
}
-static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies)
+static int rmmod_do_module(struct kmod_module *mod, int flags)
{
const char *modname = kmod_module_get_name(mod);
struct kmod_list *pre = NULL, *post = NULL;
cmd = kmod_module_get_remove_commands(mod);
}
- if (cmd == NULL && !ignore_loaded) {
+ /* Quick check if module is loaded, otherwise there's nothing to do */
+ if (!cmd && !ignore_loaded) {
int state = kmod_module_get_initstate(mod);
if (state < 0) {
}
goto error;
} else if (state == KMOD_MODULE_BUILTIN) {
- LOG("Module %s is builtin.\n", modname);
- err = -ENOENT;
+ if (flags & RMMOD_FLAG_IGNORE_BUILTIN) {
+ err = 0;
+ } else {
+ LOG("Module %s is builtin.\n", modname);
+ err = -ENOENT;
+ }
goto error;
}
}
- rmmod_do_deps_list(post, false);
+ /* 1. @mod's post-softdeps in reverse order */
+ rmmod_do_modlist(post, false);
- if (do_dependencies && remove_dependencies) {
- struct kmod_list *deps = kmod_module_get_dependencies(mod);
+ /* 2. Other modules holding @mod */
+ if (flags & RMMOD_FLAG_REMOVE_HOLDERS) {
+ struct kmod_list *holders = kmod_module_get_holders(mod);
- err = rmmod_do_deps_list(deps, true);
+ err = rmmod_do_modlist(holders, true);
if (err < 0)
goto error;
}
- if (!ignore_loaded && !cmd) {
+ /* 3. @mod itself, but check for refcnt first */
+ if (!cmd && !ignore_loaded) {
int usage = kmod_module_get_refcnt(mod);
if (usage > 0) {
}
}
- if (cmd == NULL)
+ if (!cmd)
err = rmmod_do_remove_module(mod);
else
err = command_do(mod, "remove", cmd, NULL);
if (err < 0)
goto error;
- rmmod_do_deps_list(pre, false);
+ /* 4. Other modules that became unused: errors are non-fatal */
+ if (!cmd) {
+ struct kmod_list *deps, *itr;
+
+ deps = kmod_module_get_dependencies(mod);
+ kmod_list_foreach(itr, deps) {
+ struct kmod_module *dep = kmod_module_get_module(itr);
+ if (kmod_module_get_refcnt(dep) == 0)
+ rmmod_do_remove_module(dep);
+ kmod_module_unref(dep);
+ }
+ kmod_module_unref_list(deps);
+ }
+
+ /* 5. @mod's pre-softdeps in reverse order: errors are non-fatal */
+ rmmod_do_modlist(pre, false);
error:
kmod_module_unref_list(pre);
kmod_list_foreach(l, list) {
struct kmod_module *mod = kmod_module_get_module(l);
- err = rmmod_do_module(mod, true);
+ int flags = remove_holders ? RMMOD_FLAG_REMOVE_HOLDERS : 0;
+
+ err = rmmod_do_module(mod, flags);
kmod_module_unref(mod);
if (err < 0)
break;
const char *options) = NULL;
err = kmod_module_new_from_lookup(ctx, alias, &list);
- if (err < 0)
- return err;
- if (list == NULL) {
- LOG("Module %s not found.\n", alias);
+ if (list == NULL || err < 0) {
+ LOG("Module %s not found in directory %s\n", alias,
+ ctx ? kmod_get_dirname(ctx) : "(missing)");
return -ENOENT;
}
static char **prepend_options_from_env(int *p_argc, char **orig_argv)
{
const char *p, *env = getenv("MODPROBE_OPTIONS");
- char **new_argv, *str_start, *str_end, *str, *s, *quote;
+ char **new_argv, *str_end, *str, *s, *quote;
int i, argc = *p_argc;
size_t envlen, space_count = 0;
return NULL;
new_argv[0] = orig_argv[0];
- str_start = str = (char *) (new_argv + argc + space_count + 3);
+ str = (char *) (new_argv + argc + space_count + 3);
memcpy(str, env, envlen + 1);
- str_end = str_start + envlen;
+ str_end = str + envlen;
quote = NULL;
for (i = 1, s = str; *s != '\0'; s++) {
}
memcpy(new_argv + i, orig_argv + 1, sizeof(char *) * (argc - 1));
- new_argv[i + argc] = NULL;
+ new_argv[i + argc - 1] = NULL;
*p_argc = i + argc - 1;
return new_argv;
int do_remove = 0;
int do_show_config = 0;
int do_show_modversions = 0;
+ int do_show_exports = 0;
int err;
argv = prepend_options_from_env(&argc, orig_argv);
do_remove = 1;
break;
case 5:
- remove_dependencies = 1;
- break;
- case 'R':
- lookup_only = 1;
+ remove_holders = 1;
break;
case 3:
first_time = 1;
dry_run = 1;
do_show = 1;
break;
+ case 'R':
+ lookup_only = 1;
+ break;
case 'c':
do_show_config = 1;
break;
case 4:
do_show_modversions = 1;
break;
+ case 6:
+ do_show_exports = 1;
+ break;
case 'n':
dry_run = 1;
break;
err = show_config(ctx);
else if (do_show_modversions)
err = show_modversions(ctx, args[0]);
+ else if (do_show_exports)
+ err = show_exports(ctx, args[0]);
else if (do_remove)
err = rmmod_all(ctx, args, nargs);
else if (use_all)