From: Josh Poimboeuf <jpoimboe@redhat.com>
To: live-patching@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Peter Zijlstra <peterz@infradead.org>,
Jessica Yu <jeyu@kernel.org>
Subject: [PATCH 7/7] module: Remove module_disable_ro()
Date: Tue, 14 Apr 2020 11:28:43 -0500 [thread overview]
Message-ID: <3115fb64e95420dea2d43da55c4474feb03c4185.1586881704.git.jpoimboe@redhat.com> (raw)
In-Reply-To: <cover.1586881704.git.jpoimboe@redhat.com>
module_disable_ro() has no more users. Remove it.
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
---
include/linux/module.h | 2 --
kernel/module.c | 13 -------------
2 files changed, 15 deletions(-)
diff --git a/include/linux/module.h b/include/linux/module.h
index 1ad393e62bef..e4ef7b36feda 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -860,10 +860,8 @@ extern int module_sysfs_initialized;
#ifdef CONFIG_STRICT_MODULE_RWX
extern void module_enable_ro(const struct module *mod, bool after_init);
-extern void module_disable_ro(const struct module *mod);
#else
static inline void module_enable_ro(const struct module *mod, bool after_init) { }
-static inline void module_disable_ro(const struct module *mod) { }
#endif
#ifdef CONFIG_GENERIC_BUG
diff --git a/kernel/module.c b/kernel/module.c
index d36ea8a8c3ec..b1d30ad67e82 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1997,19 +1997,6 @@ static void frob_writable_data(const struct module_layout *layout,
(layout->size - layout->ro_after_init_size) >> PAGE_SHIFT);
}
-/* livepatching wants to disable read-only so it can frob module. */
-void module_disable_ro(const struct module *mod)
-{
- if (!rodata_enabled)
- return;
-
- frob_text(&mod->core_layout, set_memory_rw);
- frob_rodata(&mod->core_layout, set_memory_rw);
- frob_ro_after_init(&mod->core_layout, set_memory_rw);
- frob_text(&mod->init_layout, set_memory_rw);
- frob_rodata(&mod->init_layout, set_memory_rw);
-}
-
void module_enable_ro(const struct module *mod, bool after_init)
{
if (!rodata_enabled)
--
2.21.1
next prev parent reply other threads:[~2020-04-14 16:32 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-14 16:28 [PATCH 0/7] livepatch,module: Remove .klp.arch and module_disable_ro() Josh Poimboeuf
2020-04-14 16:28 ` [PATCH 1/7] livepatch: Apply vmlinux-specific KLP relocations early Josh Poimboeuf
2020-04-14 17:44 ` Peter Zijlstra
2020-04-14 18:01 ` Josh Poimboeuf
2020-04-14 19:31 ` Josh Poimboeuf
2020-04-15 14:30 ` Miroslav Benes
2020-04-15 16:29 ` Josh Poimboeuf
2020-04-15 14:34 ` Miroslav Benes
2020-04-15 16:30 ` Josh Poimboeuf
2020-04-14 16:28 ` [PATCH 2/7] livepatch: Remove .klp.arch Josh Poimboeuf
2020-04-15 15:18 ` Jessica Yu
2020-04-14 16:28 ` [PATCH 3/7] livepatch: Prevent module-specific KLP rela sections from referencing vmlinux symbols Josh Poimboeuf
2020-04-14 16:28 ` [PATCH 4/7] s390/module: Use s390_kernel_write() for relocations Josh Poimboeuf
2020-04-16 8:56 ` Miroslav Benes
2020-04-16 12:06 ` Josh Poimboeuf
2020-04-16 13:16 ` Josh Poimboeuf
2020-04-17 1:37 ` Josh Poimboeuf
2020-04-14 16:28 ` [PATCH 5/7] x86/module: Use text_poke() " Josh Poimboeuf
2020-04-14 16:28 ` [PATCH 6/7] livepatch: Remove module_disable_ro() usage Josh Poimboeuf
2020-04-15 15:02 ` Jessica Yu
2020-04-15 16:33 ` Josh Poimboeuf
2020-04-16 9:28 ` Miroslav Benes
2020-04-16 12:10 ` Josh Poimboeuf
2020-04-14 16:28 ` Josh Poimboeuf [this message]
2020-04-14 18:27 ` [PATCH 0/7] livepatch,module: Remove .klp.arch and module_disable_ro() Peter Zijlstra
2020-04-14 19:08 ` Josh Poimboeuf
2020-04-15 14:24 ` Peter Zijlstra
2020-04-15 16:17 ` Josh Poimboeuf
2020-04-16 15:31 ` Jessica Yu
2020-04-16 15:45 ` Josh Poimboeuf
2020-04-17 8:27 ` Miroslav Benes
2020-04-17 8:50 ` Jessica Yu
2020-04-16 9:45 ` Miroslav Benes
2020-04-16 12:20 ` Josh Poimboeuf
2020-04-17 9:08 ` Miroslav Benes
2020-04-15 0:57 ` Joe Lawrence
2020-04-15 1:31 ` Josh Poimboeuf
2020-04-15 1:37 ` Joe Lawrence
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=3115fb64e95420dea2d43da55c4474feb03c4185.1586881704.git.jpoimboe@redhat.com \
--to=jpoimboe@redhat.com \
--cc=jeyu@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=live-patching@vger.kernel.org \
--cc=peterz@infradead.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;
as well as URLs for NNTP newsgroup(s).