From: Lucas De Marchi <lucas.demarchi@intel.com>
To: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
Cc: linux-modules@vger.kernel.org
Subject: Re: [PATCH] modprobe: ignore builtin module on recursive removing
Date: Wed, 6 Nov 2019 23:36:36 -0800 [thread overview]
Message-ID: <20191107073636.jruf3y6g4jm5bsoo@ldmartin-desk1> (raw)
In-Reply-To: <20191031181253.18162-1-yauheni.kaliuta@redhat.com>
On Thu, Oct 31, 2019 at 08:12:53PM +0200, Yauheni Kaliuta wrote:
>If there are built-in dependencies and any of them is built-in in
>the kernel, modprobe -r fails with
>
>modprobe: FATAL: Module module_name is builtin.
>
>It makes sense to ignore such dependencies for the case when
>removing is called for non-top level module.
>
>Example: cifs module, it declares bunch of softdeps and the first
>one fails on some kernel configs:
>
>modprobe: FATAL: Module gcm is builtin.
>
>Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
makes sense.
thanks, applied.
Lucas De Marchi
>---
> tools/modprobe.c | 18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
>diff --git a/tools/modprobe.c b/tools/modprobe.c
>index a9e2331567af..44cd15c2bf57 100644
>--- a/tools/modprobe.c
>+++ b/tools/modprobe.c
>@@ -353,7 +353,8 @@ static int rmmod_do_remove_module(struct kmod_module *mod)
> return err;
> }
>
>-static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies);
>+static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies,
>+ bool ignore_builtin);
>
> static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors)
> {
>@@ -361,7 +362,7 @@ static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors)
>
> 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, false, true);
> kmod_module_unref(m);
>
> if (r < 0 && stop_on_errors)
>@@ -371,7 +372,8 @@ static int rmmod_do_deps_list(struct kmod_list *list, bool 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, bool do_dependencies,
>+ bool ignore_builtin)
> {
> const char *modname = kmod_module_get_name(mod);
> struct kmod_list *pre = NULL, *post = NULL;
>@@ -401,8 +403,12 @@ static int rmmod_do_module(struct kmod_module *mod, bool do_dependencies)
> }
> goto error;
> } else if (state == KMOD_MODULE_BUILTIN) {
>- LOG("Module %s is builtin.\n", modname);
>- err = -ENOENT;
>+ if (ignore_builtin) {
>+ err = 0;
>+ } else {
>+ LOG("Module %s is builtin.\n", modname);
>+ err = -ENOENT;
>+ }
> goto error;
> }
> }
>@@ -462,7 +468,7 @@ static int rmmod(struct kmod_ctx *ctx, const char *alias)
>
> kmod_list_foreach(l, list) {
> struct kmod_module *mod = kmod_module_get_module(l);
>- err = rmmod_do_module(mod, true);
>+ err = rmmod_do_module(mod, true, false);
> kmod_module_unref(mod);
> if (err < 0)
> break;
>--
>2.23.0
>
prev parent reply other threads:[~2019-11-07 7:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-31 18:12 [PATCH] modprobe: ignore builtin module on recursive removing Yauheni Kaliuta
2019-11-07 7:36 ` Lucas De Marchi [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191107073636.jruf3y6g4jm5bsoo@ldmartin-desk1 \
--to=lucas.demarchi@intel.com \
--cc=linux-modules@vger.kernel.org \
--cc=yauheni.kaliuta@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).