From: Jordan Niethe <jniethe5@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: ajd@linux.ibm.com, cmr@codefail.de, npiggin@gmail.com,
Jordan Niethe <jniethe5@gmail.com>,
naveen.n.rao@linux.ibm.com, dja@axtens.net
Subject: [PATCH v10 03/10] powerpc: Always define MODULES_{VADDR,END}
Date: Tue, 30 Mar 2021 15:51:25 +1100 [thread overview]
Message-ID: <20210330045132.722243-4-jniethe5@gmail.com> (raw)
In-Reply-To: <20210330045132.722243-1-jniethe5@gmail.com>
If MODULES_{VADDR,END} are not defined set them to VMALLOC_START and
VMALLOC_END respectively. This reduces the need for special cases. For
example, powerpc's module_alloc() was previously predicated on
MODULES_VADDR being defined but now is unconditionally defined.
This will be useful reducing conditional code in other places that need
to allocate from the module region (i.e., kprobes).
Signed-off-by: Jordan Niethe <jniethe5@gmail.com>
---
v10: New to series
---
arch/powerpc/include/asm/pgtable.h | 5 +++++
arch/powerpc/kernel/module.c | 5 +----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
index 4eed82172e33..014c2921f26a 100644
--- a/arch/powerpc/include/asm/pgtable.h
+++ b/arch/powerpc/include/asm/pgtable.h
@@ -167,6 +167,11 @@ struct seq_file;
void arch_report_meminfo(struct seq_file *m);
#endif /* CONFIG_PPC64 */
+#ifndef MODULES_VADDR
+#define MODULES_VADDR VMALLOC_START
+#define MODULES_END VMALLOC_END
+#endif
+
#endif /* __ASSEMBLY__ */
#endif /* _ASM_POWERPC_PGTABLE_H */
diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c
index a211b0253cdb..f1fb58389d58 100644
--- a/arch/powerpc/kernel/module.c
+++ b/arch/powerpc/kernel/module.c
@@ -14,6 +14,7 @@
#include <asm/firmware.h>
#include <linux/sort.h>
#include <asm/setup.h>
+#include <linux/mm.h>
static LIST_HEAD(module_bug_list);
@@ -87,13 +88,9 @@ int module_finalize(const Elf_Ehdr *hdr,
return 0;
}
-#ifdef MODULES_VADDR
void *module_alloc(unsigned long size)
{
- BUILD_BUG_ON(TASK_SIZE > MODULES_VADDR);
-
return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, GFP_KERNEL,
PAGE_KERNEL_EXEC, VM_FLUSH_RESET_PERMS, NUMA_NO_NODE,
__builtin_return_address(0));
}
-#endif
--
2.25.1
next prev parent reply other threads:[~2021-03-30 4:53 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-30 4:51 [PATCH v10 00/10] powerpc: Further Strict RWX support Jordan Niethe
2021-03-30 4:51 ` [PATCH v10 01/10] powerpc/mm: Implement set_memory() routines Jordan Niethe
2021-03-30 5:16 ` Christophe Leroy
2021-04-21 2:51 ` Jordan Niethe
2021-03-31 11:16 ` Michael Ellerman
2021-03-31 12:03 ` Christophe Leroy
2021-04-21 5:03 ` Jordan Niethe
2021-04-01 4:37 ` Aneesh Kumar K.V
2021-04-21 5:19 ` Jordan Niethe
2021-03-30 4:51 ` [PATCH v10 02/10] powerpc/lib/code-patching: Set up Strict RWX patching earlier Jordan Niethe
2021-03-30 4:51 ` Jordan Niethe [this message]
2021-03-30 5:00 ` [PATCH v10 03/10] powerpc: Always define MODULES_{VADDR,END} Christophe Leroy
2021-04-01 13:36 ` Christophe Leroy
2021-04-21 2:46 ` Jordan Niethe
2021-04-21 5:14 ` Christophe Leroy
2021-04-21 5:22 ` Jordan Niethe
2021-03-30 4:51 ` [PATCH v10 04/10] powerpc/kprobes: Mark newly allocated probes as ROX Jordan Niethe
2021-03-30 5:05 ` Christophe Leroy
2021-04-21 2:39 ` Jordan Niethe
2021-03-30 4:51 ` [PATCH v10 05/10] powerpc/bpf: Write protect JIT code Jordan Niethe
2021-03-31 10:37 ` Michael Ellerman
2021-03-31 10:39 ` Christophe Leroy
2021-04-21 2:35 ` Jordan Niethe
2021-04-21 6:51 ` Michael Ellerman
2021-03-30 4:51 ` [PATCH v10 06/10] powerpc/mm/ptdump: debugfs handler for W+X checks at runtime Jordan Niethe
2021-03-31 11:24 ` Michael Ellerman
2021-04-21 2:23 ` Jordan Niethe
2021-04-21 5:16 ` Christophe Leroy
2021-03-30 4:51 ` [PATCH v10 07/10] powerpc: Set ARCH_HAS_STRICT_MODULE_RWX Jordan Niethe
2021-03-30 4:51 ` [PATCH v10 08/10] powerpc/configs: Enable STRICT_MODULE_RWX in skiroot_defconfig Jordan Niethe
2021-03-30 5:27 ` Christophe Leroy
2021-04-21 2:37 ` Jordan Niethe
2021-03-30 4:51 ` [PATCH v10 09/10] powerpc/mm: implement set_memory_attr() Jordan Niethe
2021-03-30 4:51 ` [PATCH v10 10/10] powerpc/32: use set_memory_attr() Jordan Niethe
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=20210330045132.722243-4-jniethe5@gmail.com \
--to=jniethe5@gmail.com \
--cc=ajd@linux.ibm.com \
--cc=cmr@codefail.de \
--cc=dja@axtens.net \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=naveen.n.rao@linux.ibm.com \
--cc=npiggin@gmail.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;
as well as URLs for NNTP newsgroup(s).