Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 650c8496 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

x86: bpf_jit_comp: can call module_free() from any context 



It looks like we can call module_free()/vfree() from softirq context,
so no longer need a wrapper and a work_struct.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4236daa

arch/x86/net/bpf_jit_comp.c

+3 −17
Original line number Diff line number Diff line
@@ -717,9 +717,7 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i]; 
			break;

		}

		if (proglen == oldproglen) {

			image = module_alloc(max_t(unsigned int,

						   proglen,

						   sizeof(struct work_struct)));

			image = module_alloc(proglen);

			if (!image)

				goto out;

		}
@@ -738,20 +736,8 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i]; 
	return;

}



static void jit_free_defer(struct work_struct *arg)

{

	module_free(NULL, arg);

}



/* run from softirq, we must use a work_struct to call

 * module_free() from process context

 */

void bpf_jit_free(struct sk_filter *fp)

{

	if (fp->bpf_func != sk_run_filter) {

		struct work_struct *work = (struct work_struct *)fp->bpf_func;



		INIT_WORK(work, jit_free_defer);

		schedule_work(work);

	}

	if (fp->bpf_func != sk_run_filter)

		module_free(NULL, fp->bpf_func);

}