From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: <igt-dev@lists.freedesktop.org>
Cc: intel-xe@lists.freedesktop.org,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>,
"Lucas De Marchi" <lucas.demarchi@intel.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"José Roberto de Souza" <jose.souza@intel.com>
Subject: [PATCH i-g-t 2/3] lib/igt_kmod: drop devcoredump before a PCI module unload
Date: Wed, 3 Apr 2024 11:14:08 -0400 [thread overview]
Message-ID: <20240403151411.113159-2-rodrigo.vivi@intel.com> (raw)
In-Reply-To: <20240403151411.113159-1-rodrigo.vivi@intel.com>
devcoredump holds a module reference, blocking the module removal.
It is intentional from the devcoredump perspective to keep the
log available even after the unbind/unprobe. However it blocks
our module removal here.
v2: Accepting many suggestions from Lucas.
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
lib/igt_kmod.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
diff --git a/lib/igt_kmod.c b/lib/igt_kmod.c
index cc242838f..14d51f4f6 100644
--- a/lib/igt_kmod.c
+++ b/lib/igt_kmod.c
@@ -323,6 +323,59 @@ static int igt_kmod_unload_r(struct kmod_module *kmod, unsigned int flags)
return err;
}
+static void igt_drop_devcoredump(const char *driver)
+{
+ char sysfspath[PATH_MAX];
+ DIR *dir;
+ char *devcoredump;
+ FILE *data;
+ struct dirent *entry;
+ int len, ret;
+
+ len = snprintf(sysfspath, sizeof(sysfspath),
+ "/sys/bus/pci/drivers/%s", driver);
+
+ igt_assert(len < sizeof(sysfspath));
+
+ /* Not a PCI module */
+ if (access(sysfspath, F_OK))
+ return;
+
+ devcoredump = sysfspath + len;
+
+ dir = opendir(sysfspath);
+ igt_assert(dir);
+
+ while ((entry = readdir(dir)) != NULL) {
+ if (entry->d_type != DT_LNK ||
+ strcmp(entry->d_name, ".") == 0 ||
+ strcmp(entry->d_name, "..") == 0)
+ continue;
+
+ ret = snprintf(devcoredump, sizeof(sysfspath) - len,
+ "/%s/devcoredump", entry->d_name);
+
+ igt_assert(ret < sizeof(sysfspath) - len);
+
+ if (access(sysfspath, F_OK) != -1) {
+ igt_info("Removing devcoredump before module unload: %s\n",
+ sysfspath);
+
+ strcat(sysfspath, "/data");
+ data = fopen(sysfspath, "w");
+ igt_assert(data);
+
+ /*
+ * Write anything to devcoredump/data to
+ * force its deletion
+ */
+ fprintf(data, "1\n");
+ fclose(data);
+ }
+ }
+ closedir(dir);
+}
+
/**
* igt_kmod_unload:
* @mod_name: Module name.
@@ -341,6 +394,8 @@ igt_kmod_unload(const char *mod_name, unsigned int flags)
struct kmod_module *kmod;
int err;
+ igt_drop_devcoredump(mod_name);
+
err = kmod_module_new_from_name(ctx, mod_name, &kmod);
if (err < 0) {
igt_debug("Could not use module %s (%s)\n", mod_name,
--
2.44.0
next prev parent reply other threads:[~2024-04-03 15:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-03 15:14 [PATCH i-g-t 1/3] tests/intel/xe_pm: Fix runtime_pm tests Rodrigo Vivi
2024-04-03 15:14 ` Rodrigo Vivi [this message]
2024-04-05 17:36 ` [PATCH i-g-t 2/3] lib/igt_kmod: drop devcoredump before a PCI module unload Lucas De Marchi
2024-04-05 17:42 ` Souza, Jose
2024-04-03 15:14 ` [PATCH i-g-t 3/3] tests/intel/xe_wedged: Introduce a new test for Xe device wedged state Rodrigo Vivi
2024-04-03 17:21 ` ✗ CI.Patch_applied: failure for series starting with [i-g-t,1/3] tests/intel/xe_pm: Fix runtime_pm tests 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=20240403151411.113159-2-rodrigo.vivi@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=jose.souza@intel.com \
--cc=lucas.demarchi@intel.com \
--cc=maarten.lankhorst@linux.intel.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