Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
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/5] lib/igt_kmod.c: check if module is builtin before attempting to unload it
Date: Fri, 24 Mar 2023 09:11:17 +0100	[thread overview]
Message-ID: <20230324081120.3355-3-dominik.karol.piatkowski@intel.com> (raw)
In-Reply-To: <20230324081120.3355-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>

Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski@intel.com>
---
 lib/igt_kmod.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/igt_kmod.c b/lib/igt_kmod.c
index 93fa2006..26d58e29 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

  parent reply	other threads:[~2023-03-24  8:11 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-24  8:11 [igt-dev] [PATCH v3 i-g-t 0/5] Introduce KUnit Dominik Karol Piatkowski
2023-03-24  8:11 ` [igt-dev] [PATCH i-g-t 1/5] lib/igt_kmod: rename kselftest functions to ktest Dominik Karol Piatkowski
2023-03-24  8:11 ` Dominik Karol Piatkowski [this message]
2023-03-24  8:11 ` [igt-dev] [PATCH i-g-t 3/5] lib/igt_kmod: add compatibility for KUnit Dominik Karol Piatkowski
2023-03-24  8:11 ` [igt-dev] [PATCH i-g-t 4/5] tests: DRM selftests: switch to KUnit Dominik Karol Piatkowski
2023-03-24  8:11 ` [igt-dev] [PATCH i-g-t 5/5] Change logic of ktap parser to run on a thread Dominik Karol Piatkowski
2023-04-07 12:53   ` Janusz Krzysztofik
2023-03-24  8:30 ` [igt-dev] ✗ GitLab.Pipeline: warning for Introduce KUnit (rev3) Patchwork
2023-03-24  8:47 ` [igt-dev] ✗ Fi.CI.BAT: failure " Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2023-03-15  9:40 [igt-dev] [PATCH v2 i-g-t 0/5] Introduce KUnit Dominik Karol Piatkowski
2023-03-15  9:40 ` [igt-dev] [PATCH i-g-t 2/5] lib/igt_kmod.c: check if module is builtin before attempting to unload it Dominik Karol Piatkowski

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=20230324081120.3355-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