Commit 53334232 authored by Cong Wang's avatar Cong Wang Committed by Alexei Starovoitov
Browse files

skmsg: Get rid of sk_psock_bpf_run() 



It is now nearly identical to bpf_prog_run_pin_on_cpu() and
it has an unused parameter 'psock', so we can just get rid
of it and call bpf_prog_run_pin_on_cpu() directly.

Signed-off-by: default avatarCong Wang <cong.wang@bytedance.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
Link: https://lore.kernel.org/bpf/20210223184934.6054-9-xiyou.wangcong@gmail.com
parent cd81cefb

net/core/skmsg.c

+4 −10
Original line number Diff line number Diff line
@@ -749,12 +749,6 @@ int sk_psock_msg_verdict(struct sock *sk, struct sk_psock *psock, 
}

EXPORT_SYMBOL_GPL(sk_psock_msg_verdict);



static int sk_psock_bpf_run(struct sk_psock *psock, struct bpf_prog *prog,

			    struct sk_buff *skb)

{

	return bpf_prog_run_pin_on_cpu(prog, skb);

}



static void sk_psock_skb_redirect(struct sk_buff *skb)

{

	struct sk_psock *psock_other;
@@ -812,7 +806,7 @@ int sk_psock_tls_strp_read(struct sk_psock *psock, struct sk_buff *skb) 
		skb->sk = psock->sk;

		skb_dst_drop(skb);

		skb_bpf_redirect_clear(skb);

		ret = sk_psock_bpf_run(psock, prog, skb);

		ret = bpf_prog_run_pin_on_cpu(prog, skb);

		ret = sk_psock_map_verd(ret, skb_bpf_redirect_fetch(skb));

		skb->sk = NULL;

	}
@@ -899,7 +893,7 @@ static void sk_psock_strp_read(struct strparser *strp, struct sk_buff *skb) 
	if (likely(prog)) {

		skb_dst_drop(skb);

		skb_bpf_redirect_clear(skb);

		ret = sk_psock_bpf_run(psock, prog, skb);

		ret = bpf_prog_run_pin_on_cpu(prog, skb);

		ret = sk_psock_map_verd(ret, skb_bpf_redirect_fetch(skb));

	}

	sk_psock_verdict_apply(psock, skb, ret);
@@ -922,7 +916,7 @@ static int sk_psock_strp_parse(struct strparser *strp, struct sk_buff *skb) 
	prog = READ_ONCE(psock->progs.stream_parser);

	if (likely(prog)) {

		skb->sk = psock->sk;

		ret = sk_psock_bpf_run(psock, prog, skb);

		ret = bpf_prog_run_pin_on_cpu(prog, skb);

		skb->sk = NULL;

	}

	rcu_read_unlock();
@@ -1019,7 +1013,7 @@ static int sk_psock_verdict_recv(read_descriptor_t *desc, struct sk_buff *skb, 
	if (likely(prog)) {

		skb_dst_drop(skb);

		skb_bpf_redirect_clear(skb);

		ret = sk_psock_bpf_run(psock, prog, skb);

		ret = bpf_prog_run_pin_on_cpu(prog, skb);

		ret = sk_psock_map_verd(ret, skb_bpf_redirect_fetch(skb));

	}

	sk_psock_verdict_apply(psock, skb, ret);