From: Dominik Karol Piatkowski <dominik.karol.piatkowski@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Isabella Basso <isabbasso@riseup.net>
Subject: [igt-dev] [PATCH i-g-t 2/4] lib/igt_kmod.c: check if module is builtin before attempting to unload it
Date: Fri, 3 Mar 2023 12:07:13 +0100 [thread overview]
Message-ID: <20230303110715.8183-3-dominik.karol.piatkowski@intel.com> (raw)
In-Reply-To: <20230303110715.8183-1-dominik.karol.piatkowski@intel.com>
From: Isabella Basso <isabbasso@riseup.net>
This change makes `igt_kmod_unload_r` safer as it checks whether the
module can be unloaded before attempting it.
v2 -> v3:
- Fix commit message
- Make return value clearer
Acked-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Signed-off-by: Isabella Basso <isabbasso@riseup.net>
---
lib/igt_kmod.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/igt_kmod.c b/lib/igt_kmod.c
index 0b714ce3..fbda1aa6 100644
--- a/lib/igt_kmod.c
+++ b/lib/igt_kmod.c
@@ -259,6 +259,9 @@ static int igt_kmod_unload_r(struct kmod_module *kmod, unsigned int flags)
int err, tries;
const char *mod_name = kmod_module_get_name(kmod);
+ if (kmod_module_get_initstate(kmod) == KMOD_MODULE_BUILTIN)
+ return 0;
+
holders = kmod_module_get_holders(kmod);
kmod_list_foreach(pos, holders) {
struct kmod_module *it = kmod_module_get_module(pos);
--
2.34.1
next prev parent reply other threads:[~2023-03-03 11:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-03 11:07 [igt-dev] [PATCH i-g-t 0/4] Introduce KUnit Dominik Karol Piatkowski
2023-03-03 11:07 ` [igt-dev] [PATCH i-g-t 1/4] lib/igt_kmod: rename kselftest functions to ktest Dominik Karol Piatkowski
2023-03-03 11:07 ` Dominik Karol Piatkowski [this message]
2023-03-03 11:07 ` [igt-dev] [PATCH i-g-t 3/4] lib/igt_kmod: add compatibility for KUnit Dominik Karol Piatkowski
2023-03-03 12:23 ` Petri Latvala
2023-03-03 14:51 ` Janusz Krzysztofik
2023-03-08 7:59 ` Mauro Carvalho Chehab
2023-03-03 11:07 ` [igt-dev] [PATCH i-g-t 4/4] tests: DRM selftests: switch to KUnit Dominik Karol Piatkowski
2023-03-03 15:08 ` Janusz Krzysztofik
2023-03-03 15:15 ` Janusz Krzysztofik
2023-03-03 12:02 ` [igt-dev] ✓ Fi.CI.BAT: success for Introduce KUnit Patchwork
2023-03-03 12:05 ` [igt-dev] ✗ GitLab.Pipeline: warning " Patchwork
2023-03-06 19:34 ` [igt-dev] ✓ Fi.CI.IGT: success " Patchwork
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=20230303110715.8183-3-dominik.karol.piatkowski@intel.com \
--to=dominik.karol.piatkowski@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=isabbasso@riseup.net \
/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