diff options
| author | Daniel Borkmann <dborkman@redhat.com> | 2013-05-20 08:05:50 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-20 14:03:50 -0700 |
| commit | ed900ffb73e3ab154dff1ae20a2393f24da728df (patch) | |
| tree | 08063189ce3fd260661a763413f68ca93fe149df | |
| parent | 71cea17ed39fdf1c0634f530ddc6a2c2fc601c2b (diff) | |
| download | op-kernel-dev-ed900ffb73e3ab154dff1ae20a2393f24da728df.zip op-kernel-dev-ed900ffb73e3ab154dff1ae20a2393f24da728df.tar.gz | |
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>
| -rw-r--r-- | arch/powerpc/net/bpf_jit_comp.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c index c427ae3..bf56e33 100644 --- a/arch/powerpc/net/bpf_jit_comp.c +++ b/arch/powerpc/net/bpf_jit_comp.c @@ -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; @@ -688,20 +687,8 @@ out: 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); } |
