ppc: bpf_jit: can call module_free() from any context
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>
This commit is contained in:
parent
71cea17ed3
commit
ed900ffb73
@ -650,8 +650,7 @@ void bpf_jit_compile(struct sk_filter *fp)
|
|||||||
|
|
||||||
proglen = cgctx.idx * 4;
|
proglen = cgctx.idx * 4;
|
||||||
alloclen = proglen + FUNCTION_DESCR_SIZE;
|
alloclen = proglen + FUNCTION_DESCR_SIZE;
|
||||||
image = module_alloc(max_t(unsigned int, alloclen,
|
image = module_alloc(alloclen);
|
||||||
sizeof(struct work_struct)));
|
|
||||||
if (!image)
|
if (!image)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
@ -688,20 +687,8 @@ out:
|
|||||||
return;
|
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)
|
void bpf_jit_free(struct sk_filter *fp)
|
||||||
{
|
{
|
||||||
if (fp->bpf_func != sk_run_filter) {
|
if (fp->bpf_func != sk_run_filter)
|
||||||
struct work_struct *work = (struct work_struct *)fp->bpf_func;
|
module_free(NULL, fp->bpf_func);
|
||||||
|
|
||||||
INIT_WORK(work, jit_free_defer);
|
|
||||||
schedule_work(work);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user