diff mbox series

[bpf,v2,7/7] skmsg: increase sk->sk_drops when dropping packets

Message ID 20210522191411.21446-8-xiyou.wangcong@gmail.com
State Superseded
Headers show
Series sock_map: some bug fixes and improvements | expand

Commit Message

Cong Wang May 22, 2021, 7:14 p.m. UTC 
From: Cong Wang <cong.wang@bytedance.com>

It is hard to observe packet drops without increase relevant
drop counters, here we should increase sk->sk_drops which is
a protocol-independent counter. Fortunately psock is always
assocaited with a struct sock, we can just use psock->sk.

Cc: John Fastabend <john.fastabend@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Jakub Sitnicki <jakub@cloudflare.com>
Cc: Lorenz Bauer <lmb@cloudflare.com>
Signed-off-by: Cong Wang <cong.wang@bytedance.com>
---
 net/core/skmsg.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

Comments

John Fastabend May 26, 2021, 4:22 a.m. UTC | #1 
Cong Wang wrote:
> From: Cong Wang <cong.wang@bytedance.com>

> 

> It is hard to observe packet drops without increase relevant

> drop counters, here we should increase sk->sk_drops which is

> a protocol-independent counter. Fortunately psock is always

> assocaited with a struct sock, we can just use psock->sk.

> 

> Cc: John Fastabend <john.fastabend@gmail.com>

> Cc: Daniel Borkmann <daniel@iogearbox.net>

> Cc: Jakub Sitnicki <jakub@cloudflare.com>

> Cc: Lorenz Bauer <lmb@cloudflare.com>

> Signed-off-by: Cong Wang <cong.wang@bytedance.com>


[...]

>  static void sk_psock_backlog(struct work_struct *work)

>  {

>  	struct sk_psock *psock = container_of(work, struct sk_psock, work);

> @@ -617,7 +623,7 @@ static void sk_psock_backlog(struct work_struct *work)

>  				/* Hard errors break pipe and stop xmit. */

>  				sk_psock_report_error(psock, ret ? -ret : EPIPE);

>  				sk_psock_clear_state(psock, SK_PSOCK_TX_ENABLED);

> -				kfree_skb(skb);

> +				sock_drop(psock->sk, skb);

>  				goto end;

>  			}

>  			off += ret;

> @@ -625,7 +631,7 @@ static void sk_psock_backlog(struct work_struct *work)

>  		} while (len);

>  

>  		if (!ingress)

> -			kfree_skb(skb);

> +			sock_drop(psock->sk, skb);


This is not a dropped skb this was sent via skb_send_sock().

The rest LGTM thanks.
diff mbox series

Patch

diff --git a/net/core/skmsg.c b/net/core/skmsg.c
index 7b2c25038a48..de3af8152d07 100644
--- a/net/core/skmsg.c
+++ b/net/core/skmsg.c
@@ -578,6 +578,12 @@  static int sk_psock_handle_skb(struct sk_psock *psock, struct sk_buff *skb,
 	return sk_psock_skb_ingress(psock, skb);
 }
 
+static void sock_drop(struct sock *sk, struct sk_buff *skb)
+{
+	sk_drops_add(sk, skb);
+	kfree_skb(skb);
+}
+
 static void sk_psock_backlog(struct work_struct *work)
 {
 	struct sk_psock *psock = container_of(work, struct sk_psock, work);
@@ -617,7 +623,7 @@  static void sk_psock_backlog(struct work_struct *work)
 				/* Hard errors break pipe and stop xmit. */
 				sk_psock_report_error(psock, ret ? -ret : EPIPE);
 				sk_psock_clear_state(psock, SK_PSOCK_TX_ENABLED);
-				kfree_skb(skb);
+				sock_drop(psock->sk, skb);
 				goto end;
 			}
 			off += ret;
@@ -625,7 +631,7 @@  static void sk_psock_backlog(struct work_struct *work)
 		} while (len);
 
 		if (!ingress)
-			kfree_skb(skb);
+			sock_drop(psock->sk, skb);
 	}
 end:
 	mutex_unlock(&psock->work_mutex);
@@ -708,7 +714,7 @@  static void __sk_psock_zap_ingress(struct sk_psock *psock)
 
 	while ((skb = skb_dequeue(&psock->ingress_skb)) != NULL) {
 		skb_bpf_redirect_clear(skb);
-		kfree_skb(skb);
+		sock_drop(psock->sk, skb);
 	}
 	__sk_psock_purge_ingress_msg(psock);
 }
@@ -834,7 +840,7 @@  static int sk_psock_skb_redirect(struct sk_psock *from, struct sk_buff *skb)
 	 * return code, but then didn't set a redirect interface.
 	 */
 	if (unlikely(!sk_other)) {
-		kfree_skb(skb);
+		sock_drop(from->sk, skb);
 		return -EIO;
 	}
 	psock_other = sk_psock(sk_other);
@@ -843,13 +849,13 @@  static int sk_psock_skb_redirect(struct sk_psock *from, struct sk_buff *skb)
 	 * a socket that is in this state so we drop the skb.
 	 */
 	if (!psock_other || sock_flag(sk_other, SOCK_DEAD)) {
-		kfree_skb(skb);
+		sock_drop(from->sk, skb);
 		return -EIO;
 	}
 	spin_lock_bh(&psock_other->ingress_lock);
 	if (!sk_psock_test_state(psock_other, SK_PSOCK_TX_ENABLED)) {
 		spin_unlock_bh(&psock_other->ingress_lock);
-		kfree_skb(skb);
+		sock_drop(from->sk, skb);
 		return -EIO;
 	}
 
@@ -938,7 +944,7 @@  static int sk_psock_verdict_apply(struct sk_psock *psock, struct sk_buff *skb,
 	case __SK_DROP:
 	default:
 out_free:
-		kfree_skb(skb);
+		sock_drop(psock->sk, skb);
 	}
 
 	return err;
@@ -973,7 +979,7 @@  static void sk_psock_strp_read(struct strparser *strp, struct sk_buff *skb)
 	sk = strp->sk;
 	psock = sk_psock(sk);
 	if (unlikely(!psock)) {
-		kfree_skb(skb);
+		sock_drop(sk, skb);
 		goto out;
 	}
 	prog = READ_ONCE(psock->progs.stream_verdict);
@@ -1094,7 +1100,7 @@  static int sk_psock_verdict_recv(read_descriptor_t *desc, struct sk_buff *skb,
 	psock = sk_psock(sk);
 	if (unlikely(!psock)) {
 		len = 0;
-		kfree_skb(skb);
+		sock_drop(sk, skb);
 		goto out;
 	}
 	prog = READ_ONCE(psock->progs.stream_verdict);