From: Mauro Carvalho Chehab <mchehab@kernel.org>
To: Luis Chamberlain <mcgrof@kernel.org>
Cc: alsa-devel@alsa-project.org, mauro.chehab@linux.intel.com,
David Airlie <airlied@linux.ie>,
Greg KH <gregkh@linuxfoundation.org>,
intel-gfx@lists.freedesktop.org,
Lucas De Marchi <lucas.demarchi@intel.com>,
Takashi Iwai <tiwai@suse.com>,
dri-devel@lists.freedesktop.org, Jaroslav Kysela <perex@perex.cz>,
Kai Vehmanen <kai.vehmanen@intel.com>,
linux-modules@vger.kernel.org,
Dan Williams <dan.j.williams@intel.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-kernel@vger.kernel.org,
Pierre-Louis Bossart <pierre-louis.bossart@intel.com>
Subject: [Intel-gfx] [PATCH v3 1/2] module: update dependencies at try_module_get()
Date: Sat, 30 Apr 2022 14:41:47 +0100 [thread overview]
Message-ID: <a403bfabca4ce587ddd275f2a3c1dfc1d99bda86.1651326000.git.mchehab@kernel.org> (raw)
In-Reply-To: <cover.1651326000.git.mchehab@kernel.org>
Sometimes, device drivers are bound into each other via try_module_get(),
making such references invisible when looking at /proc/modules or lsmod.
Add a function to allow setting up module references for such
cases, and call it when try_module_get() is used.
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
See [PATCH v3 0/2] at: https://lore.kernel.org/all/cover.1651326000.git.mchehab@kernel.org/
include/linux/module.h | 4 +++-
kernel/module/main.c | 33 +++++++++++++++++++++++++++++++--
2 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/include/linux/module.h b/include/linux/module.h
index 46d4d5f2516e..836851baaad4 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -620,7 +620,9 @@ extern void __module_get(struct module *module);
/* This is the Right Way to get a module: if it fails, it's being removed,
* so pretend it's not there. */
-extern bool try_module_get(struct module *module);
+extern bool __try_module_get(struct module *module, struct module *this);
+
+#define try_module_get(mod) __try_module_get(mod, THIS_MODULE)
extern void module_put(struct module *module);
diff --git a/kernel/module/main.c b/kernel/module/main.c
index 05a42d8fcd7a..d63ebf52392b 100644
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -631,6 +631,33 @@ static int ref_module(struct module *a, struct module *b)
return 0;
}
+static int ref_module_dependency(struct module *mod, struct module *this)
+{
+ int ret;
+
+ if (!this || !this->name)
+ return -EINVAL;
+
+ if (mod == this)
+ return 0;
+
+ mutex_lock(&module_mutex);
+
+ ret = ref_module(this, mod);
+
+#ifdef CONFIG_MODULE_UNLOAD
+ if (ret)
+ goto ret;
+
+ ret = sysfs_create_link(mod->holders_dir,
+ &this->mkobj.kobj, this->name);
+#endif
+
+ret:
+ mutex_unlock(&module_mutex);
+ return ret;
+}
+
/* Clear the unload stuff of the module. */
static void module_unload_free(struct module *mod)
{
@@ -841,7 +868,7 @@ void __module_get(struct module *module)
}
EXPORT_SYMBOL(__module_get);
-bool try_module_get(struct module *module)
+bool __try_module_get(struct module *module, struct module *this)
{
bool ret = true;
@@ -856,9 +883,11 @@ bool try_module_get(struct module *module)
preempt_enable();
}
+ if (ret)
+ ref_module_dependency(module, this);
return ret;
}
-EXPORT_SYMBOL(try_module_get);
+EXPORT_SYMBOL(__try_module_get);
void module_put(struct module *module)
{
--
2.35.1
next prev parent reply other threads:[~2022-04-30 13:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-30 13:41 [Intel-gfx] [PATCH v3 0/2] Let userspace know when snd-hda-intel needs i915 Mauro Carvalho Chehab
2022-04-30 13:41 ` Mauro Carvalho Chehab [this message]
2022-04-30 15:01 ` [Intel-gfx] [PATCH v3 1/2] module: update dependencies at try_module_get() Greg KH
2022-04-30 13:41 ` [Intel-gfx] [PATCH v3 2/2] ALSA: hda - identify when audio is provided by a video driver Mauro Carvalho Chehab
2022-04-30 16:30 ` kernel test robot
2022-04-30 18:42 ` kernel test robot
2022-04-30 14:03 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Let userspace know when snd-hda-intel needs i915 (rev3) Patchwork
2022-04-30 14:35 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-04-30 16:32 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " 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=a403bfabca4ce587ddd275f2a3c1dfc1d99bda86.1651326000.git.mchehab@kernel.org \
--to=mchehab@kernel.org \
--cc=airlied@linux.ie \
--cc=alsa-devel@alsa-project.org \
--cc=dan.j.williams@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=kai.vehmanen@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=lucas.demarchi@intel.com \
--cc=mauro.chehab@linux.intel.com \
--cc=mcgrof@kernel.org \
--cc=perex@perex.cz \
--cc=pierre-louis.bossart@intel.com \
--cc=tiwai@suse.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