Commit 42830571 authored by Cong Wang's avatar Cong Wang Committed by Daniel Borkmann
Browse files

skmsg: Pass source psock to sk_psock_skb_redirect() 



sk_psock_skb_redirect() only takes skb as a parameter, we
will need to know where this skb is from, so just pass
the source psock to this function as a new parameter.
This patch prepares for the next one.

Signed-off-by: default avatarCong Wang <cong.wang@bytedance.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Acked-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
Link: https://lore.kernel.org/bpf/20210615021342.7416-8-xiyou.wangcong@gmail.com
parent 1581a6c1

net/core/skmsg.c

+6 −5
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ int sk_psock_msg_verdict(struct sock *sk, struct sk_psock *psock, 
}

EXPORT_SYMBOL_GPL(sk_psock_msg_verdict);



static int sk_psock_skb_redirect(struct sk_buff *skb)

static int sk_psock_skb_redirect(struct sk_psock *from, struct sk_buff *skb)

{

	struct sk_psock *psock_other;

	struct sock *sk_other;
@@ -861,11 +861,12 @@ static int sk_psock_skb_redirect(struct sk_buff *skb) 
	return 0;

}



static void sk_psock_tls_verdict_apply(struct sk_buff *skb, struct sock *sk, int verdict)

static void sk_psock_tls_verdict_apply(struct sk_buff *skb,

				       struct sk_psock *from, int verdict)

{

	switch (verdict) {

	case __SK_REDIRECT:

		sk_psock_skb_redirect(skb);

		sk_psock_skb_redirect(from, skb);

		break;

	case __SK_PASS:

	case __SK_DROP:
@@ -889,7 +890,7 @@ int sk_psock_tls_strp_read(struct sk_psock *psock, struct sk_buff *skb) 
		ret = sk_psock_map_verd(ret, skb_bpf_redirect_fetch(skb));

		skb->sk = NULL;

	}

	sk_psock_tls_verdict_apply(skb, psock->sk, ret);

	sk_psock_tls_verdict_apply(skb, psock, ret);

	rcu_read_unlock();

	return ret;

}
@@ -936,7 +937,7 @@ static int sk_psock_verdict_apply(struct sk_psock *psock, struct sk_buff *skb, 
		}

		break;

	case __SK_REDIRECT:

		err = sk_psock_skb_redirect(skb);

		err = sk_psock_skb_redirect(psock, skb);

		break;

	case __SK_DROP:

	default: