From: "Mike Rapoport (IBM)" <rppt@xxxxxxxxxx>
Data related to code allocations, such as module data section, need to
comply with architecture constraints for its placement and its
allocation right now was done using execmem_text_alloc().
Create a dedicated API for allocating data related to code allocations
and allow architectures to define address ranges for data allocations.
Since currently this is only relevant for powerpc variants that use the
VMALLOC address space for module data allocations, automatically reuse
address ranges defined for text unless address range for data is
explicitly defined by an architecture.
With separation of code and data allocations, data sections of the
modules are now mapped as PAGE_KERNEL rather than PAGE_KERNEL_EXEC which
was a default on many architectures.
Signed-off-by: Mike Rapoport (IBM) <rppt@xxxxxxxxxx>
---
arch/powerpc/kernel/module.c | 8 +++++++
include/linux/execmem.h | 18 +++++++++++++++
kernel/module/main.c | 15 +++----------
mm/execmem.c | 43 ++++++++++++++++++++++++++++++++++++
4 files changed, 72 insertions(+), 12 deletions(-)
diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c
index ba7abff77d98..4c6c15bf3947 100644
--- a/arch/powerpc/kernel/module.c
+++ b/arch/powerpc/kernel/module.c
@@ -103,6 +103,10 @@ struct execmem_params __init *execmem_arch_params(void)
{
pgprot_t prot = strict_module_rwx_enabled() ? PAGE_KERNEL : PAGE_KERNEL_EXEC;
+ /*
+ * BOOK3S_32 and 8xx define MODULES_VADDR for text allocations and
+ * allow allocating data in the entire vmalloc space
+ */
#ifdef MODULES_VADDR
unsigned long limit = (unsigned long)_etext - SZ_32M;
@@ -116,6 +120,10 @@ struct execmem_params __init *execmem_arch_params(void)
execmem_params.modules.text.start = MODULES_VADDR;
execmem_params.modules.text.end = MODULES_END;
}
+ execmem_params.modules.data.start = VMALLOC_START;
+ execmem_params.modules.data.end = VMALLOC_END;
+ execmem_params.modules.data.pgprot = PAGE_KERNEL;
+ execmem_params.modules.data.alignment = 1;
#else
execmem_params.modules.text.start = VMALLOC_START;
execmem_params.modules.text.end = VMALLOC_END;
diff --git a/include/linux/execmem.h b/include/linux/execmem.h
index b9a97fcdf3c5..2e1221310d13 100644
--- a/include/linux/execmem.h
+++ b/include/linux/execmem.h
@@ -44,10 +44,12 @@ enum execmem_module_flags {
* space
* @flags: options for module memory allocations
* @text: address range for text allocations
+ * @data: address range for data allocations
*/
struct execmem_modules_range {
enum execmem_module_flags flags;
struct execmem_range text;
+ struct execmem_range data;
};
/**
@@ -89,6 +91,22 @@ struct execmem_params *execmem_arch_params(void);
*/
void *execmem_text_alloc(size_t size);
+/**
+ * execmem_data_alloc - allocate memory for data coupled to code
+ * @size: how many bytes of memory are required
+ *
+ * Allocates memory that will contain data copupled with executable code,
+ * like data sections in kernel modules.
+ *
+ * The memory will have protections defined by architecture.
+ *
+ * The allocated memory will reside in an area that does not impose
+ * restrictions on the addressing modes.
+ *
+ * Return: a pointer to the allocated memory or %NULL
+ */
+void *execmem_data_alloc(size_t size);
+
/**
* execmem_free - free executable memory
* @ptr: pointer to the memory that should be freed
diff --git a/kernel/module/main.c b/kernel/module/main.c
index b445c5ad863a..d6582bfec1f6 100644
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -1195,25 +1195,16 @@ void __weak module_arch_freeing_init(struct module *mod)
{
}
-static bool mod_mem_use_vmalloc(enum mod_mem_type type)
-{
- return IS_ENABLED(CONFIG_ARCH_WANTS_MODULES_DATA_IN_VMALLOC) &&
- mod_mem_type_is_core_data(type);
-}
-
static void *module_memory_alloc(unsigned int size, enum mod_mem_type type)
{
- if (mod_mem_use_vmalloc(type))
- return vzalloc(size);
+ if (mod_mem_type_is_data(type))
+ return execmem_data_alloc(size);
return execmem_text_alloc(size);
}
static void module_memory_free(void *ptr, enum mod_mem_type type)
{
- if (mod_mem_use_vmalloc(type))
- vfree(ptr);
- else
- execmem_free(ptr);
+ execmem_free(ptr);
}
static void free_mod_mem(struct module *mod)
diff --git a/mm/execmem.c b/mm/execmem.c
index a67acd75ffef..f7bf496ad4c3 100644
--- a/mm/execmem.c
+++ b/mm/execmem.c
@@ -63,6 +63,20 @@ void *execmem_text_alloc(size_t size)
fallback_start, fallback_end, kasan);
}
+void *execmem_data_alloc(size_t size)
+{
+ unsigned long start = execmem_params.modules.data.start;
+ unsigned long end = execmem_params.modules.data.end;
+ pgprot_t pgprot = execmem_params.modules.data.pgprot;
+ unsigned int align = execmem_params.modules.data.alignment;
+ unsigned long fallback_start = execmem_params.modules.data.fallback_start;
+ unsigned long fallback_end = execmem_params.modules.data.fallback_end;
+ bool kasan = execmem_params.modules.flags & EXECMEM_KASAN_SHADOW;
+
+ return execmem_alloc(size, start, end, align, pgprot,
+ fallback_start, fallback_end, kasan);
+}
+
void execmem_free(void *ptr)
{
/*
@@ -101,6 +115,28 @@ static bool execmem_validate_params(struct execmem_params *p)
return true;
}
+static void execmem_init_missing(struct execmem_params *p)
+{
+ struct execmem_modules_range *m = &p->modules;
+
+ if (!pgprot_val(execmem_params.modules.data.pgprot))
+ execmem_params.modules.data.pgprot = PAGE_KERNEL;
+
+ if (!execmem_params.modules.data.alignment)
+ execmem_params.modules.data.alignment = m->text.alignment;
+
+ if (!execmem_params.modules.data.start) {
+ execmem_params.modules.data.start = m->text.start;
+ execmem_params.modules.data.end = m->text.end;
+ }
+
+ if (!execmem_params.modules.data.fallback_start &&
+ execmem_params.modules.text.fallback_start) {
+ execmem_params.modules.data.fallback_start = m->text.fallback_start;
+ execmem_params.modules.data.fallback_end = m->text.fallback_end;
+ }
+}
+
void __init execmem_init(void)
{
struct execmem_params *p = execmem_arch_params();
@@ -112,6 +148,11 @@ void __init execmem_init(void)
p->modules.text.pgprot = PAGE_KERNEL_EXEC;
p->modules.text.alignment = 1;
+ p->modules.data.start = VMALLOC_START;
+ p->modules.data.end = VMALLOC_END;
+ p->modules.data.pgprot = PAGE_KERNEL;
+ p->modules.data.alignment = 1;
+
return;
}
@@ -119,4 +160,6 @@ void __init execmem_init(void)
return;
execmem_params = *p;
+
+ execmem_init_missing(p);
}
--
2.35.1
