Commit b9825695 authored by Jason Xing's avatar Jason Xing Committed by David S. Miller
Browse files

tcp: make the dropreason really work when calling tcp_rcv_state_process() 



Update three callers including both ipv4 and ipv6 and let the dropreason
mechanism work in reality.

Signed-off-by: default avatarJason Xing <kernelxing@tencent.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7d6ed9af

include/net/tcp.h

+2 −2
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ enum tcp_tw_status tcp_timewait_state_process(struct inet_timewait_sock *tw, 
struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb,

			   struct request_sock *req, bool fastopen,

			   bool *lost_race);

int tcp_child_process(struct sock *parent, struct sock *child,

enum skb_drop_reason tcp_child_process(struct sock *parent, struct sock *child,

				       struct sk_buff *skb);

void tcp_enter_loss(struct sock *sk);

void tcp_cwnd_reduction(struct sock *sk, int newly_acked_sacked, int newly_lost, int flag);

net/ipv4/tcp_ipv4.c

+2 −1
Original line number Diff line number Diff line
@@ -1926,7 +1926,8 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) 
	} else

		sock_rps_save_rxhash(sk, skb);



	if (tcp_rcv_state_process(sk, skb)) {

	reason = tcp_rcv_state_process(sk, skb);

	if (reason) {

		rsk = sk;

		goto reset;

	}

net/ipv4/tcp_minisocks.c

+5 −5
Original line number Diff line number Diff line
@@ -911,11 +911,11 @@ EXPORT_SYMBOL(tcp_check_req); 
 * be created.

 */



int tcp_child_process(struct sock *parent, struct sock *child,

enum skb_drop_reason tcp_child_process(struct sock *parent, struct sock *child,

				       struct sk_buff *skb)

	__releases(&((child)->sk_lock.slock))

{

	int ret = 0;

	enum skb_drop_reason reason = SKB_NOT_DROPPED_YET;

	int state = child->sk_state;



	/* record sk_napi_id and sk_rx_queue_mapping of child. */
@@ -923,7 +923,7 @@ int tcp_child_process(struct sock *parent, struct sock *child, 


	tcp_segs_in(tcp_sk(child), skb);

	if (!sock_owned_by_user(child)) {

		ret = tcp_rcv_state_process(child, skb);

		reason = tcp_rcv_state_process(child, skb);

		/* Wakeup parent, send SIGIO */

		if (state == TCP_SYN_RECV && child->sk_state != state)

			parent->sk_data_ready(parent);
@@ -937,6 +937,6 @@ int tcp_child_process(struct sock *parent, struct sock *child, 


	bh_unlock_sock(child);

	sock_put(child);

	return ret;

	return reason;

}

EXPORT_SYMBOL(tcp_child_process);

net/ipv6/tcp_ipv6.c

+2 −1
Original line number Diff line number Diff line
@@ -1663,7 +1663,8 @@ int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) 
	} else

		sock_rps_save_rxhash(sk, skb);



	if (tcp_rcv_state_process(sk, skb))

	reason = tcp_rcv_state_process(sk, skb);

	if (reason)

		goto reset;

	if (opt_skb)

		goto ipv6_pktoptions;