tcp: introduce tcp_clock_ms()

It delivers current TCP time stamp in ms unit, and is used
in place of confusing tcp_time_stamp_raw()

It is the same family than tcp_clock_ns() and tcp_clock_ms().

tcp_time_stamp_raw() will be replaced later for TSval
contexts with a more descriptive name.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 9fc6dc4ba9e2e2be44318d4495ceb19523395b18..3bdf1141f5a2c11e30ad85c68aafd062e7bf548c 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -798,6 +798,11 @@ static inline u64 tcp_clock_us(void)
        return div_u64(tcp_clock_ns(), NSEC_PER_USEC);
 }
 
+static inline u64 tcp_clock_ms(void)
+{
+       return div_u64(tcp_clock_ns(), NSEC_PER_MSEC);
+}
+
 /* 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)
 {

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 56a8d936000f610566e46694fec5ddd1dccd7102..5b034b0356ecbd2b7d2dcafd9caac2b8de5886f1 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3817,10 +3817,8 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info)
        info->tcpi_total_rto = tp->total_rto;
        info->tcpi_total_rto_recoveries = tp->total_rto_recoveries;
        info->tcpi_total_rto_time = tp->total_rto_time;
-       if (tp->rto_stamp) {
-               info->tcpi_total_rto_time += tcp_time_stamp_raw() -
-                                               tp->rto_stamp;
-       }
+       if (tp->rto_stamp)
+               info->tcpi_total_rto_time += tcp_clock_ms() - tp->rto_stamp;
 
        unlock_sock_fast(sk, slow);
 }

diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index 3f87611077ef21edb61f3d6c751c88c515bb4b5b..a9fdba897a28f3a5835a1bd1426f82de0e81a633 100644 (file)
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -567,8 +567,8 @@ struct sock *tcp_create_openreq_child(const struct sock *sk,
                                               USEC_PER_SEC / TCP_TS_HZ);
                newtp->total_rto = req->num_timeout;
                newtp->total_rto_recoveries = 1;
-               newtp->total_rto_time = tcp_time_stamp_raw() -
-                                               newtp->retrans_stamp;
+               newtp->total_rto_time = tcp_clock_ms() -
+                                       newtp->retrans_stamp;
        }
        newtp->tsoffset = treq->ts_off;
 #ifdef CONFIG_TCP_MD5SIG

diff --git a/net/netfilter/nf_synproxy_core.c b/net/netfilter/nf_synproxy_core.c
index 16915f8eef2b16eec7da7ecaaf8b4a4af5dd94e2..467671f2d42f742554d95b017738aaa4ea4c9121 100644 (file)
--- a/net/netfilter/nf_synproxy_core.c
+++ b/net/netfilter/nf_synproxy_core.c
@@ -153,7 +153,7 @@ void synproxy_init_timestamp_cookie(const struct nf_synproxy_info *info,
                                    struct synproxy_options *opts)
 {
        opts->tsecr = opts->tsval;
-       opts->tsval = tcp_time_stamp_raw() & ~0x3f;
+       opts->tsval = tcp_clock_ms() & ~0x3f;
 
        if (opts->options & NF_SYNPROXY_OPT_WSCALE) {
                opts->tsval |= opts->wscale;

diff --git a/tools/testing/selftests/bpf/progs/xdp_synproxy_kern.c b/tools/testing/selftests/bpf/progs/xdp_synproxy_kern.c
index 07d786329105da371dd280868981e8e19ac5f6a8..e959336c7a7304be409ffac7d3a34f64538d5f74 100644 (file)
--- a/tools/testing/selftests/bpf/progs/xdp_synproxy_kern.c
+++ b/tools/testing/selftests/bpf/progs/xdp_synproxy_kern.c
@@ -177,7 +177,7 @@ static __always_inline __u32 tcp_ns_to_ts(__u64 ns)
        return ns / (NSEC_PER_SEC / TCP_TS_HZ);
 }
 
-static __always_inline __u32 tcp_time_stamp_raw(void)
+static __always_inline __u32 tcp_clock_ms(void)
 {
        return tcp_ns_to_ts(tcp_clock_ns());
 }
@@ -274,7 +274,7 @@ static __always_inline bool tscookie_init(struct tcphdr *tcp_header,
        if (!loop_ctx.option_timestamp)
                return false;
 
-       cookie = tcp_time_stamp_raw() & ~TSMASK;
+       cookie = tcp_clock_ms() & ~TSMASK;
        cookie |= loop_ctx.wscale & TS_OPT_WSCALE_MASK;
        if (loop_ctx.option_sack)
                cookie |= TS_OPT_SACK;