Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81166dd6 authored by David S. Miller's avatar David S. Miller
Browse files

tcp: Move timestamps from inetpeer to metrics cache. 



With help from Lin Ming.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 94334d5e

include/net/inetpeer.h

+1 −3
Original line number Diff line number Diff line
@@ -46,15 +46,13 @@ struct inet_peer { 
	};

	/*

	 * Once inet_peer is queued for deletion (refcnt == -1), following fields

	 * are not available: rid, ip_id_count, tcp_ts, tcp_ts_stamp

	 * are not available: rid, ip_id_count

	 * We can share memory with rcu_head to help keep inet_peer small.

	 */

	union {

		struct {

			atomic_t			rid;		/* Frag reception counter */

			atomic_t			ip_id_count;	/* IP ID for the next packet */

			__u32				tcp_ts;

			__u32				tcp_ts_stamp;

		};

		struct rcu_head         rcu;

		struct inet_peer	*gc_next;

include/net/tcp.h

+4 −1
Original line number Diff line number Diff line
@@ -390,7 +390,10 @@ extern void tcp_clear_retrans(struct tcp_sock *tp); 
extern void tcp_update_metrics(struct sock *sk);

extern void tcp_init_metrics(struct sock *sk);

extern void tcp_metrics_init(void);

extern bool tcp_peer_is_proven(struct request_sock *req, struct dst_entry *dst);

extern bool tcp_peer_is_proven(struct request_sock *req, struct dst_entry *dst, bool paws_check);

extern bool tcp_remember_stamp(struct sock *sk);

extern bool tcp_tw_remember_stamp(struct inet_timewait_sock *tw);

extern void tcp_fetch_timewait_stamp(struct sock *sk, struct dst_entry *dst);

extern void tcp_disable_fack(struct tcp_sock *tp);

extern void tcp_close(struct sock *sk, long timeout);

extern void tcp_init_sock(struct sock *sk);

net/ipv4/inetpeer.c

+0 −1
Original line number Diff line number Diff line
@@ -508,7 +508,6 @@ struct inet_peer *inet_getpeer(struct inet_peer_base *base, 
				(daddr->family == AF_INET) ?

					secure_ip_id(daddr->addr.a4) :

					secure_ipv6_id(daddr->addr.a6));

		p->tcp_ts_stamp = 0;

		p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;

		p->rate_tokens = 0;

		p->rate_last = 0;

net/ipv4/route.c

+2 −6
Original line number Diff line number Diff line
@@ -2846,7 +2846,7 @@ static int rt_fill_info(struct net *net, 
	struct rtmsg *r;

	struct nlmsghdr *nlh;

	unsigned long expires = 0;

	u32 id = 0, ts = 0, tsage = 0, error;

	u32 id = 0, error;



	nlh = nlmsg_put(skb, pid, seq, event, sizeof(*r), flags);

	if (nlh == NULL)
@@ -2903,10 +2903,6 @@ static int rt_fill_info(struct net *net, 
		const struct inet_peer *peer = rt_peer_ptr(rt);

		inet_peer_refcheck(peer);

		id = atomic_read(&peer->ip_id_count) & 0xffff;

		if (peer->tcp_ts_stamp) {

			ts = peer->tcp_ts;

			tsage = get_seconds() - peer->tcp_ts_stamp;

		}

		expires = ACCESS_ONCE(peer->pmtu_expires);

		if (expires) {

			if (time_before(jiffies, expires))
@@ -2942,7 +2938,7 @@ static int rt_fill_info(struct net *net, 
				goto nla_put_failure;

	}



	if (rtnl_put_cacheinfo(skb, &rt->dst, id, ts, tsage,

	if (rtnl_put_cacheinfo(skb, &rt->dst, id, 0, 0,

			       expires, error) < 0)

		goto nla_put_failure;

net/ipv4/tcp_ipv4.c

+5 −25
Original line number Diff line number Diff line
@@ -209,22 +209,8 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	}



	if (tcp_death_row.sysctl_tw_recycle &&

	    !tp->rx_opt.ts_recent_stamp && fl4->daddr == daddr) {

		struct inet_peer *peer = rt_get_peer(rt, fl4->daddr);

		/*

		 * VJ's idea. We save last timestamp seen from

		 * the destination in peer table, when entering state

		 * TIME-WAIT * and initialize rx_opt.ts_recent from it,

		 * when trying new connection.

		 */

		if (peer) {

			inet_peer_refcheck(peer);

			if ((u32)get_seconds() - peer->tcp_ts_stamp <= TCP_PAWS_MSL) {

				tp->rx_opt.ts_recent_stamp = peer->tcp_ts_stamp;

				tp->rx_opt.ts_recent = peer->tcp_ts;

			}

		}

	}

	    !tp->rx_opt.ts_recent_stamp && fl4->daddr == daddr)

		tcp_fetch_timewait_stamp(sk, &rt->dst);



	inet->inet_dport = usin->sin_port;

	inet->inet_daddr = daddr;
@@ -1375,7 +1361,6 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
		isn = cookie_v4_init_sequence(sk, skb, &req->mss);

		req->cookie_ts = tmp_opt.tstamp_ok;

	} else if (!isn) {

		struct inet_peer *peer = NULL;

		struct flowi4 fl4;



		/* VJ's idea. We save last timestamp seen
@@ -1390,12 +1375,8 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
		if (tmp_opt.saw_tstamp &&

		    tcp_death_row.sysctl_tw_recycle &&

		    (dst = inet_csk_route_req(sk, &fl4, req, want_cookie)) != NULL &&

		    fl4.daddr == saddr &&

		    (peer = rt_get_peer((struct rtable *)dst, fl4.daddr)) != NULL) {

			inet_peer_refcheck(peer);

			if ((u32)get_seconds() - peer->tcp_ts_stamp < TCP_PAWS_MSL &&

			    (s32)(peer->tcp_ts - req->ts_recent) >

							TCP_PAWS_WINDOW) {

		    fl4.daddr == saddr) {

			if (!tcp_peer_is_proven(req, dst, true)) {

				NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_PAWSPASSIVEREJECTED);

				goto drop_and_release;

			}
@@ -1404,8 +1385,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
		else if (!sysctl_tcp_syncookies &&

			 (sysctl_max_syn_backlog - inet_csk_reqsk_queue_len(sk) <

			  (sysctl_max_syn_backlog >> 2)) &&

			 (!peer || !peer->tcp_ts_stamp) &&

			 !tcp_peer_is_proven(req, dst)) {

			 !tcp_peer_is_proven(req, dst, false)) {

			/* Without syncookies last quarter of

			 * backlog is filled with destinations,

			 * proven to be alive.