kcm: use BPF_PROG_RUN

samitolvanen · Alexei Starovoitov · commit a2c11b034142 · 2019-09-06T10:04:31.000-07:00
Instead of invoking struct bpf_prog::bpf_func directly, use the
BPF_PROG_RUN macro.

Signed-off-by: Sami Tolvanen &lt;samitolvanen@google.com&gt;
Acked-by: Yonghong Song &lt;yhs@fb.com&gt;
Signed-off-by: Alexei Starovoitov &lt;ast@kernel.org&gt;
diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c
@@ -379,7 +379,7 @@ static int kcm_parse_func_strparser(struct strparser *strp, struct sk_buff *skb)
 	struct kcm_psock *psock = container_of(strp, struct kcm_psock, strp);
 	struct bpf_prog *prog = psock->bpf_prog;
 
-	return (*prog->bpf_func)(skb, prog->insnsi);
+	return BPF_PROG_RUN(prog, skb);
 }
 
 static int kcm_read_sock_done(struct strparser *strp, int err)

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ static int kcm_parse_func_strparser(struct strparser strp, struct sk_buff skb)`
`379`	`379`	`struct kcm_psock *psock = container_of(strp, struct kcm_psock, strp);`
`380`	`380`	`struct bpf_prog *prog = psock->bpf_prog;`
`381`	`381`
`382`		`- return (*prog->bpf_func)(skb, prog->insnsi);`
	`382`	`+ return BPF_PROG_RUN(prog, skb);`
`383`	`383`	`}`
`384`	`384`
`385`	`385`	`static int kcm_read_sock_done(struct strparser *strp, int err)`