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 07/13] module: mark module_mutex static
Date: Tue,  2 Feb 2021 13:13:28 +0100	[thread overview]
Message-ID: <20210202121334.1361503-8-hch@lst.de> (raw)
In-Reply-To: <20210202121334.1361503-1-hch@lst.de>

Except for two lockdep asserts module_mutex is only used in module.c.
Remove the two asserts given that the functions they are in are not
exported and just called from the module code, and mark module_mutex
static.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 include/linux/module.h | 2 --
 kernel/module.c        | 2 +-
 lib/bug.c              | 3 ---
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/include/linux/module.h b/include/linux/module.h
index 3ea4ffae608f97..0f360c48fe92a6 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -550,8 +550,6 @@ static inline unsigned long kallsyms_symbol_value(const Elf_Sym *sym)
 }
 #endif
 
-extern struct mutex module_mutex;
-
 /* FIXME: It'd be nice to isolate modules during init, too, so they
    aren't used before they (may) fail.  But presently too much code
    (IDE & SCSI) require entry into the module during init.*/
diff --git a/kernel/module.c b/kernel/module.c
index 470fd9d9d68f97..1635656d47654a 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -87,7 +87,7 @@
  * 3) module_addr_min/module_addr_max.
  * (delete and add uses RCU list operations).
  */
-DEFINE_MUTEX(module_mutex);
+static DEFINE_MUTEX(module_mutex);
 static LIST_HEAD(modules);
 
 /* Work queue for freeing init sections in success case */
diff --git a/lib/bug.c b/lib/bug.c
index 7103440c0ee1af..8f9d537bfb2a59 100644
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -91,8 +91,6 @@ void module_bug_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
 	char *secstrings;
 	unsigned int i;
 
-	lockdep_assert_held(&module_mutex);
-
 	mod->bug_table = NULL;
 	mod->num_bugs = 0;
 
@@ -118,7 +116,6 @@ void module_bug_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
 
 void module_bug_cleanup(struct module *mod)
 {
-	lockdep_assert_held(&module_mutex);
 	list_del_rcu(&mod->bug_list);
 }
 
-- 
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 07/13] module: mark module_mutex static
Date: Tue,  2 Feb 2021 13:13:28 +0100	[thread overview]
Message-ID: <20210202121334.1361503-8-hch@lst.de> (raw)
In-Reply-To: <20210202121334.1361503-1-hch@lst.de>

Except for two lockdep asserts module_mutex is only used in module.c.
Remove the two asserts given that the functions they are in are not
exported and just called from the module code, and mark module_mutex
static.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 include/linux/module.h | 2 --
 kernel/module.c        | 2 +-
 lib/bug.c              | 3 ---
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/include/linux/module.h b/include/linux/module.h
index 3ea4ffae608f97..0f360c48fe92a6 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -550,8 +550,6 @@ static inline unsigned long kallsyms_symbol_value(const Elf_Sym *sym)
 }
 #endif
 
-extern struct mutex module_mutex;
-
 /* FIXME: It'd be nice to isolate modules during init, too, so they
    aren't used before they (may) fail.  But presently too much code
    (IDE & SCSI) require entry into the module during init.*/
diff --git a/kernel/module.c b/kernel/module.c
index 470fd9d9d68f97..1635656d47654a 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -87,7 +87,7 @@
  * 3) module_addr_min/module_addr_max.
  * (delete and add uses RCU list operations).
  */
-DEFINE_MUTEX(module_mutex);
+static DEFINE_MUTEX(module_mutex);
 static LIST_HEAD(modules);
 
 /* Work queue for freeing init sections in success case */
diff --git a/lib/bug.c b/lib/bug.c
index 7103440c0ee1af..8f9d537bfb2a59 100644
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -91,8 +91,6 @@ void module_bug_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
 	char *secstrings;
 	unsigned int i;
 
-	lockdep_assert_held(&module_mutex);
-
 	mod->bug_table = NULL;
 	mod->num_bugs = 0;
 
@@ -118,7 +116,6 @@ void module_bug_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
 
 void module_bug_cleanup(struct module *mod)
 {
-	lockdep_assert_held(&module_mutex);
 	list_del_rcu(&mod->bug_list);
 }
 
-- 
2.29.2


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

Thread overview: 80+ 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 ` [PATCH 04/13] module: use RCU to synchronize find_module Christoph Hellwig
2021-02-02 12:13   ` 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 ` Christoph Hellwig [this message]
2021-02-02 12:13   ` [PATCH 07/13] module: mark module_mutex static 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 07/13] module: mark module_mutex static Christoph Hellwig
2021-01-28 18:14   ` Christoph Hellwig
2021-01-21  7:49 module loader dead code removal and cleanusp Christoph Hellwig
2021-01-21  7:49 ` [PATCH 07/13] module: mark module_mutex static Christoph Hellwig
2021-01-21  7:49   ` Christoph Hellwig

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-8-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.