All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Frederic Barrat <fbarrat@linux.ibm.com>,
	Andrew Donnellan <ajd@linux.ibm.com>,
	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Maxime Ripard <mripard@kernel.org>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
	Jessica Yu <jeyu@kernel.org>,
	Josh Poimboeuf <jpoimboe@redhat.com>,
	Jiri Kosina <jikos@kernel.org>, Miroslav Benes <mbenes@suse.cz>,
	Petr Mladek <pmladek@suse.com>,
	Joe Lawrence <joe.lawrence@redhat.com>
Cc: Masahiro Yamada <masahiroy@kernel.org>,
	Michal Marek <michal.lkml@markovi.net>,
	linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
	dri-devel@lists.freedesktop.org, live-patching@vger.kernel.org,
	linux-kbuild@vger.kernel.org
Subject: [PATCH 04/13] module: use RCU to synchronize find_module
Date: Tue,  2 Feb 2021 13:13:25 +0100	[thread overview]
Message-ID: <20210202121334.1361503-5-hch@lst.de> (raw)
In-Reply-To: <20210202121334.1361503-1-hch@lst.de>

Allow for a RCU-sched critical section around find_module, following
the lower level find_module_all helper, and switch the two callers
outside of module.c to use such a RCU-sched critical section instead
of module_mutex.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Acked-by: Miroslav Benes <mbenes@suse.cz>
---
 include/linux/module.h      | 2 +-
 kernel/livepatch/core.c     | 5 +++--
 kernel/module.c             | 1 -
 kernel/trace/trace_kprobe.c | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/linux/module.h b/include/linux/module.h
index 7a0bcb5b1ffccd..a64aa84d1b182c 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -586,7 +586,7 @@ static inline bool within_module(unsigned long addr, const struct module *mod)
 	return within_module_init(addr, mod) || within_module_core(addr, mod);
 }
 
-/* Search for module by name: must hold module_mutex. */
+/* Search for module by name: must be in a RCU-sched critical section. */
 struct module *find_module(const char *name);
 
 struct symsearch {
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index f76fdb9255323d..262cd9b003b9f0 100644
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -19,6 +19,7 @@
 #include <linux/moduleloader.h>
 #include <linux/completion.h>
 #include <linux/memory.h>
+#include <linux/rcupdate.h>
 #include <asm/cacheflush.h>
 #include "core.h"
 #include "patch.h"
@@ -57,7 +58,7 @@ static void klp_find_object_module(struct klp_object *obj)
 	if (!klp_is_module(obj))
 		return;
 
-	mutex_lock(&module_mutex);
+	rcu_read_lock_sched();
 	/*
 	 * We do not want to block removal of patched modules and therefore
 	 * we do not take a reference here. The patches are removed by
@@ -74,7 +75,7 @@ static void klp_find_object_module(struct klp_object *obj)
 	if (mod && mod->klp_alive)
 		obj->mod = mod;
 
-	mutex_unlock(&module_mutex);
+	rcu_read_unlock_sched();
 }
 
 static bool klp_initialized(void)
diff --git a/kernel/module.c b/kernel/module.c
index 981302f616b411..6772fb2680eb3e 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -668,7 +668,6 @@ static struct module *find_module_all(const char *name, size_t len,
 
 struct module *find_module(const char *name)
 {
-	module_assert_mutex();
 	return find_module_all(name, strlen(name), false);
 }
 
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index e6fba1798771b4..3137992baa5e7a 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -124,9 +124,9 @@ static nokprobe_inline bool trace_kprobe_module_exist(struct trace_kprobe *tk)
 	if (!p)
 		return true;
 	*p = '\0';
-	mutex_lock(&module_mutex);
+	rcu_read_lock_sched();
 	ret = !!find_module(tk->symbol);
-	mutex_unlock(&module_mutex);
+	rcu_read_unlock_sched();
 	*p = ':';
 
 	return ret;
-- 
2.29.2


WARNING: multiple messages have this Message-ID
From: Christoph Hellwig <hch@lst.de>
To: Frederic Barrat <fbarrat@linux.ibm.com>,
	Andrew Donnellan <ajd@linux.ibm.com>,
	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Maxime Ripard <mripard@kernel.org>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
	Jessica Yu <jeyu@kernel.org>,
	Josh Poimboeuf <jpoimboe@redhat.com>,
	Jiri Kosina <jikos@kernel.org>, Miroslav Benes <mbenes@suse.cz>,
	Petr Mladek <pmladek@suse.com>,
	Joe Lawrence <joe.lawrence@redhat.com>
Cc: Michal Marek <michal.lkml@markovi.net>,
	linux-kbuild@vger.kernel.org,
	Masahiro Yamada <masahiroy@kernel.org>,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	live-patching@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 04/13] module: use RCU to synchronize find_module
Date: Tue,  2 Feb 2021 13:13:25 +0100	[thread overview]
Message-ID: <20210202121334.1361503-5-hch@lst.de> (raw)
In-Reply-To: <20210202121334.1361503-1-hch@lst.de>

Allow for a RCU-sched critical section around find_module, following
the lower level find_module_all helper, and switch the two callers
outside of module.c to use such a RCU-sched critical section instead
of module_mutex.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Acked-by: Miroslav Benes <mbenes@suse.cz>
---
 include/linux/module.h      | 2 +-
 kernel/livepatch/core.c     | 5 +++--
 kernel/module.c             | 1 -
 kernel/trace/trace_kprobe.c | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/linux/module.h b/include/linux/module.h
index 7a0bcb5b1ffccd..a64aa84d1b182c 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -586,7 +586,7 @@ static inline bool within_module(unsigned long addr, const struct module *mod)
 	return within_module_init(addr, mod) || within_module_core(addr, mod);
 }
 
-/* Search for module by name: must hold module_mutex. */
+/* Search for module by name: must be in a RCU-sched critical section. */
 struct module *find_module(const char *name);
 
 struct symsearch {
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index f76fdb9255323d..262cd9b003b9f0 100644
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -19,6 +19,7 @@
 #include <linux/moduleloader.h>
 #include <linux/completion.h>
 #include <linux/memory.h>
+#include <linux/rcupdate.h>
 #include <asm/cacheflush.h>
 #include "core.h"
 #include "patch.h"
@@ -57,7 +58,7 @@ static void klp_find_object_module(struct klp_object *obj)
 	if (!klp_is_module(obj))
 		return;
 
-	mutex_lock(&module_mutex);
+	rcu_read_lock_sched();
 	/*
 	 * We do not want to block removal of patched modules and therefore
 	 * we do not take a reference here. The patches are removed by
@@ -74,7 +75,7 @@ static void klp_find_object_module(struct klp_object *obj)
 	if (mod && mod->klp_alive)
 		obj->mod = mod;
 
-	mutex_unlock(&module_mutex);
+	rcu_read_unlock_sched();
 }
 
 static bool klp_initialized(void)
diff --git a/kernel/module.c b/kernel/module.c
index 981302f616b411..6772fb2680eb3e 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -668,7 +668,6 @@ static struct module *find_module_all(const char *name, size_t len,
 
 struct module *find_module(const char *name)
 {
-	module_assert_mutex();
 	return find_module_all(name, strlen(name), false);
 }
 
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index e6fba1798771b4..3137992baa5e7a 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -124,9 +124,9 @@ static nokprobe_inline bool trace_kprobe_module_exist(struct trace_kprobe *tk)
 	if (!p)
 		return true;
 	*p = '\0';
-	mutex_lock(&module_mutex);
+	rcu_read_lock_sched();
 	ret = !!find_module(tk->symbol);
-	mutex_unlock(&module_mutex);
+	rcu_read_unlock_sched();
 	*p = ':';
 
 	return ret;
-- 
2.29.2


  parent reply	other threads:[~2021-02-02 12:15 UTC|newest]

Thread overview: 96+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-02 12:13 module loader dead code removal and cleanups v3 Christoph Hellwig
2021-02-02 12:13 ` Christoph Hellwig
2021-02-02 12:13 ` [PATCH 01/13] powerpc/powernv: remove get_cxl_module Christoph Hellwig
2021-02-02 12:13   ` Christoph Hellwig
2021-02-04 10:44   ` Michael Ellerman
2021-02-04 10:44     ` Michael Ellerman
2021-02-04 10:44     ` Michael Ellerman
2021-02-02 12:13 ` [PATCH 02/13] drm: remove drm_fb_helper_modinit Christoph Hellwig
2021-02-02 12:13   ` Christoph Hellwig
2021-02-02 12:13 ` [PATCH 03/13] module: unexport find_module and module_mutex Christoph Hellwig
2021-02-02 12:13   ` Christoph Hellwig
2021-02-02 12:13 ` Christoph Hellwig [this message]
2021-02-02 12:13   ` [PATCH 04/13] module: use RCU to synchronize find_module Christoph Hellwig
2021-02-02 12:13 ` [PATCH 05/13] kallsyms: refactor {,module_}kallsyms_on_each_symbol Christoph Hellwig
2021-02-02 12:13   ` Christoph Hellwig
2021-02-03  8:58   ` Petr Mladek
2021-02-03  8:58     ` Petr Mladek
2021-02-03  8:58     ` Petr Mladek
2021-02-02 12:13 ` [PATCH 06/13] kallsyms: only build {,module_}kallsyms_on_each_symbol when required Christoph Hellwig
2021-02-02 12:13   ` [PATCH 06/13] kallsyms: only build {, module_}kallsyms_on_each_symbol " Christoph Hellwig
2021-02-02 14:03   ` [PATCH 06/13] kallsyms: only build {,module_}kallsyms_on_each_symbol " Miroslav Benes
2021-02-02 14:03     ` [PATCH 06/13] kallsyms: only build {, module_}kallsyms_on_each_symbol " Miroslav Benes
2021-02-02 14:03     ` Miroslav Benes
2021-02-02 12:13 ` [PATCH 07/13] module: mark module_mutex static Christoph Hellwig
2021-02-02 12:13   ` Christoph Hellwig
2021-02-02 14:04   ` Miroslav Benes
2021-02-02 14:04     ` Miroslav Benes
2021-02-02 14:04     ` Miroslav Benes
2021-02-02 12:13 ` [PATCH 08/13] module: remove each_symbol_in_section Christoph Hellwig
2021-02-02 12:13   ` Christoph Hellwig
2021-02-02 14:04   ` Miroslav Benes
2021-02-02 14:04     ` Miroslav Benes
2021-02-02 14:04     ` Miroslav Benes
2021-02-02 12:13 ` [PATCH 09/13] module: merge each_symbol_section into find_symbol Christoph Hellwig
2021-02-02 12:13   ` Christoph Hellwig
2021-02-02 14:04   ` Miroslav Benes
2021-02-02 14:04     ` Miroslav Benes
2021-02-02 14:04     ` Miroslav Benes
2021-02-02 12:13 ` [PATCH 10/13] module: pass struct find_symbol_args to find_symbol Christoph Hellwig
2021-02-02 12:13   ` Christoph Hellwig
2021-02-02 14:07   ` Miroslav Benes
2021-02-02 14:07     ` Miroslav Benes
2021-02-02 14:07     ` Miroslav Benes
2021-02-02 15:41     ` Christoph Hellwig
2021-02-02 15:41       ` Christoph Hellwig
2021-02-03  9:04     ` Christoph Hellwig
2021-02-03  9:04       ` Christoph Hellwig
2021-02-03  9:31       ` Miroslav Benes
2021-02-03  9:31         ` Miroslav Benes
2021-02-03  9:31         ` Miroslav Benes
2021-02-02 12:13 ` [PATCH 11/13] module: move struct symsearch to module.c Christoph Hellwig
2021-02-02 12:13   ` Christoph Hellwig
2021-02-02 14:10   ` Miroslav Benes
2021-02-02 14:10     ` Miroslav Benes
2021-02-02 14:10     ` Miroslav Benes
2021-02-02 12:13 ` [PATCH 12/13] module: remove EXPORT_SYMBOL_GPL_FUTURE Christoph Hellwig
2021-02-02 12:13   ` Christoph Hellwig
2021-02-02 14:12   ` Miroslav Benes
2021-02-02 14:12     ` Miroslav Benes
2021-02-02 14:12     ` Miroslav Benes
2021-02-02 12:13 ` [PATCH 13/13] module: remove EXPORT_UNUSED_SYMBOL* Christoph Hellwig
2021-02-02 12:13   ` Christoph Hellwig
2021-02-02 14:21   ` Miroslav Benes
2021-02-02 14:21     ` Miroslav Benes
2021-02-02 14:21     ` Miroslav Benes
2021-02-02 14:37 ` module loader dead code removal and cleanups v3 Jessica Yu
2021-02-02 14:37   ` Jessica Yu
2021-02-02 14:37   ` Jessica Yu
2021-02-02 15:23   ` Christoph Hellwig
2021-02-02 15:23     ` Christoph Hellwig
2021-02-02 17:38   ` Emil Velikov
2021-02-02 17:38     ` Emil Velikov
2021-02-02 17:38     ` Emil Velikov
2021-02-08 11:36 ` Jessica Yu
2021-02-08 11:36   ` Jessica Yu
2021-02-08 11:36   ` Jessica Yu
  -- strict thread matches above, loose matches on Subject: below --
2021-01-28 18:14 module loader dead code removal and cleanups v2 Christoph Hellwig
2021-01-28 18:14 ` [PATCH 04/13] module: use RCU to synchronize find_module Christoph Hellwig
2021-01-28 18:14   ` Christoph Hellwig
2021-01-28 20:50   ` Thiago Jung Bauermann
2021-01-28 20:50     ` Thiago Jung Bauermann
2021-01-28 20:50     ` Thiago Jung Bauermann
2021-01-29  5:10     ` Christoph Hellwig
2021-01-29  5:10       ` Christoph Hellwig
2021-01-29 21:29       ` Thiago Jung Bauermann
2021-01-29 21:29         ` Thiago Jung Bauermann
2021-01-29 10:04   ` Petr Mladek
2021-01-29 10:04     ` Petr Mladek
2021-01-29 15:29   ` Miroslav Benes
2021-02-01 11:46     ` Christoph Hellwig
2021-02-01 11:46       ` Christoph Hellwig
2021-02-01 12:10     ` Jessica Yu
2021-02-01 12:10       ` Jessica Yu
2021-02-01 12:10       ` Jessica Yu
2021-02-01 13:16       ` Miroslav Benes
2021-02-01 13:16         ` Miroslav Benes
2021-02-01 13:16         ` Miroslav Benes

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=20210202121334.1361503-5-hch@lst.de \
    --to=hch@lst.de \
    --cc=airlied@linux.ie \
    --cc=ajd@linux.ibm.com \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=fbarrat@linux.ibm.com \
    --cc=jeyu@kernel.org \
    --cc=jikos@kernel.org \
    --cc=joe.lawrence@redhat.com \
    --cc=jpoimboe@redhat.com \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=live-patching@vger.kernel.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=masahiroy@kernel.org \
    --cc=mbenes@suse.cz \
    --cc=michal.lkml@markovi.net \
    --cc=mripard@kernel.org \
    --cc=pmladek@suse.com \
    --cc=tzimmermann@suse.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.