[PATCH net-next] sparc: bpf_jit_comp: can call module_free() from any context

[PATCH net-next] sparc: bpf_jit_comp: can call module_free() from any context

[Eric Dumazet]

From: Eric Dumazet <edumazet@google.com>

module_free()/vfree() takes care of details, we no longer need a wrapper
and a work_struct.

Signed-off-by: Eric Dumazet <edumazet@google.com>
---
 arch/sparc/net/bpf_jit_comp.c |   20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/arch/sparc/net/bpf_jit_comp.c b/arch/sparc/net/bpf_jit_comp.c
index d36a85e..d116bcd 100644
--- a/arch/sparc/net/bpf_jit_comp.c
+++ b/arch/sparc/net/bpf_jit_comp.c
@@ -785,9 +785,7 @@ cond_branch:			f_offset = addrs[i + filter[i].jf];
 			break;
 		}
 		if (proglen == oldproglen) {
-			image = module_alloc(max_t(unsigned int,
-						   proglen,
-						   sizeof(struct work_struct)));
+			image = module_alloc(proglen);
 			if (!image)
 				goto out;
 		}
@@ -806,20 +804,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);
 }

Re: [PATCH net-next] sparc: bpf_jit_comp: can call module_free() from any context

[David Miller]

From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 17 May 2013 15:12:34 -0700

> From: Eric Dumazet <edumazet@google.com>
> 
> module_free()/vfree() takes care of details, we no longer need a wrapper
> and a work_struct.
> 
> Signed-off-by: Eric Dumazet <edumazet@google.com>

Applied, thanks.