Skip to content

Commit ca22445

Browse files
kuba-moodavem330
kuba-moo
authored and
davem330
committed
ethtool: add interface to read standard MAC stats
Most of the MAC statistics are included in struct rtnl_link_stats64, but some fields are aggregated. Besides it's good to expose these clearly hardware stats separately. Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent f09ea6f commit ca22445

6 files changed

Lines changed: 182 additions & 0 deletions

File tree

‎include/linux/ethtool.h‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,34 @@ static inline void ethtool_stats_init(u64 *stats, unsigned int n)
250250
stats[n] = ETHTOOL_STAT_NOT_SET;
251251
}
252252

253+
/* Basic IEEE 802.3 MAC statistics (30.3.1.1.*), not otherwise exposed
254+
* via a more targeted API.
255+
*/
256+
struct ethtool_eth_mac_stats {
257+
u64 FramesTransmittedOK;
258+
u64 SingleCollisionFrames;
259+
u64 MultipleCollisionFrames;
260+
u64 FramesReceivedOK;
261+
u64 FrameCheckSequenceErrors;
262+
u64 AlignmentErrors;
263+
u64 OctetsTransmittedOK;
264+
u64 FramesWithDeferredXmissions;
265+
u64 LateCollisions;
266+
u64 FramesAbortedDueToXSColls;
267+
u64 FramesLostDueToIntMACXmitError;
268+
u64 CarrierSenseErrors;
269+
u64 OctetsReceivedOK;
270+
u64 FramesLostDueToIntMACRcvError;
271+
u64 MulticastFramesXmittedOK;
272+
u64 BroadcastFramesXmittedOK;
273+
u64 FramesWithExcessiveDeferral;
274+
u64 MulticastFramesReceivedOK;
275+
u64 BroadcastFramesReceivedOK;
276+
u64 InRangeLengthErrors;
277+
u64 OutOfRangeLengthField;
278+
u64 FrameTooLongErrors;
279+
};
280+
253281
/* Basic IEEE 802.3 PHY statistics (30.3.2.1.*), not otherwise exposed
254282
* via a more targeted API.
255283
*/
@@ -495,6 +523,7 @@ struct ethtool_module_eeprom {
495523
* specified page. Returns a negative error code or the amount of bytes
496524
* read.
497525
* @get_eth_phy_stats: Query some of the IEEE 802.3 PHY statistics.
526+
* @get_eth_mac_stats: Query some of the IEEE 802.3 MAC statistics.
498527
*
499528
* All operations are optional (i.e. the function pointer may be set
500529
* to %NULL) and callers must take this into account. Callers must
@@ -607,6 +636,8 @@ struct ethtool_ops {
607636
struct netlink_ext_ack *extack);
608637
void (*get_eth_phy_stats)(struct net_device *dev,
609638
struct ethtool_eth_phy_stats *phy_stats);
639+
void (*get_eth_mac_stats)(struct net_device *dev,
640+
struct ethtool_eth_mac_stats *mac_stats);
610641
};
611642

612643
int ethtool_check_ops(const struct ethtool_ops *ops);

