linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next 1/2] tcp: call tcp_drop() in tcp collapse
@ 2018-07-28  3:01 Yafang Shao
  2018-07-28  3:01 ` [PATCH net-next 2/2] tcp: propagate GSO to the new skb built " Yafang Shao
  2018-07-28  3:06 ` [PATCH net-next 1/2] tcp: call tcp_drop() " Eric Dumazet
  0 siblings, 2 replies; 14+ messages in thread
From: Yafang Shao @ 2018-07-28  3:01 UTC (permalink / raw)
  To: edumazet, davem; +Cc: netdev, linux-kernel, Yafang Shao

When this SKB is dropped, we should add the counter sk_drops.
That could help us better tracking this behavior.

Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
---
 net/ipv4/tcp_input.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index d51fa35..90f83eb 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4802,7 +4802,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
 	else
 		rb_erase(&skb->rbnode, root);
 
-	__kfree_skb(skb);
+	tcp_drop(sk, skb);
 	NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRCVCOLLAPSED);
 
 	return next;
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2018-07-31  0:49 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-28  3:01 [PATCH net-next 1/2] tcp: call tcp_drop() in tcp collapse Yafang Shao
2018-07-28  3:01 ` [PATCH net-next 2/2] tcp: propagate GSO to the new skb built " Yafang Shao
2018-07-28  3:13   ` Eric Dumazet
2018-07-28  3:22     ` Yafang Shao
2018-07-28  3:06 ` [PATCH net-next 1/2] tcp: call tcp_drop() " Eric Dumazet
2018-07-28  3:34   ` Yafang Shao
2018-07-28  3:38     ` Eric Dumazet
2018-07-28  7:42       ` Yafang Shao
2018-07-28 16:28         ` Eric Dumazet
2018-07-30  2:06           ` Yafang Shao
2018-07-30  2:27             ` Eric Dumazet
2018-07-30  5:40               ` Yafang Shao
2018-07-30 15:56                 ` Eric Dumazet
2018-07-31  0:48                   ` Yafang Shao

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).