bpf: remove cg_skb_func_proto and use sk_filter_func_proto directly

borkmann · davem330 · commit 966789fb8636 · 2017-06-10T19:05:46.000-04:00
Since cg_skb_func_proto() doesn't do anything else than just calling
into sk_filter_func_proto(), remove it and set sk_filter_func_proto()
directly for .get_func_proto callback.

Signed-off-by: Daniel Borkmann &lt;daniel@iogearbox.net&gt;
Acked-by: Alexei Starovoitov &lt;ast@kernel.org&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/core/filter.c b/net/core/filter.c
@@ -2774,12 +2774,6 @@ xdp_func_proto(enum bpf_func_id func_id)
 	}
 }
 
-static const struct bpf_func_proto *
-cg_skb_func_proto(enum bpf_func_id func_id)
-{
-	return sk_filter_func_proto(func_id);
-}
-
 static const struct bpf_func_proto *
 lwt_inout_func_proto(enum bpf_func_id func_id)
 {
@@ -3344,7 +3338,7 @@ const struct bpf_verifier_ops xdp_prog_ops = {
 };
 
 const struct bpf_verifier_ops cg_skb_prog_ops = {
-	.get_func_proto		= cg_skb_func_proto,
+	.get_func_proto		= sk_filter_func_proto,
 	.is_valid_access	= sk_filter_is_valid_access,
 	.convert_ctx_access	= bpf_convert_ctx_access,
 	.test_run		= bpf_prog_test_run_skb,

Original file line number	Diff line number	Diff line change
`@@ -2774,12 +2774,6 @@ xdp_func_proto(enum bpf_func_id func_id)`
`2774`	`2774`	`}`
`2775`	`2775`	`}`
`2776`	`2776`
`2777`		`-static const struct bpf_func_proto *`
`2778`		`-cg_skb_func_proto(enum bpf_func_id func_id)`
`2779`		`-{`
`2780`		`- return sk_filter_func_proto(func_id);`
`2781`		`-}`
`2782`		`-`
`2783`	`2777`	`static const struct bpf_func_proto *`
`2784`	`2778`	`lwt_inout_func_proto(enum bpf_func_id func_id)`
`2785`	`2779`	`{`
`@@ -3344,7 +3338,7 @@ const struct bpf_verifier_ops xdp_prog_ops = {`
`3344`	`3338`	`};`
`3345`	`3339`
`3346`	`3340`	`const struct bpf_verifier_ops cg_skb_prog_ops = {`
`3347`		`- .get_func_proto = cg_skb_func_proto,`
	`3341`	`+ .get_func_proto = sk_filter_func_proto,`
`3348`	`3342`	`.is_valid_access = sk_filter_is_valid_access,`
`3349`	`3343`	`.convert_ctx_access = bpf_convert_ctx_access,`
`3350`	`3344`	`.test_run = bpf_prog_test_run_skb,`