Commit d25e481b authored by Menglong Dong's avatar Menglong Dong Committed by David S. Miller
Browse files

net: tcp: use tcp_drop_reason() for tcp_data_queue_ofo() 



Replace tcp_drop() used in tcp_data_queue_ofo with tcp_drop_reason().
Following drop reasons are introduced:

SKB_DROP_REASON_TCP_OFOMERGE

Reviewed-by: default avatarMengen Sun <mengensun@tencent.com>
Reviewed-by: default avatarHao Peng <flyingpeng@tencent.com>
Signed-off-by: default avatarMenglong Dong <imagedong@tencent.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a7ec3810

include/linux/skbuff.h

+4 −0
Original line number Diff line number Diff line
@@ -376,6 +376,10 @@ enum skb_drop_reason { 
					 * the right edges of receive

					 * window

					 */

	SKB_DROP_REASON_TCP_OFOMERGE,	/* the data of skb is already in

					 * the ofo queue, corresponding to

					 * LINUX_MIB_TCPOFOMERGE

					 */

	SKB_DROP_REASON_MAX,

};

include/trace/events/skb.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
	EM(SKB_DROP_REASON_TCP_ZEROWINDOW, TCP_ZEROWINDOW)	\

	EM(SKB_DROP_REASON_TCP_OLD_DATA, TCP_OLD_DATA)		\

	EM(SKB_DROP_REASON_TCP_OVERWINDOW, TCP_OVERWINDOW)	\

	EM(SKB_DROP_REASON_TCP_OFOMERGE, TCP_OFOMERGE)		\

	EMe(SKB_DROP_REASON_MAX, MAX)



#undef EM

net/ipv4/tcp_input.c

+6 −4
Original line number Diff line number Diff line
@@ -4779,7 +4779,7 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) 
	if (unlikely(tcp_try_rmem_schedule(sk, skb, skb->truesize))) {

		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFODROP);

		sk->sk_data_ready(sk);

		tcp_drop(sk, skb);

		tcp_drop_reason(sk, skb, SKB_DROP_REASON_PROTO_MEM);

		return;

	}
@@ -4842,7 +4842,8 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) 
				/* All the bits are present. Drop. */

				NET_INC_STATS(sock_net(sk),

					      LINUX_MIB_TCPOFOMERGE);

				tcp_drop(sk, skb);

				tcp_drop_reason(sk, skb,

						SKB_DROP_REASON_TCP_OFOMERGE);

				skb = NULL;

				tcp_dsack_set(sk, seq, end_seq);

				goto add_sack;
@@ -4861,7 +4862,8 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) 
						 TCP_SKB_CB(skb1)->end_seq);

				NET_INC_STATS(sock_net(sk),

					      LINUX_MIB_TCPOFOMERGE);

				tcp_drop(sk, skb1);

				tcp_drop_reason(sk, skb1,

						SKB_DROP_REASON_TCP_OFOMERGE);

				goto merge_right;

			}

		} else if (tcp_ooo_try_coalesce(sk, skb1,
@@ -4889,7 +4891,7 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) 
		tcp_dsack_extend(sk, TCP_SKB_CB(skb1)->seq,

				 TCP_SKB_CB(skb1)->end_seq);

		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFOMERGE);

		tcp_drop(sk, skb1);

		tcp_drop_reason(sk, skb1, SKB_DROP_REASON_TCP_OFOMERGE);

	}

	/* If there is no skb after us, we are the last_skb ! */

	if (!skb1)