Skip to content

Commit

Permalink
s390/bpf,jit: call module_free() from any context
Browse files Browse the repository at this point in the history
The workqueue workaround is no longer needed. Same as 5199dfe
"sparc: bpf_jit_comp: can call module_free() from any context".

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Heiko Carstens authored and Martin Schwidefsky committed Jul 18, 2013
1 parent dae7fd4 commit 1eeb747
Showing 1 changed file with 3 additions and 17 deletions.
20 changes: 3 additions & 17 deletions arch/s390/net/bpf_jit_comp.c
Original file line number Diff line number Diff line change
Expand Up @@ -772,8 +772,7 @@ void bpf_jit_compile(struct sk_filter *fp)
} else if (jit.prg == cjit.prg && jit.lit == cjit.lit) {
prg_len = jit.prg - jit.start;
lit_len = jit.lit - jit.mid;
size = max_t(unsigned long, prg_len + lit_len,
sizeof(struct work_struct));
size = prg_len + lit_len;
if (size >= BPF_SIZE_MAX)
goto out;
jit.start = module_alloc(size);
Expand Down Expand Up @@ -804,21 +803,8 @@ void bpf_jit_compile(struct sk_filter *fp)
kfree(addrs);
}

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)
{
struct work_struct *work;

if (fp->bpf_func == sk_run_filter)
return;
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 1eeb747

Please sign in to comment.