diff options
| author | Eric Dumazet <edumazet@google.com> | 2013-05-16 19:45:30 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-17 17:37:19 -0700 |
| commit | 650c8496702f2910c506ccf66685893302e1796e (patch) | |
| tree | a1236a98d13dfb56d2d6b020f1c06a0353b54dba /arch/x86/net/bpf_jit_comp.c | |
| parent | b4236daa410e4e778a938ac1151bf94d94c55efc (diff) | |
| download | linux-stable-650c8496702f2910c506ccf66685893302e1796e.tar.gz linux-stable-650c8496702f2910c506ccf66685893302e1796e.tar.bz2 linux-stable-650c8496702f2910c506ccf66685893302e1796e.zip | |
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: Eric Dumazet <edumazet@google.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86/net/bpf_jit_comp.c')
| -rw-r--r-- | arch/x86/net/bpf_jit_comp.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index f66b54086ce5..c0212db40032 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -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 @@ 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); } |