Commit be1f221c authored by Rusty Russell's avatar Rusty Russell
Browse files

module: remove mod arg from module_free, rename module_memfree(). 



Nothing needs the module pointer any more, and the next patch will
call it from RCU, where the module itself might no longer exist.
Removing the arg is the safest approach.

This just codifies the use of the module_alloc/module_free pattern
which ftrace and bpf use.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Chris Metcalf <cmetcalf@ezchip.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: x86@kernel.org
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: linux-cris-kernel@axis.com
Cc: linux-kernel@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: nios2-dev@lists.rocketboards.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: sparclinux@vger.kernel.org
Cc: netdev@vger.kernel.org
parent d453cded

arch/cris/kernel/module.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ void *module_alloc(unsigned long size) 
}



/* Free memory returned from module_alloc */

void module_free(struct module *mod, void *module_region)

void module_memfree(void *module_region)

{

	kfree(module_region);

}

arch/mips/net/bpf_jit.c

+1 −1
Original line number Diff line number Diff line
@@ -1388,7 +1388,7 @@ out: 
void bpf_jit_free(struct bpf_prog *fp)

{

	if (fp->jited)

		module_free(NULL, fp->bpf_func);

		module_memfree(fp->bpf_func);



	bpf_prog_unlock_free(fp);

}

arch/nios2/kernel/module.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ void *module_alloc(unsigned long size) 
}



/* Free memory returned from module_alloc */

void module_free(struct module *mod, void *module_region)

void module_memfree(void *module_region)

{

	kfree(module_region);

}

arch/powerpc/net/bpf_jit_comp.c

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ out: 
void bpf_jit_free(struct bpf_prog *fp)

{

	if (fp->jited)

		module_free(NULL, fp->bpf_func);

		module_memfree(fp->bpf_func);



	bpf_prog_unlock_free(fp);

}

arch/sparc/net/bpf_jit_comp.c

+2 −2
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ cond_branch: f_offset = addrs[i + filter[i].jf]; 
				if (unlikely(proglen + ilen > oldproglen)) {

					pr_err("bpb_jit_compile fatal error\n");

					kfree(addrs);

					module_free(NULL, image);

					module_memfree(image);

					return;

				}

				memcpy(image + proglen, temp, ilen);
@@ -822,7 +822,7 @@ out: 
void bpf_jit_free(struct bpf_prog *fp)

{

	if (fp->jited)

		module_free(NULL, fp->bpf_func);

		module_memfree(fp->bpf_func);



	bpf_prog_unlock_free(fp);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE