From 34df0e7e2b8cdfb53cae2038944ddbaf281edd1c Mon Sep 17 00:00:00 2001 From: Ruidong Cao Date: Mon, 3 Mar 2025 13:15:40 +0800 Subject: [PATCH 2/2] Module: suspend the module by rmmod r option Signed-off-by: Ruidong Cao Signed-off-by: fu.lin --- libkmod/libkmod-module.c | 2 +- libkmod/libkmod.h | 3 +++ shared/missing.h | 2 +- tools/rmmod.c | 7 ++++++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c index e72717f..d9ddb99 100644 --- a/libkmod/libkmod-module.c +++ b/libkmod/libkmod-module.c @@ -598,7 +598,7 @@ KMOD_EXPORT int kmod_module_remove_module(struct kmod_module *mod, unsigned int return -ENOENT; /* Filter out other flags and force ONONBLOCK */ - flags &= KMOD_REMOVE_FORCE; + flags &= KMOD_REMOVE_FORCE | KMOD_REMOVE_REPLACE; flags |= KMOD_REMOVE_NOWAIT; err = delete_module(mod->name, flags); diff --git a/libkmod/libkmod.h b/libkmod/libkmod.h index 9c5d3e2..4a4e0d0 100644 --- a/libkmod/libkmod.h +++ b/libkmod/libkmod.h @@ -819,6 +819,9 @@ enum kmod_remove { KMOD_REMOVE_FORCE = O_TRUNC, KMOD_REMOVE_NOWAIT = O_NONBLOCK, KMOD_REMOVE_NOLOG = 1, + + /* custom flag */ + KMOD_REMOVE_REPLACE = 0x1000, }; /** diff --git a/shared/missing.h b/shared/missing.h index bd7fe34..826dcaf 100644 --- a/shared/missing.h +++ b/shared/missing.h @@ -19,7 +19,7 @@ # define MODULE_REPLACE_MODULE 0x1000 #else _Static_assert(MODULE_REPLACE_MODULE == 0x1000, - "MODULE_REPLACE_MODULE != 0x1000, change `KMOD_INSERT_REPLACE` and `KMOD_PROBE_REPLACE` defination"); + "MODULE_REPLACE_MODULE != 0x1000, change `KMOD_INSERT_REPLACE`, `KMOD_REMOVE_REPLACE` and `KMOD_PROBE_REPLACE` defination"); #endif #ifndef __NR_finit_module diff --git a/tools/rmmod.c b/tools/rmmod.c index 962d850..0907dea 100644 --- a/tools/rmmod.c +++ b/tools/rmmod.c @@ -20,10 +20,11 @@ #include "kmod.h" -static const char cmdopts_s[] = "fsvVh"; +static const char cmdopts_s[] = "frsvVh"; static const struct option cmdopts[] = { // clang-format off { "force", no_argument, 0, 'f' }, + {"replace", no_argument, 0, 'r'}, { "syslog", no_argument, 0, 's' }, { "verbose", no_argument, 0, 'v' }, { "version", no_argument, 0, 'V' }, @@ -39,6 +40,7 @@ static void help(void) "Options:\n" "\t-f, --force DANGEROUS: forces a module unload and may\n" "\t crash your machine\n" + "\t-r, --replace replace module\n" "\t-s, --syslog print to syslog, not stderr\n" "\t-v, --verbose enables more messages\n" "\t-V, --version show version\n" @@ -103,6 +105,9 @@ static int do_rmmod(int argc, char *argv[]) case 'f': flags |= KMOD_REMOVE_FORCE; break; + case 'r': + flags |= KMOD_REMOVE_REPLACE; + break; case 's': use_syslog = true; break; -- 2.43.5