diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-11-05 18:20:55 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-05 18:20:55 -0800 |
| commit | 5ea4b122e7ed9aa921fe019a7a0649ba67919ecf (patch) | |
| tree | 763247d6b42ff2e72ee2100d5ec5235daa9967ed /include | |
| parent | Merge branch 'mv88e6xxx-ATU-occupancy-as-devlink-resource' (diff) | |
| parent | net_sched: add TCA_STATS_PKT64 attribute (diff) | |
Merge branch 'net_sched-convert-packet-counters-to-64bit'
Eric Dumazet says:
====================
net_sched: convert packet counters to 64bit
This small patch series add 64bit support for packet counts.
Fact that the counters were still 32bit has been quite painful.
tc -s -d qd sh dev eth0 | head -3
qdisc mq 1: root
Sent 665706335338 bytes 6526520373 pkt (dropped 2441, overlimits 0 requeues 91)
backlog 0b 0p requeues 91
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/gen_stats.h | 6 | ||||
| -rw-r--r-- | include/uapi/linux/gen_stats.h | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h index ca23860adbb9..1424e02cef90 100644 --- a/include/net/gen_stats.h +++ b/include/net/gen_stats.h @@ -7,6 +7,12 @@ #include <linux/rtnetlink.h> #include <linux/pkt_sched.h> +/* Note: this used to be in include/uapi/linux/gen_stats.h */ +struct gnet_stats_basic_packed { + __u64 bytes; + __u64 packets; +}; + struct gnet_stats_basic_cpu { struct gnet_stats_basic_packed bstats; struct u64_stats_sync syncp; diff --git a/include/uapi/linux/gen_stats.h b/include/uapi/linux/gen_stats.h index 065408e16a80..852f234f1fd6 100644 --- a/include/uapi/linux/gen_stats.h +++ b/include/uapi/linux/gen_stats.h @@ -13,6 +13,7 @@ enum { TCA_STATS_RATE_EST64, TCA_STATS_PAD, TCA_STATS_BASIC_HW, + TCA_STATS_PKT64, __TCA_STATS_MAX, }; #define TCA_STATS_MAX (__TCA_STATS_MAX - 1) @@ -26,10 +27,6 @@ struct gnet_stats_basic { __u64 bytes; __u32 packets; }; -struct gnet_stats_basic_packed { - __u64 bytes; - __u32 packets; -} __attribute__ ((packed)); /** * struct gnet_stats_rate_est - rate estimator |