From: Mike Rapoport <rppt@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: "Alexandre Ghiti" <alexghiti@rivosinc.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Björn Töpel" <bjorn@kernel.org>,
"Catalin Marinas" <catalin.marinas@arm.com>,
"Christophe Leroy" <christophe.leroy@csgroup.eu>,
"David S. Miller" <davem@davemloft.net>,
"Dinh Nguyen" <dinguyen@kernel.org>,
"Donald Dutile" <ddutile@redhat.com>,
"Eric Chanudet" <echanude@redhat.com>,
"Heiko Carstens" <hca@linux.ibm.com>,
"Helge Deller" <deller@gmx.de>,
"Huacai Chen" <chenhuacai@kernel.org>,
"Kent Overstreet" <kent.overstreet@linux.dev>,
"Luis Chamberlain" <mcgrof@kernel.org>,
"Mark Rutland" <mark.rutland@arm.com>,
"Michael Ellerman" <mpe@ellerman.id.au>,
"Mike Rapoport" <rppt@kernel.org>,
"Nadav Amit" <nadav.amit@gmail.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Puranjay Mohan" <puranjay12@gmail.com>,
"Rick Edgecombe" <rick.p.edgecombe@intel.com>,
"Russell King" <linux@armlinux.org.uk>,
"Song Liu" <song@kernel.org>,
"Steven Rostedt" <rostedt@goodmis.org>,
"Thomas Bogendoerfer" <tsbogend@alpha.franken.de>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Will Deacon" <will@kernel.org>,
bpf@vger.kernel.org, linux-arch@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org,
linux-mm@kvack.org, linux-modules@vger.kernel.org,
linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org,
linux-s390@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, loongarch@lists.linux.dev,
netdev@vger.kernel.org, sparclinux@vger.kernel.org,
x86@kernel.org
Subject: [PATCH v4 04/15] module: make module_memory_{alloc,free} more self-contained
Date: Thu, 11 Apr 2024 19:00:40 +0300 [thread overview]
Message-ID: <20240411160051.2093261-5-rppt@kernel.org> (raw)
In-Reply-To: <20240411160051.2093261-1-rppt@kernel.org>
From: "Mike Rapoport (IBM)" <rppt@kernel.org>
Move the logic related to the memory allocation and freeing into
module_memory_alloc() and module_memory_free().
Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
kernel/module/main.c | 64 +++++++++++++++++++++++++++-----------------
1 file changed, 39 insertions(+), 25 deletions(-)
diff --git a/kernel/module/main.c b/kernel/module/main.c
index e1e8a7a9d6c1..5b82b069e0d3 100644
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -1203,15 +1203,44 @@ static bool mod_mem_use_vmalloc(enum mod_mem_type type)
mod_mem_type_is_core_data(type);
}
-static void *module_memory_alloc(unsigned int size, enum mod_mem_type type)
+static int module_memory_alloc(struct module *mod, enum mod_mem_type type)
{
+ unsigned int size = PAGE_ALIGN(mod->mem[type].size);
+ void *ptr;
+
+ mod->mem[type].size = size;
+
if (mod_mem_use_vmalloc(type))
- return vzalloc(size);
- return module_alloc(size);
+ ptr = vmalloc(size);
+ else
+ ptr = module_alloc(size);
+
+ if (!ptr)
+ return -ENOMEM;
+
+ /*
+ * The pointer to these blocks of memory are stored on the module
+ * structure and we keep that around so long as the module is
+ * around. We only free that memory when we unload the module.
+ * Just mark them as not being a leak then. The .init* ELF
+ * sections *do* get freed after boot so we *could* treat them
+ * slightly differently with kmemleak_ignore() and only grey
+ * them out as they work as typical memory allocations which
+ * *do* eventually get freed, but let's just keep things simple
+ * and avoid *any* false positives.
+ */
+ kmemleak_not_leak(ptr);
+
+ memset(ptr, 0, size);
+ mod->mem[type].base = ptr;
+
+ return 0;
}
-static void module_memory_free(void *ptr, enum mod_mem_type type)
+static void module_memory_free(struct module *mod, enum mod_mem_type type)
{
+ void *ptr = mod->mem[type].base;
+
if (mod_mem_use_vmalloc(type))
vfree(ptr);
else
@@ -1229,12 +1258,12 @@ static void free_mod_mem(struct module *mod)
/* Free lock-classes; relies on the preceding sync_rcu(). */
lockdep_free_key_range(mod_mem->base, mod_mem->size);
if (mod_mem->size)
- module_memory_free(mod_mem->base, type);
+ module_memory_free(mod, type);
}
/* MOD_DATA hosts mod, so free it at last */
lockdep_free_key_range(mod->mem[MOD_DATA].base, mod->mem[MOD_DATA].size);
- module_memory_free(mod->mem[MOD_DATA].base, MOD_DATA);
+ module_memory_free(mod, MOD_DATA);
}
/* Free a module, remove from lists, etc. */
@@ -2225,7 +2254,6 @@ static int find_module_sections(struct module *mod, struct load_info *info)
static int move_module(struct module *mod, struct load_info *info)
{
int i;
- void *ptr;
enum mod_mem_type t = 0;
int ret = -ENOMEM;
@@ -2234,26 +2262,12 @@ static int move_module(struct module *mod, struct load_info *info)
mod->mem[type].base = NULL;
continue;
}
- mod->mem[type].size = PAGE_ALIGN(mod->mem[type].size);
- ptr = module_memory_alloc(mod->mem[type].size, type);
- /*
- * The pointer to these blocks of memory are stored on the module
- * structure and we keep that around so long as the module is
- * around. We only free that memory when we unload the module.
- * Just mark them as not being a leak then. The .init* ELF
- * sections *do* get freed after boot so we *could* treat them
- * slightly differently with kmemleak_ignore() and only grey
- * them out as they work as typical memory allocations which
- * *do* eventually get freed, but let's just keep things simple
- * and avoid *any* false positives.
- */
- kmemleak_not_leak(ptr);
- if (!ptr) {
+
+ ret = module_memory_alloc(mod, type);
+ if (ret) {
t = type;
goto out_enomem;
}
- memset(ptr, 0, mod->mem[type].size);
- mod->mem[type].base = ptr;
}
/* Transfer each section which specifies SHF_ALLOC */
@@ -2296,7 +2310,7 @@ static int move_module(struct module *mod, struct load_info *info)
return 0;
out_enomem:
for (t--; t >= 0; t--)
- module_memory_free(mod->mem[t].base, t);
+ module_memory_free(mod, t);
return ret;
}
--
2.43.0
next prev parent reply other threads:[~2024-04-11 16:02 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-11 16:00 [PATCH v4 00/15] mm: jit/text allocator Mike Rapoport
2024-04-11 16:00 ` [PATCH v4 01/15] arm64: module: remove uneeded call to kasan_alloc_module_shadow() Mike Rapoport
2024-04-11 16:00 ` [PATCH v4 02/15] mips: module: rename MODULE_START to MODULES_VADDR Mike Rapoport
2024-04-11 16:00 ` [PATCH v4 03/15] nios2: define virtual address space for modules Mike Rapoport
2024-04-11 16:00 ` Mike Rapoport [this message]
2024-04-11 16:00 ` [PATCH v4 05/15] mm: introduce execmem_alloc() and execmem_free() Mike Rapoport
2024-04-11 19:42 ` Luis Chamberlain
2024-04-14 6:53 ` Mike Rapoport
2024-04-12 9:16 ` Ingo Molnar
2024-04-14 6:54 ` Mike Rapoport
2024-04-15 7:52 ` Peter Zijlstra
2024-04-15 16:51 ` Mike Rapoport
2024-04-15 17:36 ` Mark Rutland
2024-04-16 7:22 ` Mike Rapoport
2024-04-17 23:32 ` Song Liu
2024-04-18 15:35 ` Mike Rapoport
2024-04-18 16:13 ` Song Liu
2024-04-18 17:52 ` Mike Rapoport
2024-04-18 21:01 ` Song Liu
2024-04-19 6:55 ` Mike Rapoport
2024-04-19 15:54 ` Song Liu
2024-04-19 17:02 ` Mike Rapoport
2024-04-19 17:32 ` Song Liu
2024-04-19 19:59 ` Mike Rapoport
2024-04-19 21:42 ` Song Liu
2024-04-20 4:22 ` Mike Rapoport
2024-04-20 9:11 ` Masami Hiramatsu
2024-04-22 18:32 ` Song Liu
2024-04-17 21:06 ` Masami Hiramatsu
2024-04-11 16:00 ` [PATCH v4 06/15] mm/execmem, arch: convert simple overrides of module_alloc to execmem Mike Rapoport
2024-04-11 20:53 ` Sam Ravnborg
2024-04-14 7:26 ` Mike Rapoport
2024-04-15 8:03 ` Peter Zijlstra
2024-04-11 16:00 ` [PATCH v4 07/15] mm/execmem, arch: convert remaining " Mike Rapoport
2024-04-15 9:36 ` Peter Zijlstra
2024-04-11 16:00 ` [PATCH v4 08/15] arm64: extend execmem_info for generated code allocations Mike Rapoport
2024-04-11 16:00 ` [PATCH v4 09/15] riscv: extend execmem_params " Mike Rapoport
2024-04-11 16:00 ` [PATCH v4 10/15] powerpc: extend execmem_params for kprobes allocations Mike Rapoport
2024-04-11 16:00 ` [PATCH v4 11/15] arch: make execmem setup available regardless of CONFIG_MODULES Mike Rapoport
2024-04-11 16:00 ` [PATCH v4 12/15] x86/ftrace: enable dynamic ftrace without CONFIG_MODULES Mike Rapoport
2024-04-11 16:00 ` [PATCH v4 13/15] powerpc: use CONFIG_EXECMEM instead of CONFIG_MODULES where appropiate Mike Rapoport
2024-04-11 16:00 ` [PATCH v4 14/15] kprobes: remove dependency on CONFIG_MODULES Mike Rapoport
2024-04-17 21:16 ` Masami Hiramatsu
2024-04-18 15:37 ` Mike Rapoport
2024-04-19 15:49 ` Mike Rapoport
2024-04-19 15:59 ` Christophe Leroy
2024-04-20 7:33 ` Mike Rapoport
2024-04-20 9:15 ` Masami Hiramatsu
2024-04-20 10:52 ` Mike Rapoport
2024-04-11 16:00 ` [PATCH v4 15/15] bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of Mike Rapoport
2024-04-11 18:00 ` [PATCH v4 00/15] mm: jit/text allocator Kent Overstreet
2024-04-11 19:45 ` Luis Chamberlain
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=20240411160051.2093261-5-rppt@kernel.org \
--to=rppt@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=alexghiti@rivosinc.com \
--cc=bjorn@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=catalin.marinas@arm.com \
--cc=chenhuacai@kernel.org \
--cc=christophe.leroy@csgroup.eu \
--cc=davem@davemloft.net \
--cc=ddutile@redhat.com \
--cc=deller@gmx.de \
--cc=dinguyen@kernel.org \
--cc=echanude@redhat.com \
--cc=hca@linux.ibm.com \
--cc=kent.overstreet@linux.dev \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-modules@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=loongarch@lists.linux.dev \
--cc=mark.rutland@arm.com \
--cc=mcgrof@kernel.org \
--cc=mpe@ellerman.id.au \
--cc=nadav.amit@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=palmer@dabbelt.com \
--cc=puranjay12@gmail.com \
--cc=rick.p.edgecombe@intel.com \
--cc=rostedt@goodmis.org \
--cc=song@kernel.org \
--cc=sparclinux@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tsbogend@alpha.franken.de \
--cc=will@kernel.org \
--cc=x86@kernel.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).