tc: support TCA_STATS_RATE_EST64

Since linux-3.11, rate estimator can provide TCA_STATS_RATE_EST64
when rate (bytes per second) is above 2^32 (~34 Mbits)

Change tc to use this attribute for high rates.

Signed-off-by: Eric Dumazet <edumazet@google.com>

diff --git a/tc/tc_util.c b/tc/tc_util.c
index 8114c97c4143e307c04c722b6b847e6fae928d5c..be3ed071b321366db403f1d666814e734705e79b 100644 (file)
--- a/tc/tc_util.c
+++ b/tc/tc_util.c
@@ -171,20 +171,24 @@ int get_rate(unsigned *rate, const char *str)
        return 0;
 }
 
-void print_rate(char *buf, int len, __u32 rate)
+void print_rate(char *buf, int len, __u64 rate)
 {
        double tmp = (double)rate*8;
        extern int use_iec;
 
        if (use_iec) {
-               if (tmp >= 1000.0*1024.0*1024.0)
+               if (tmp >= 1000.0*1024.0*1024.0*1024.0)
+                       snprintf(buf, len, "%.0fGibit", tmp/(1024.0*1024.0*1024.0));
+               else if (tmp >= 1000.0*1024.0*1024.0)
                        snprintf(buf, len, "%.0fMibit", tmp/(1024.0*1024.0));
                else if (tmp >= 1000.0*1024)
                        snprintf(buf, len, "%.0fKibit", tmp/1024);
                else
                        snprintf(buf, len, "%.0fbit", tmp);
        } else {
-               if (tmp >= 1000.0*1000000.0)
+               if (tmp >= 1000.0*1000000000.0)
+                       snprintf(buf, len, "%.0fGbit", tmp/1000000000.0);
+               else if (tmp >= 1000.0*1000000.0)
                        snprintf(buf, len, "%.0fMbit", tmp/1000000.0);
                else if (tmp >= 1000.0 * 1000.0)
                        snprintf(buf, len, "%.0fKbit", tmp/1000.0);
@@ -193,7 +197,7 @@ void print_rate(char *buf, int len, __u32 rate)
        }
 }
 
-char * sprint_rate(__u32 rate, char *buf)
+char * sprint_rate(__u64 rate, char *buf)
 {
        print_rate(buf, SPRINT_BSIZE-1, rate);
        return buf;
@@ -460,9 +464,19 @@ void print_tcstats2_attr(FILE *fp, struct rtattr *rta, char *prefix, struct rtat
                        q.drops, q.overlimits, q.requeues);
        }
 
-       if (tbs[TCA_STATS_RATE_EST]) {
+       if (tbs[TCA_STATS_RATE_EST64]) {
+               struct gnet_stats_rate_est64 re = {0};
+
+               memcpy(&re, RTA_DATA(tbs[TCA_STATS_RATE_EST64]),
+                      MIN(RTA_PAYLOAD(tbs[TCA_STATS_RATE_EST64]),
+                          sizeof(re)));
+               fprintf(fp, "\n%srate %s %llupps ",
+                       prefix, sprint_rate(re.bps, b1), re.pps);
+       } else if (tbs[TCA_STATS_RATE_EST]) {
                struct gnet_stats_rate_est re = {0};
-               memcpy(&re, RTA_DATA(tbs[TCA_STATS_RATE_EST]), MIN(RTA_PAYLOAD(tbs[TCA_STATS_RATE_EST]), sizeof(re)));
+
+               memcpy(&re, RTA_DATA(tbs[TCA_STATS_RATE_EST]),
+                      MIN(RTA_PAYLOAD(tbs[TCA_STATS_RATE_EST]), sizeof(re)));
                fprintf(fp, "\n%srate %s %upps ",
                        prefix, sprint_rate(re.bps, b1), re.pps);
        }

diff --git a/tc/tc_util.h b/tc/tc_util.h
index 4f544363393b9d17e55f86bb828bbc987f444d6a..7c3709f5066cd9138456b7f37d443bca1d3c297d 100644 (file)
--- a/tc/tc_util.h
+++ b/tc/tc_util.h
@@ -63,12 +63,12 @@ extern int get_size_and_cell(unsigned *size, int *cell_log, char *str);
 extern int get_time(unsigned *time, const char *str);
 extern int get_linklayer(unsigned *val, const char *arg);
 
-extern void print_rate(char *buf, int len, __u32 rate);
+extern void print_rate(char *buf, int len, __u64 rate);
 extern void print_size(char *buf, int len, __u32 size);
 extern void print_qdisc_handle(char *buf, int len, __u32 h);
 extern void print_time(char *buf, int len, __u32 time);
 extern void print_linklayer(char *buf, int len, unsigned linklayer);
-extern char * sprint_rate(__u32 rate, char *buf);
+extern char * sprint_rate(__u64 rate, char *buf);
 extern char * sprint_size(__u32 size, char *buf);
 extern char * sprint_qdisc_handle(__u32 h, char *buf);
 extern char * sprint_tc_classid(__u32 h, char *buf);