Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Lucas De Marchi <lucas.demarchi@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>,
	Lucas De Marchi <lucas.demarchi@intel.com>
Subject: [PATCH i-g-t v3 6/6] lib/igt_kmod: Do not leak kmod ctx
Date: Wed,  6 Nov 2024 21:52:54 -0800	[thread overview]
Message-ID: <20241107055254.3129207-7-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20241107055254.3129207-1-lucas.demarchi@intel.com>

kmod_ctx() is used as a cheap way to cache the kmod ctx. Make sure it's
released when the process exit by using igt_install_exit_handler(),
which also guarantees children forked with igt_fork* don't free it on
exit. Normal forks are still susceptible to breakage, but if it that
happens, let it break so we can fix.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 lib/igt_kmod.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/igt_kmod.c b/lib/igt_kmod.c
index 7be95a61c..89736ae59 100644
--- a/lib/igt_kmod.c
+++ b/lib/igt_kmod.c
@@ -71,14 +71,20 @@ static void squelch(void *data, int priority,
 {
 }
 
+static struct kmod_ctx *ctx__;
+
+static void free_kmod_ctx(int sig)
+{
+	kmod_unref(ctx__);
+}
+
 static struct kmod_ctx *kmod_ctx(void)
 {
-	static struct kmod_ctx *ctx;
 	const char **config_paths = NULL;
 	char *config_paths_str;
 	char *dirname;
 
-	if (ctx)
+	if (ctx__)
 		goto out;
 
 	dirname = getenv("IGT_KMOD_DIRNAME");
@@ -112,14 +118,16 @@ static struct kmod_ctx *kmod_ctx(void)
 		config_paths[i] = NULL;
 	}
 
-	ctx = kmod_new(dirname, config_paths);
-	igt_assert(ctx != NULL);
+	ctx__ = kmod_new(dirname, config_paths);
+	igt_assert(ctx__ != NULL);
 
 	free(config_paths);
+	igt_install_exit_handler(free_kmod_ctx);
+
+	kmod_set_log_fn(ctx__, squelch, NULL);
 
-	kmod_set_log_fn(ctx, squelch, NULL);
 out:
-	return ctx;
+	return ctx__;
 }
 
 /**
-- 
2.47.0


  parent reply	other threads:[~2024-11-07  5:53 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-07  5:52 [PATCH i-g-t v3 0/6] lib/igt_kmod: Drop legacy kunit integration Lucas De Marchi
2024-11-07  5:52 ` [PATCH i-g-t v3 1/6] lib/igt_kmod: Drop legacy kunit fallback Lucas De Marchi
2024-11-07  5:52 ` [PATCH i-g-t v3 2/6] lib/igt_kmod: Fix leaking subtest name Lucas De Marchi
2024-11-07  5:52 ` [PATCH i-g-t v3 3/6] lib/igt_kmod: Stop passing debugfs_dir around Lucas De Marchi
2024-11-14 14:24   ` Janusz Krzysztofik
2024-11-14 20:58     ` Lucas De Marchi
2024-11-14 21:45       ` Lucas De Marchi
2024-11-15 14:24         ` Janusz Krzysztofik
2024-11-07  5:52 ` [PATCH i-g-t v3 4/6] lib/igt_kmod: Stop passing ktap around Lucas De Marchi
2024-11-14 15:00   ` Janusz Krzysztofik
2024-11-07  5:52 ` [PATCH i-g-t v3 5/6] lib/igt_ktap: Just free ktap Lucas De Marchi
2024-11-14 15:02   ` Janusz Krzysztofik
2024-11-07  5:52 ` Lucas De Marchi [this message]
2024-11-14 17:06   ` [PATCH i-g-t v3 6/6] lib/igt_kmod: Do not leak kmod ctx Janusz Krzysztofik
2024-11-07  6:22 ` ✓ CI.xeBAT: success for lib/igt_kmod: Drop legacy kunit integration (rev3) Patchwork
2024-11-07  6:27 ` ✓ Fi.CI.BAT: " Patchwork
2024-11-07  7:29 ` ✗ Fi.CI.IGT: failure " Patchwork
2024-11-08 11:25 ` ✗ CI.xeFULL: " Patchwork
2024-11-14 22:00 ` ✗ Fi.CI.BUILD: failure for lib/igt_kmod: Drop legacy kunit integration (rev4) 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=20241107055254.3129207-7-lucas.demarchi@intel.com \
    --to=lucas.demarchi@intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=janusz.krzysztofik@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