public inbox for linux-next@vger.kernel.org
 help / color / mirror / Atom feed
* linux-next: manual merge of the modules tree with the mm tree
@ 2024-04-24  2:39 Stephen Rothwell
  2024-04-24 20:07 ` Andrew Morton
  0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2024-04-24  2:39 UTC (permalink / raw)
  To: Luis Chamberlain, Andrew Morton
  Cc: Linux Kernel Mailing List, Linux Next Mailing List,
	Mike Rapoport (IBM), Suren Baghdasaryan

[-- Attachment #1: Type: text/plain, Size: 4634 bytes --]

Hi all,

Today's linux-next merge of the modules tree got a conflict in:

  kernel/module/main.c

between commits:

  7f014cdda4cb ("lib: code tagging module support")
  5ab9b0c7ea5c ("lib: prevent module unloading if memory is not freed")

from the mm-unstable branch of the mm tree and commits:

  0746f9982603 ("module: make module_memory_{alloc,free} more self-contained")
  18da532eefc8 ("mm/execmem, arch: convert remaining overrides of module_alloc to execmem")

from the modules tree.

I fixed it up (I think, see below) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc kernel/module/main.c
index 2d25eebc549d,91e185607d4b..000000000000
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@@ -56,8 -56,8 +56,9 @@@
  #include <linux/dynamic_debug.h>
  #include <linux/audit.h>
  #include <linux/cfi.h>
 +#include <linux/codetag.h>
  #include <linux/debugfs.h>
+ #include <linux/execmem.h>
  #include <uapi/linux/module.h>
  #include "internal.h"
  
@@@ -1198,32 -1188,50 +1189,54 @@@ void __weak module_arch_freeing_init(st
  {
  }
  
- static bool mod_mem_use_vmalloc(enum mod_mem_type type)
+ static int module_memory_alloc(struct module *mod, enum mod_mem_type type)
  {
- 	return IS_ENABLED(CONFIG_ARCH_WANTS_MODULES_DATA_IN_VMALLOC) &&
- 		mod_mem_type_is_core_data(type);
+ 	unsigned int size = PAGE_ALIGN(mod->mem[type].size);
+ 	enum execmem_type execmem_type;
+ 	void *ptr;
+ 
+ 	mod->mem[type].size = size;
+ 
+ 	if (mod_mem_type_is_data(type))
+ 		execmem_type = EXECMEM_MODULE_DATA;
+ 	else
+ 		execmem_type = EXECMEM_MODULE_TEXT;
+ 
+ 	ptr = execmem_alloc(execmem_type, 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_alloc(unsigned int size, enum mod_mem_type type)
- {
- 	if (mod_mem_use_vmalloc(type))
- 		return vzalloc(size);
- 	return module_alloc(size);
- }
- 
- 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)
++static void module_memory_free(struct module *mod, enum mod_mem_type type,
 +			       bool unload_codetags)
  {
+ 	void *ptr = mod->mem[type].base;
+ 
 +	if (!unload_codetags && mod_mem_type_is_core_data(type))
 +		return;
 +
- 	if (mod_mem_use_vmalloc(type))
- 		vfree(ptr);
- 	else
- 		module_memfree(ptr);
+ 	execmem_free(ptr);
  }
  
 -static void free_mod_mem(struct module *mod)
 +static void free_mod_mem(struct module *mod, bool unload_codetags)
  {
  	for_each_mod_mem_type(type) {
  		struct module_memory *mod_mem = &mod->mem[type];
@@@ -1234,13 -1242,12 +1247,12 @@@
  		/* 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,
- 					   unload_codetags);
 -			module_memory_free(mod, type);
++			module_memory_free(mod, type, unload_codetags);
  	}
  
  	/* 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, unload_codetags);
 -	module_memory_free(mod, MOD_DATA);
++	module_memory_free(mod, MOD_DATA, unload_codetags);
  }
  
  /* Free a module, remove from lists, etc. */
@@@ -2309,7 -2287,7 +2299,7 @@@ static int move_module(struct module *m
  	return 0;
  out_enomem:
  	for (t--; t >= 0; t--)
- 		module_memory_free(mod->mem[t].base, t, true);
 -		module_memory_free(mod, t);
++		module_memory_free(mod, t, true);
  	return ret;
  }
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread
* linux-next: manual merge of the modules tree with the mm tree
@ 2024-04-24  2:20 Stephen Rothwell
  2024-05-16 23:26 ` Stephen Rothwell
  0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2024-04-24  2:20 UTC (permalink / raw)
  To: Luis Chamberlain, Andrew Morton
  Cc: Kent Overstreet, Linux Kernel Mailing List,
	Linux Next Mailing List, Mike Rapoport (IBM), Suren Baghdasaryan