‎include/uapi/linux/ethtool.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,7 @@ enum ethtool_link_ext_substate_cable_issue {
671671
* @ETH_SS_UDP_TUNNEL_TYPES: UDP tunnel types
672672
* @ETH_SS_STATS_STD: standardized stats
673673
* @ETH_SS_STATS_ETH_PHY: names of IEEE 802.3 PHY statistics
674+
* @ETH_SS_STATS_ETH_MAC: names of IEEE 802.3 MAC statistics
674675
*
675676
* @ETH_SS_COUNT: number of defined string sets
676677
*/
@@ -693,6 +694,7 @@ enum ethtool_stringset {
693694
ETH_SS_UDP_TUNNEL_TYPES,
694695
ETH_SS_STATS_STD,
695696
ETH_SS_STATS_ETH_PHY,
697+
ETH_SS_STATS_ETH_MAC,
696698

697699
/* add new constants above here */
698700
ETH_SS_COUNT

‎include/uapi/linux/ethtool_netlink.h‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,7 @@ enum {
698698

699699
enum {
700700
ETHTOOL_STATS_ETH_PHY,
701+
ETHTOOL_STATS_ETH_MAC,
701702

702703
/* add new constants above here */
703704
__ETHTOOL_STATS_CNT
@@ -726,6 +727,58 @@ enum {
726727
ETHTOOL_A_STATS_ETH_PHY_MAX = (__ETHTOOL_A_STATS_ETH_PHY_CNT - 1)
727728
};
728729

730+
enum {
731+
/* 30.3.1.1.2 aFramesTransmittedOK */
732+
ETHTOOL_A_STATS_ETH_MAC_2_TX_PKT,
733+
/* 30.3.1.1.3 aSingleCollisionFrames */
734+
ETHTOOL_A_STATS_ETH_MAC_3_SINGLE_COL,
735+
/* 30.3.1.1.4 aMultipleCollisionFrames */
736+
ETHTOOL_A_STATS_ETH_MAC_4_MULTI_COL,
737+
/* 30.3.1.1.5 aFramesReceivedOK */
738+
ETHTOOL_A_STATS_ETH_MAC_5_RX_PKT,
739+
/* 30.3.1.1.6 aFrameCheckSequenceErrors */
740+
ETHTOOL_A_STATS_ETH_MAC_6_FCS_ERR,
741+
/* 30.3.1.1.7 aAlignmentErrors */
742+
ETHTOOL_A_STATS_ETH_MAC_7_ALIGN_ERR,
743+
/* 30.3.1.1.8 aOctetsTransmittedOK */
744+
ETHTOOL_A_STATS_ETH_MAC_8_TX_BYTES,
745+
/* 30.3.1.1.9 aFramesWithDeferredXmissions */
746+
ETHTOOL_A_STATS_ETH_MAC_9_TX_DEFER,
747+
/* 30.3.1.1.10 aLateCollisions */
748+
ETHTOOL_A_STATS_ETH_MAC_10_LATE_COL,
749+
/* 30.3.1.1.11 aFramesAbortedDueToXSColls */
750+
ETHTOOL_A_STATS_ETH_MAC_11_XS_COL,
751+
/* 30.3.1.1.12 aFramesLostDueToIntMACXmitError */
752+
ETHTOOL_A_STATS_ETH_MAC_12_TX_INT_ERR,
753+
/* 30.3.1.1.13 aCarrierSenseErrors */
754+
ETHTOOL_A_STATS_ETH_MAC_13_CS_ERR,
755+
/* 30.3.1.1.14 aOctetsReceivedOK */
756+
ETHTOOL_A_STATS_ETH_MAC_14_RX_BYTES,
757+
/* 30.3.1.1.15 aFramesLostDueToIntMACRcvError */
758+
ETHTOOL_A_STATS_ETH_MAC_15_RX_INT_ERR,
759+
760+
/* 30.3.1.1.18 aMulticastFramesXmittedOK */
761+
ETHTOOL_A_STATS_ETH_MAC_18_TX_MCAST,
762+
/* 30.3.1.1.19 aBroadcastFramesXmittedOK */
763+
ETHTOOL_A_STATS_ETH_MAC_19_TX_BCAST,
764+
/* 30.3.1.1.20 aFramesWithExcessiveDeferral */
765+
ETHTOOL_A_STATS_ETH_MAC_20_XS_DEFER,
766+
/* 30.3.1.1.21 aMulticastFramesReceivedOK */
767+
ETHTOOL_A_STATS_ETH_MAC_21_RX_MCAST,
768+
/* 30.3.1.1.22 aBroadcastFramesReceivedOK */
769+
ETHTOOL_A_STATS_ETH_MAC_22_RX_BCAST,
770+
/* 30.3.1.1.23 aInRangeLengthErrors */
771+
ETHTOOL_A_STATS_ETH_MAC_23_IR_LEN_ERR,
772+
/* 30.3.1.1.24 aOutOfRangeLengthField */
773+
ETHTOOL_A_STATS_ETH_MAC_24_OOR_LEN,
774+
/* 30.3.1.1.25 aFrameTooLongErrors */
775+
ETHTOOL_A_STATS_ETH_MAC_25_TOO_LONG_ERR,
776+
777+
/* add new constants above here */
778+
__ETHTOOL_A_STATS_ETH_MAC_CNT,
779+
ETHTOOL_A_STATS_ETH_MAC_MAX = (__ETHTOOL_A_STATS_ETH_MAC_CNT - 1)
780+
};
781+
729782
/* generic netlink info */
730783
#define ETHTOOL_GENL_NAME "ethtool"
731784
#define ETHTOOL_GENL_VERSION 1

‎net/ethtool/netlink.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,5 +403,6 @@ int ethnl_set_fec(struct sk_buff *skb, struct genl_info *info);
403403

404404
extern const char stats_std_names[__ETHTOOL_STATS_CNT][ETH_GSTRING_LEN];
405405
extern const char stats_eth_phy_names[__ETHTOOL_A_STATS_ETH_PHY_CNT][ETH_GSTRING_LEN];
406+
extern const char stats_eth_mac_names[__ETHTOOL_A_STATS_ETH_MAC_CNT][ETH_GSTRING_LEN];
406407

407408
#endif /* _NET_ETHTOOL_NETLINK_H */

‎net/ethtool/stats.c‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,46 @@ struct stats_req_info {
1515
struct stats_reply_data {
1616
struct ethnl_reply_data base;
1717
struct ethtool_eth_phy_stats phy_stats;
18+
struct ethtool_eth_mac_stats mac_stats;
1819
};
1920

2021
#define STATS_REPDATA(__reply_base) \
2122
container_of(__reply_base, struct stats_reply_data, base)
2223

2324
const char stats_std_names[__ETHTOOL_STATS_CNT][ETH_GSTRING_LEN] = {
2425
[ETHTOOL_STATS_ETH_PHY] = "eth-phy",
26+
[ETHTOOL_STATS_ETH_MAC] = "eth-mac",
2527
};
2628

2729
const char stats_eth_phy_names[__ETHTOOL_A_STATS_ETH_PHY_CNT][ETH_GSTRING_LEN] = {
2830
[ETHTOOL_A_STATS_ETH_PHY_5_SYM_ERR] = "SymbolErrorDuringCarrier",
2931
};
3032

33+
const char stats_eth_mac_names[__ETHTOOL_A_STATS_ETH_MAC_CNT][ETH_GSTRING_LEN] = {
34+
[ETHTOOL_A_STATS_ETH_MAC_2_TX_PKT] = "FramesTransmittedOK",
35+
[ETHTOOL_A_STATS_ETH_MAC_3_SINGLE_COL] = "SingleCollisionFrames",
36+
[ETHTOOL_A_STATS_ETH_MAC_4_MULTI_COL] = "MultipleCollisionFrames",
37+
[ETHTOOL_A_STATS_ETH_MAC_5_RX_PKT] = "FramesReceivedOK",
38+
[ETHTOOL_A_STATS_ETH_MAC_6_FCS_ERR] = "FrameCheckSequenceErrors",
39+
[ETHTOOL_A_STATS_ETH_MAC_7_ALIGN_ERR] = "AlignmentErrors",
40+
[ETHTOOL_A_STATS_ETH_MAC_8_TX_BYTES] = "OctetsTransmittedOK",
41+
[ETHTOOL_A_STATS_ETH_MAC_9_TX_DEFER] = "FramesWithDeferredXmissions",
42+
[ETHTOOL_A_STATS_ETH_MAC_10_LATE_COL] = "LateCollisions",
43+
[ETHTOOL_A_STATS_ETH_MAC_11_XS_COL] = "FramesAbortedDueToXSColls",
44+
[ETHTOOL_A_STATS_ETH_MAC_12_TX_INT_ERR] = "FramesLostDueToIntMACXmitError",
45+
[ETHTOOL_A_STATS_ETH_MAC_13_CS_ERR] = "CarrierSenseErrors",
46+
[ETHTOOL_A_STATS_ETH_MAC_14_RX_BYTES] = "OctetsReceivedOK",
47+
[ETHTOOL_A_STATS_ETH_MAC_15_RX_INT_ERR] = "FramesLostDueToIntMACRcvError",
48+
[ETHTOOL_A_STATS_ETH_MAC_18_TX_MCAST] = "MulticastFramesXmittedOK",
49+
[ETHTOOL_A_STATS_ETH_MAC_19_TX_BCAST] = "BroadcastFramesXmittedOK",
50+
[ETHTOOL_A_STATS_ETH_MAC_20_XS_DEFER] = "FramesWithExcessiveDeferral",
51+
[ETHTOOL_A_STATS_ETH_MAC_21_RX_MCAST] = "MulticastFramesReceivedOK",
52+
[ETHTOOL_A_STATS_ETH_MAC_22_RX_BCAST] = "BroadcastFramesReceivedOK",
53+
[ETHTOOL_A_STATS_ETH_MAC_23_IR_LEN_ERR] = "InRangeLengthErrors",
54+
[ETHTOOL_A_STATS_ETH_MAC_24_OOR_LEN] = "OutOfRangeLengthField",
55+
[ETHTOOL_A_STATS_ETH_MAC_25_TOO_LONG_ERR] = "FrameTooLongErrors",
56+
};
57+
3158
const struct nla_policy ethnl_stats_get_policy[ETHTOOL_A_STATS_GROUPS + 1] = {
3259
[ETHTOOL_A_STATS_HEADER] =
3360
NLA_POLICY_NESTED(ethnl_header_policy),
@@ -70,10 +97,14 @@ static int stats_prepare_data(const struct ethnl_req_info *req_base,
7097
return ret;
7198

7299
memset(&data->phy_stats, 0xff, sizeof(data->phy_stats));
100+
memset(&data->mac_stats, 0xff, sizeof(data->mac_stats));
73101

74102
if (test_bit(ETHTOOL_STATS_ETH_PHY, req_info->stat_mask) &&
75103
dev->ethtool_ops->get_eth_phy_stats)
76104
dev->ethtool_ops->get_eth_phy_stats(dev, &data->phy_stats);
105+
if (test_bit(ETHTOOL_STATS_ETH_MAC, req_info->stat_mask) &&
106+
dev->ethtool_ops->get_eth_mac_stats)
107+
dev->ethtool_ops->get_eth_mac_stats(dev, &data->mac_stats);
77108

78109
ethnl_ops_complete(dev);
79110
return 0;
@@ -90,6 +121,10 @@ static int stats_reply_size(const struct ethnl_req_info *req_base,
90121
n_stats += sizeof(struct ethtool_eth_phy_stats) / sizeof(u64);
91122
n_grps++;
92123
}
124+
if (test_bit(ETHTOOL_STATS_ETH_MAC, req_info->stat_mask)) {
125+
n_stats += sizeof(struct ethtool_eth_mac_stats) / sizeof(u64);
126+
n_grps++;
127+
}
93128

94129
len += n_grps * (nla_total_size(0) + /* _A_STATS_GRP */
95130
nla_total_size(4) + /* _A_STATS_GRP_ID */
@@ -143,6 +178,57 @@ static int stats_put_phy_stats(struct sk_buff *skb,
143178
return 0;
144179
}
145180

181+
static int stats_put_mac_stats(struct sk_buff *skb,
182+
const struct stats_reply_data *data)
183+
{
184+
if (stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_2_TX_PKT,
185+
data->mac_stats.FramesTransmittedOK) ||
186+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_3_SINGLE_COL,
187+
data->mac_stats.SingleCollisionFrames) ||
188+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_4_MULTI_COL,
189+
data->mac_stats.MultipleCollisionFrames) ||
190+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_5_RX_PKT,
191+
data->mac_stats.FramesReceivedOK) ||
192+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_6_FCS_ERR,
193+
data->mac_stats.FrameCheckSequenceErrors) ||
194+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_7_ALIGN_ERR,
195+
data->mac_stats.AlignmentErrors) ||
196+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_8_TX_BYTES,
197+
data->mac_stats.OctetsTransmittedOK) ||
198+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_9_TX_DEFER,
199+
data->mac_stats.FramesWithDeferredXmissions) ||
200+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_10_LATE_COL,
201+
data->mac_stats.LateCollisions) ||
202+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_11_XS_COL,
203+
data->mac_stats.FramesAbortedDueToXSColls) ||
204+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_12_TX_INT_ERR,
205+
data->mac_stats.FramesLostDueToIntMACXmitError) ||
206+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_13_CS_ERR,
207+
data->mac_stats.CarrierSenseErrors) ||
208+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_14_RX_BYTES,
209+
data->mac_stats.OctetsReceivedOK) ||
210+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_15_RX_INT_ERR,
211+
data->mac_stats.FramesLostDueToIntMACRcvError) ||
212+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_18_TX_MCAST,
213+
data->mac_stats.MulticastFramesXmittedOK) ||
214+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_19_TX_BCAST,
215+
data->mac_stats.BroadcastFramesXmittedOK) ||
216+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_20_XS_DEFER,
217+
data->mac_stats.FramesWithExcessiveDeferral) ||
218+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_21_RX_MCAST,
219+
data->mac_stats.MulticastFramesReceivedOK) ||
220+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_22_RX_BCAST,
221+
data->mac_stats.BroadcastFramesReceivedOK) ||
222+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_23_IR_LEN_ERR,
223+
data->mac_stats.InRangeLengthErrors) ||
224+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_24_OOR_LEN,
225+
data->mac_stats.OutOfRangeLengthField) ||
226+
stat_put(skb, ETHTOOL_A_STATS_ETH_MAC_25_TOO_LONG_ERR,
227+
data->mac_stats.FrameTooLongErrors))
228+
return -EMSGSIZE;
229+
return 0;
230+
}
231+
146232
static int stats_put_stats(struct sk_buff *skb,
147233
const struct stats_reply_data *data,
148234
u32 id, u32 ss_id,
@@ -182,6 +268,10 @@ static int stats_fill_reply(struct sk_buff *skb,
182268
ret = stats_put_stats(skb, data, ETHTOOL_STATS_ETH_PHY,
183269
ETH_SS_STATS_ETH_PHY,
184270
stats_put_phy_stats);
271+
if (!ret && test_bit(ETHTOOL_STATS_ETH_MAC, req_info->stat_mask))
272+
ret = stats_put_stats(skb, data, ETHTOOL_STATS_ETH_MAC,
273+
ETH_SS_STATS_ETH_MAC,
274+
stats_put_mac_stats);
185275

186276
return ret;
187277
}

‎net/ethtool/strset.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ static const struct strset_info info_template[] = {
9090
.count = __ETHTOOL_A_STATS_ETH_PHY_CNT,
9191
.strings = stats_eth_phy_names,
9292
},
93+
[ETH_SS_STATS_ETH_MAC] = {
94+
.per_dev = false,
95+
.count = __ETHTOOL_A_STATS_ETH_MAC_CNT,
96+
.strings = stats_eth_mac_names,
97+
},
9398
};
9499

95100
struct strset_req_info {

0 commit comments

Comments
 (0)