Skip to content

Commit

Permalink
ppc: bpf_jit: can call module_free() from any context
Browse files Browse the repository at this point in the history
Followup patch on module_free()/vfree() that takes care of the rest, so
no longer this workaround with work_struct is needed.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Matt Evans <matt@ozlabs.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Daniel Borkmann authored and David S. Miller committed May 20, 2013
1 parent 71cea17 commit ed900ff
Showing 1 changed file with 3 additions and 16 deletions.
19 changes: 3 additions & 16 deletions arch/powerpc/net/bpf_jit_comp.c
Original file line number Diff line number Diff line change
Expand Up @@ -650,8 +650,7 @@ void bpf_jit_compile(struct sk_filter *fp)

proglen = cgctx.idx * 4;
alloclen = proglen + FUNCTION_DESCR_SIZE;
image = module_alloc(max_t(unsigned int, alloclen,
sizeof(struct work_struct)));
image = module_alloc(alloclen);
if (!image)
goto out;

Expand Down Expand Up @@ -688,20 +687,8 @@ void bpf_jit_compile(struct sk_filter *fp)
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);
}

0 comments on commit ed900ff

Please sign in to comment.