Commit 9d0c00f5 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: rename tcp_time_stamp() to tcp_time_stamp_ts() 



This helper returns a TSval from a TCP socket.

It currently calls tcp_time_stamp_ms() but will soon
be able to return a usec based TSval, depending
on an upcoming tp->tcp_usec_ts field.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 003e07a1

include/net/tcp.h

+4 −5
Original line number Diff line number Diff line
@@ -813,15 +813,14 @@ static inline u32 tcp_clock_ts(bool usec_ts) 
	return usec_ts ? tcp_clock_us() : tcp_clock_ms();

}



/* This should only be used in contexts where tp->tcp_mstamp is up to date */

static inline u32 tcp_time_stamp(const struct tcp_sock *tp)

static inline u32 tcp_time_stamp_ms(const struct tcp_sock *tp)

{

	return div_u64(tp->tcp_mstamp, USEC_PER_SEC / TCP_TS_HZ);

	return div_u64(tp->tcp_mstamp, USEC_PER_MSEC);

}



static inline u32 tcp_time_stamp_ms(const struct tcp_sock *tp)

static inline u32 tcp_time_stamp_ts(const struct tcp_sock *tp)

{

	return div_u64(tp->tcp_mstamp, USEC_PER_MSEC);

	return tcp_time_stamp_ms(tp);

}



void tcp_mstamp_refresh(struct tcp_sock *tp);

net/ipv4/tcp_input.c

+3 −3
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ static inline void tcp_rcv_rtt_measure_ts(struct sock *sk, 


	if (TCP_SKB_CB(skb)->end_seq -

	    TCP_SKB_CB(skb)->seq >= inet_csk(sk)->icsk_ack.rcv_mss) {

		u32 delta = tcp_time_stamp(tp) - tp->rx_opt.rcv_tsecr;

		u32 delta = tcp_time_stamp_ts(tp) - tp->rx_opt.rcv_tsecr;

		u32 delta_us;



		if (likely(delta < INT_MAX / (USEC_PER_SEC / TCP_TS_HZ))) {
@@ -3148,7 +3148,7 @@ static bool tcp_ack_update_rtt(struct sock *sk, const int flag, 
	 */

	if (seq_rtt_us < 0 && tp->rx_opt.saw_tstamp && tp->rx_opt.rcv_tsecr &&

	    flag & FLAG_ACKED) {

		u32 delta = tcp_time_stamp(tp) - tp->rx_opt.rcv_tsecr;

		u32 delta = tcp_time_stamp_ts(tp) - tp->rx_opt.rcv_tsecr;



		if (likely(delta < INT_MAX / (USEC_PER_SEC / TCP_TS_HZ))) {

			if (!delta)
@@ -6293,7 +6293,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, 


		if (tp->rx_opt.saw_tstamp && tp->rx_opt.rcv_tsecr &&

		    !between(tp->rx_opt.rcv_tsecr, tp->retrans_stamp,

			     tcp_time_stamp(tp))) {

			     tcp_time_stamp_ts(tp))) {

			NET_INC_STATS(sock_net(sk),

					LINUX_MIB_PAWSACTIVEREJECTED);

			goto reset_and_undo;

net/ipv4/tcp_lp.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static void tcp_lp_pkts_acked(struct sock *sk, const struct ack_sample *sample) 
{

	struct tcp_sock *tp = tcp_sk(sk);

	struct lp *lp = inet_csk_ca(sk);

	u32 now = tcp_time_stamp(tp);

	u32 now = tcp_time_stamp_ts(tp);

	u32 delta;



	if (sample->rtt_us > 0)

net/ipv4/tcp_output.c

+1 −1
Original line number Diff line number Diff line
@@ -3961,7 +3961,7 @@ int tcp_connect(struct sock *sk) 


	tcp_init_nondata_skb(buff, tp->write_seq++, TCPHDR_SYN);

	tcp_mstamp_refresh(tp);

	tp->retrans_stamp = tcp_time_stamp(tp);

	tp->retrans_stamp = tcp_time_stamp_ts(tp);

	tcp_connect_queue_skb(sk, buff);

	tcp_ecn_send_syn(sk, buff);

	tcp_rbtree_insert(&sk->tcp_rtx_queue, buff);

net/ipv4/tcp_timer.c

+5 −5
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static u32 tcp_clamp_rto_to_user_timeout(const struct sock *sk) 
	user_timeout = READ_ONCE(icsk->icsk_user_timeout);

	if (!user_timeout)

		return icsk->icsk_rto;

	elapsed = tcp_time_stamp(tcp_sk(sk)) - start_ts;

	elapsed = tcp_time_stamp_ts(tcp_sk(sk)) - start_ts;

	remaining = user_timeout - elapsed;

	if (remaining <= 0)

		return 1; /* user timeout has passed; fire ASAP */
@@ -226,7 +226,7 @@ static bool retransmits_timed_out(struct sock *sk, 
		timeout = tcp_model_timeout(sk, boundary, rto_base);

	}



	return (s32)(tcp_time_stamp(tcp_sk(sk)) - start_ts - timeout) >= 0;

	return (s32)(tcp_time_stamp_ts(tcp_sk(sk)) - start_ts - timeout) >= 0;

}



/* A write timeout has occurred. Process the after effects. */
@@ -462,7 +462,7 @@ static void tcp_fastopen_synack_timer(struct sock *sk, struct request_sock *req) 
	req->num_timeout++;

	tcp_update_rto_stats(sk);

	if (!tp->retrans_stamp)

		tp->retrans_stamp = tcp_time_stamp(tp);

		tp->retrans_stamp = tcp_time_stamp_ts(tp);

	inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,

			  req->timeout << req->num_timeout, TCP_RTO_MAX);

}
@@ -478,7 +478,7 @@ static bool tcp_rtx_probe0_timed_out(const struct sock *sk, 
	if (rcv_delta <= timeout)

		return false;



	rtx_delta = (u32)msecs_to_jiffies(tcp_time_stamp(tp) -

	rtx_delta = (u32)msecs_to_jiffies(tcp_time_stamp_ts(tp) -

			(tp->retrans_stamp ?: tcp_skb_timestamp_ts(false, skb)));



	return rtx_delta > timeout;
@@ -534,7 +534,7 @@ void tcp_retransmit_timer(struct sock *sk) 
		struct inet_sock *inet = inet_sk(sk);

		u32 rtx_delta;



		rtx_delta = tcp_time_stamp(tp) - (tp->retrans_stamp ?: tcp_skb_timestamp_ts(false, skb));

		rtx_delta = tcp_time_stamp_ts(tp) - (tp->retrans_stamp ?: tcp_skb_timestamp_ts(false, skb));

		if (sk->sk_family == AF_INET) {

			net_dbg_ratelimited("Probing zero-window on %pI4:%u/%u, seq=%u:%u, recv %ums ago, lasting %ums\n",

				&inet->inet_daddr, ntohs(inet->inet_dport),