[-- Attachment #1: Type: text/plain, Size: 1136 bytes --]

Hi all,

Today's linux-next merge of the modules tree got a conflict in:

  arch/powerpc/mm/mem.c

between commit:

  c22e503ced5b ("fix missing vmalloc.h includes")

from the mm-unstable branch of the mm tree and commit:

  7aa7eb8269ea ("arch: make execmem setup available regardless of CONFIG_MODULES")

from the modules tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/powerpc/mm/mem.c
index a197d4c2244b,5de62a3c1d4b..000000000000
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@@ -16,7 -16,7 +16,8 @@@
  #include <linux/highmem.h>
  #include <linux/suspend.h>
  #include <linux/dma-direct.h>
 +#include <linux/vmalloc.h>
+ #include <linux/execmem.h>
  
  #include <asm/swiotlb.h>
  #include <asm/machdep.h>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread
* linux-next: manual merge of the modules tree with the mm tree
@ 2024-04-12  2:04 Stephen Rothwell
  2024-05-16 23:23 ` Stephen Rothwell
  0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2024-04-12  2:04 UTC (permalink / raw)
  To: Luis Chamberlain, Andrew Morton
  Cc: Linux Kernel Mailing List, Linux Next Mailing List,
	Mike Rapoport (IBM), Suren Baghdasaryan

[-- Attachment #1: Type: text/plain, Size: 4194 bytes --]

Hi all,

Today's linux-next merge of the modules tree got a conflict in:

  kernel/module/main.c

between commit:

  58782d7a7ccd ("lib: prevent module unloading if memory is not freed")

from the mm-unstable branch of the mm tree and commit:

  a4ee8c9b86bd ("module: make module_memory_{alloc,free} more self-contained")

from the modules tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc kernel/module/main.c
index 2d25eebc549d,d56b7df0cbb6..000000000000
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@@ -56,8 -56,8 +56,9 @@@
  #include <linux/dynamic_debug.h>
  #include <linux/audit.h>
  #include <linux/cfi.h>
 +#include <linux/codetag.h>
  #include <linux/debugfs.h>
+ #include <linux/execmem.h>
  #include <uapi/linux/module.h>
  #include "internal.h"
  
@@@ -1204,26 -1194,51 +1195,55 @@@ static bool mod_mem_use_vmalloc(enum mo
  		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 = execmem_alloc(EXECMEM_MODULE_TEXT, 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)
++static void module_memory_free(struct module *mod, enum mod_mem_type type,
 +			       bool unload_codetags)
  {
+ 	void *ptr = mod->mem[type].base;
+ 
 +	if (!unload_codetags && mod_mem_type_is_core_data(type))
 +		return;
 +
  	if (mod_mem_use_vmalloc(type))
  		vfree(ptr);
  	else
- 		module_memfree(ptr);
+ 		execmem_free(ptr);
  }
  
 -static void free_mod_mem(struct module *mod)
 +static void free_mod_mem(struct module *mod, bool unload_codetags)
  {
  	for_each_mod_mem_type(type) {
  		struct module_memory *mod_mem = &mod->mem[type];
@@@ -1234,13 -1249,12 +1254,13 @@@
  		/* 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);
++			module_memory_free(mod, type,
 +					   unload_codetags);
  	}
  
  	/* 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, unload_codetags);
 -	module_memory_free(mod, MOD_DATA);
++	module_memory_free(mod, MOD_DATA, unload_codetags);
  }
  
  /* Free a module, remove from lists, etc. */
@@@ -2309,7 -2301,7 +2314,7 @@@ static int move_module(struct module *m
  	return 0;
  out_enomem:
  	for (t--; t >= 0; t--)
- 		module_memory_free(mod->mem[t].base, t, true);
 -		module_memory_free(mod, t);
++		module_memory_free(mod, t, true);
  	return ret;
  }
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2024-05-16 23:35 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-24  2:39 linux-next: manual merge of the modules tree with the mm tree Stephen Rothwell
2024-04-24 20:07 ` Andrew Morton
2024-04-24 20:17   ` Suren Baghdasaryan
2024-04-24 20:29   ` Mike Rapoport
2024-04-24 20:33     ` Suren Baghdasaryan
2024-04-24 21:24       ` Suren Baghdasaryan
2024-04-25  1:37         ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2024-04-24  2:20 Stephen Rothwell
2024-05-16 23:26 ` Stephen Rothwell
2024-04-12  2:04 Stephen Rothwell
2024-05-16 23:23 ` Stephen Rothwell
2024-05-16 23:35   ` Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox