From: Luis Chamberlain <mcgrof@kernel.org>
To: linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org,
pmladek@suse.com, david@redhat.com, petr.pavlu@suse.com,
prarit@redhat.com
Cc: christophe.leroy@csgroup.eu, song@kernel.org, mcgrof@kernel.org,
torvalds@linux-foundation.org
Subject: [RFC 08/12] module: move finished_loading()
Date: Fri, 10 Mar 2023 21:17:08 -0800 [thread overview]
Message-ID: <20230311051712.4095040-9-mcgrof@kernel.org> (raw)
In-Reply-To: <20230311051712.4095040-1-mcgrof@kernel.org>
This has no functional change, just moves a routine earlier
as we'll make use of it next.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
kernel/module/main.c | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/kernel/module/main.c b/kernel/module/main.c
index e9c7eb827f0d..c3e5076c0436 100644
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -2370,27 +2370,6 @@ static int post_relocation(struct module *mod, const struct load_info *info)
return module_finalize(info->hdr, info->sechdrs, mod);
}
-/* Is this module of this name done loading? No locks held. */
-static bool finished_loading(const char *name)
-{
- struct module *mod;
- bool ret;
-
- /*
- * The module_mutex should not be a heavily contended lock;
- * if we get the occasional sleep here, we'll go an extra iteration
- * in the wait_event_interruptible(), which is harmless.
- */
- sched_annotate_sleep();
- mutex_lock(&module_mutex);
- mod = find_module_all(name, strlen(name), true);
- ret = !mod || mod->state == MODULE_STATE_LIVE
- || mod->state == MODULE_STATE_GOING;
- mutex_unlock(&module_mutex);
-
- return ret;
-}
-
/* Call module constructors. */
static void do_mod_ctors(struct module *mod)
{
@@ -2554,6 +2533,27 @@ static int may_init_module(void)
return 0;
}
+/* Is this module of this name done loading? No locks held. */
+static bool finished_loading(const char *name)
+{
+ struct module *mod;
+ bool ret;
+
+ /*
+ * The module_mutex should not be a heavily contended lock;
+ * if we get the occasional sleep here, we'll go an extra iteration
+ * in the wait_event_interruptible(), which is harmless.
+ */
+ sched_annotate_sleep();
+ mutex_lock(&module_mutex);
+ mod = find_module_all(name, strlen(name), true);
+ ret = !mod || mod->state == MODULE_STATE_LIVE
+ || mod->state == MODULE_STATE_GOING;
+ mutex_unlock(&module_mutex);
+
+ return ret;
+}
+
/*
* We try to place it in the list now to make sure it's unique before
* we dedicate too many resources. In particular, temporary percpu
--
2.39.1
next prev parent reply other threads:[~2023-03-11 5:17 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-11 5:17 [RFC 00/12] module: avoid userspace pressure on unwanted allocations Luis Chamberlain
2023-03-11 5:17 ` [RFC 01/12] module: use goto errors on check_modinfo() and layout_and_allocate() Luis Chamberlain
2023-03-11 5:17 ` [RFC 02/12] module: move get_modinfo() helpers all above Luis Chamberlain
2023-03-11 5:17 ` [RFC 03/12] module: rename next_string() to module_next_tag_pair() Luis Chamberlain
2023-03-11 5:17 ` [RFC 04/12] module: add a for_each_modinfo_entry() Luis Chamberlain
2023-03-11 5:17 ` [RFC 05/12] module: add debugging alias parsing support Luis Chamberlain
2023-03-11 5:17 ` [RFC 06/12] module: move early sanity checks into a helper Luis Chamberlain
2023-03-11 5:17 ` [RFC 07/12] module: move check_modinfo() early to early_mod_check() Luis Chamberlain
2023-03-11 5:17 ` Luis Chamberlain [this message]
2023-03-11 5:17 ` [RFC 09/12] module: extract patient module check into helper Luis Chamberlain
2023-03-11 5:17 ` [RFC 10/12] module: avoid allocation if module is already present and ready Luis Chamberlain
2023-03-11 5:17 ` [RFC 11/12] module: use list_add_tail_rcu() when adding module Luis Chamberlain
2023-03-11 5:17 ` [RFC 12/12] module: use aliases to find module on find_module_all() Luis Chamberlain
2023-03-15 14:43 ` Petr Pavlu
2023-03-15 16:12 ` Luis Chamberlain
2023-03-15 12:24 ` [RFC 00/12] module: avoid userspace pressure on unwanted allocations David Hildenbrand
2023-03-15 16:10 ` Luis Chamberlain
2023-03-15 16:41 ` David Hildenbrand
2023-03-16 23:55 ` Luis Chamberlain
2023-03-16 23:56 ` Luis Chamberlain
2023-03-18 0:11 ` Luis Chamberlain
2023-03-20 9:38 ` David Hildenbrand
2023-03-20 19:40 ` David Hildenbrand
2023-03-20 21:09 ` Luis Chamberlain
2023-03-20 21:15 ` David Hildenbrand
2023-03-20 21:23 ` Luis Chamberlain
2023-03-20 21:27 ` Luis Chamberlain
2023-03-21 19:32 ` David Hildenbrand
2023-03-24 9:27 ` David Hildenbrand
2023-03-24 17:54 ` Luis Chamberlain
2023-03-24 19:11 ` Linus Torvalds
2023-03-24 19:59 ` Luis Chamberlain
2023-03-24 20:28 ` Linus Torvalds
2023-03-24 21:14 ` Luis Chamberlain
2023-03-24 23:27 ` Luis Chamberlain
2023-03-24 23:41 ` Linus Torvalds
2023-03-28 3:44 ` David Hildenbrand
2023-03-28 6:16 ` Luis Chamberlain
2023-03-28 21:02 ` David Hildenbrand
2023-03-29 5:31 ` Luis Chamberlain
2023-03-30 4:42 ` David Hildenbrand
2023-03-21 15:11 ` David Hildenbrand
2023-03-21 16:52 ` Luis Chamberlain
2023-03-21 17:01 ` David Hildenbrand
2023-03-20 9:37 ` David Hildenbrand
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=20230311051712.4095040-9-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=christophe.leroy@csgroup.eu \
--cc=david@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=petr.pavlu@suse.com \
--cc=pmladek@suse.com \
--cc=prarit@redhat.com \
--cc=song@kernel.org \
--cc=torvalds@linux-foundation.org \
/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