Skip to content

Commit 158135d

Browse files
kuba-mookuba-moo
committed
Merge branch 'enic-report-per-queue-stats'
Nelson Escobar says: ==================== enic: Report per queue stats Patch #1: Use a macro instead of static const variables for array sizes. I didn't want to add more static const variables in the next patch so clean up the existing ones first. Patch #2: Collect per queue statistics Patch #3: Report per queue stats in netdev qstats Patch #4: Report some per queue stats in ethtool # NETIF="eno6" tools/testing/selftests/drivers/net/stats.py KTAP version 1 1..5 ok 1 stats.check_pause # XFAIL pause not supported by the device ok 2 stats.check_fec # XFAIL FEC not supported by the device ok 3 stats.pkt_byte_sum ok 4 stats.qstat_by_ifindex ok 5 stats.check_down # tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml \ --dump qstats-get --json '{"ifindex": "34"}' [{'ifindex': 34, 'rx-bytes': 66762680, 'rx-csum-unnecessary': 1009345, 'rx-hw-drop-overruns': 0, 'rx-hw-drops': 0, 'rx-packets': 1009673, 'tx-bytes': 137936674899, 'tx-csum-none': 125, 'tx-hw-gso-packets': 2408712, 'tx-needs-csum': 2431531, 'tx-packets': 15475466, 'tx-stop': 0, 'tx-wake': 0}] v2: https://lore.kernel.org/20240905010900.24152-1-neescoba@cisco.com v1: https://lore.kernel.org/20240823235401.29996-1-neescoba@cisco.com ==================== Link: https://patch.msgid.link/20240912005039.10797-1-neescoba@cisco.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 parents 7bb50f3 + bde04d9 commit 158135d

3 files changed

Lines changed: 269 additions & 28 deletions

File tree

‎drivers/net/ethernet/cisco/enic/enic.h‎

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,40 @@ struct vxlan_offload {
128128
u8 flags;
129129
};
130130

131+
struct enic_wq_stats {
132+
u64 packets; /* pkts queued for Tx */
133+
u64 stopped; /* Tx ring almost full, queue stopped */
134+
u64 wake; /* Tx ring no longer full, queue woken up*/
135+
u64 tso; /* non-encap tso pkt */
136+
u64 encap_tso; /* encap tso pkt */
137+
u64 encap_csum; /* encap HW csum */
138+
u64 csum_partial; /* skb->ip_summed = CHECKSUM_PARTIAL */
139+
u64 csum_none; /* HW csum not required */
140+
u64 bytes; /* bytes queued for Tx */
141+
u64 add_vlan; /* HW adds vlan tag */
142+
u64 cq_work; /* Tx completions processed */
143+
u64 cq_bytes; /* Tx bytes processed */
144+
u64 null_pkt; /* skb length <= 0 */
145+
u64 skb_linear_fail; /* linearize failures */
146+
u64 desc_full_awake; /* TX ring full while queue awake */
147+
};
148+
149+
struct enic_rq_stats {
150+
u64 packets; /* pkts received */
151+
u64 bytes; /* bytes received */
152+
u64 l4_rss_hash; /* hashed on l4 */
153+
u64 l3_rss_hash; /* hashed on l3 */
154+
u64 csum_unnecessary; /* HW verified csum */
155+
u64 csum_unnecessary_encap; /* HW verified csum on encap packet */
156+
u64 vlan_stripped; /* HW stripped vlan */
157+
u64 napi_complete; /* napi complete intr reenabled */
158+
u64 napi_repoll; /* napi poll again */
159+
u64 bad_fcs; /* bad pkts */
160+
u64 pkt_truncated; /* truncated pkts */
161+
u64 no_skb; /* out of skbs */
162+
u64 desc_skip; /* Rx pkt went into later buffer */
163+
};
164+
131165
/* Per-instance private data structure */
132166
struct enic {
133167
struct net_device *netdev;
@@ -162,16 +196,16 @@ struct enic {
162196
/* work queue cache line section */
163197
____cacheline_aligned struct vnic_wq wq[ENIC_WQ_MAX];
164198
spinlock_t wq_lock[ENIC_WQ_MAX];
199+
struct enic_wq_stats wq_stats[ENIC_WQ_MAX];
165200
unsigned int wq_count;
166201
u16 loop_enable;
167202
u16 loop_tag;
168203

169204
/* receive queue cache line section */
170205
____cacheline_aligned struct vnic_rq rq[ENIC_RQ_MAX];
206+
struct enic_rq_stats rq_stats[ENIC_RQ_MAX];
171207
unsigned int rq_count;
172208
struct vxlan_offload vxlan;
173-
u64 rq_truncated_pkts;
174-
u64 rq_bad_fcs;
175209
struct napi_struct napi[ENIC_RQ_MAX + ENIC_WQ_MAX];
176210

177211
/* interrupt resource cache line section */

‎drivers/net/ethernet/cisco/enic/enic_ethtool.c‎

Lines changed: 92 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,41 @@ struct enic_stat {
3232
.index = offsetof(struct vnic_gen_stats, stat) / sizeof(u64)\
3333
}
3434

35+
#define ENIC_PER_RQ_STAT(stat) { \
36+
.name = "rq[%d]_"#stat, \
37+
.index = offsetof(struct enic_rq_stats, stat) / sizeof(u64) \
38+
}
39+
40+
#define ENIC_PER_WQ_STAT(stat) { \
41+
.name = "wq[%d]_"#stat, \
42+
.index = offsetof(struct enic_wq_stats, stat) / sizeof(u64) \
43+
}
44+
45+
static const struct enic_stat enic_per_rq_stats[] = {
46+
ENIC_PER_RQ_STAT(l4_rss_hash),
47+
ENIC_PER_RQ_STAT(l3_rss_hash),
48+
ENIC_PER_RQ_STAT(csum_unnecessary_encap),
49+
ENIC_PER_RQ_STAT(vlan_stripped),
50+
ENIC_PER_RQ_STAT(napi_complete),
51+
ENIC_PER_RQ_STAT(napi_repoll),
52+
ENIC_PER_RQ_STAT(no_skb),
53+
ENIC_PER_RQ_STAT(desc_skip),
54+
};
55+
56+
#define NUM_ENIC_PER_RQ_STATS ARRAY_SIZE(enic_per_rq_stats)
57+
58+
static const struct enic_stat enic_per_wq_stats[] = {
59+
ENIC_PER_WQ_STAT(encap_tso),
60+
ENIC_PER_WQ_STAT(encap_csum),
61+
ENIC_PER_WQ_STAT(add_vlan),
62+
ENIC_PER_WQ_STAT(cq_work),
63+
ENIC_PER_WQ_STAT(cq_bytes),
64+
ENIC_PER_WQ_STAT(null_pkt),
65+
ENIC_PER_WQ_STAT(skb_linear_fail),
66+
ENIC_PER_WQ_STAT(desc_full_awake),
67+
};
68+
69+
#define NUM_ENIC_PER_WQ_STATS ARRAY_SIZE(enic_per_wq_stats)
3570
static const struct enic_stat enic_tx_stats[] = {
3671
ENIC_TX_STAT(tx_frames_ok),
3772
ENIC_TX_STAT(tx_unicast_frames_ok),
@@ -46,6 +81,8 @@ static const struct enic_stat enic_tx_stats[] = {
4681
ENIC_TX_STAT(tx_tso),
4782
};
4883

84+
#define NUM_ENIC_TX_STATS ARRAY_SIZE(enic_tx_stats)
85+
4986
static const struct enic_stat enic_rx_stats[] = {
5087
ENIC_RX_STAT(rx_frames_ok),
5188
ENIC_RX_STAT(rx_frames_total),
@@ -70,13 +107,13 @@ static const struct enic_stat enic_rx_stats[] = {
70107
ENIC_RX_STAT(rx_frames_to_max),
71108
};
72109

110+
#define NUM_ENIC_RX_STATS ARRAY_SIZE(enic_rx_stats)
111+
73112
static const struct enic_stat enic_gen_stats[] = {
74113
ENIC_GEN_STAT(dma_map_error),
75114
};
76115

77-
static const unsigned int enic_n_tx_stats = ARRAY_SIZE(enic_tx_stats);
78-
static const unsigned int enic_n_rx_stats = ARRAY_SIZE(enic_rx_stats);
79-
static const unsigned int enic_n_gen_stats = ARRAY_SIZE(enic_gen_stats);
116+
#define NUM_ENIC_GEN_STATS ARRAY_SIZE(enic_gen_stats)
80117

81118
static void enic_intr_coal_set_rx(struct enic *enic, u32 timer)
82119
{
@@ -141,22 +178,38 @@ static void enic_get_drvinfo(struct net_device *netdev,
141178
static void enic_get_strings(struct net_device *netdev, u32 stringset,
142179
u8 *data)
143180
{
181+
struct enic *enic = netdev_priv(netdev);
144182
unsigned int i;
183+
unsigned int j;
145184

146185
switch (stringset) {
147186
case ETH_SS_STATS:
148-
for (i = 0; i < enic_n_tx_stats; i++) {
187+
for (i = 0; i < NUM_ENIC_TX_STATS; i++) {
149188
memcpy(data, enic_tx_stats[i].name, ETH_GSTRING_LEN);
150189
data += ETH_GSTRING_LEN;
151190
}
152-
for (i = 0; i < enic_n_rx_stats; i++) {
191+
for (i = 0; i < NUM_ENIC_RX_STATS; i++) {
153192
memcpy(data, enic_rx_stats[i].name, ETH_GSTRING_LEN);
154193
data += ETH_GSTRING_LEN;
155194
}
156-
for (i = 0; i < enic_n_gen_stats; i++) {
195+
for (i = 0; i < NUM_ENIC_GEN_STATS; i++) {
157196
memcpy(data, enic_gen_stats[i].name, ETH_GSTRING_LEN);
158197
data += ETH_GSTRING_LEN;
159198
}
199+
for (i = 0; i < enic->rq_count; i++) {
200+
for (j = 0; j < NUM_ENIC_PER_RQ_STATS; j++) {
201+
snprintf(data, ETH_GSTRING_LEN,
202+
enic_per_rq_stats[j].name, i);
203+
data += ETH_GSTRING_LEN;
204+
}
205+
}
206+
for (i = 0; i < enic->wq_count; i++) {
207+
for (j = 0; j < NUM_ENIC_PER_WQ_STATS; j++) {
208+
snprintf(data, ETH_GSTRING_LEN,
209+
enic_per_wq_stats[j].name, i);
210+
data += ETH_GSTRING_LEN;
211+
}
212+
}
160213
break;
161214
}
162215
}
@@ -242,9 +295,19 @@ static int enic_set_ringparam(struct net_device *netdev,
242295

243296
static int enic_get_sset_count(struct net_device *netdev, int sset)
244297
{
298+
struct enic *enic = netdev_priv(netdev);
299+
unsigned int n_per_rq_stats;
300+
unsigned int n_per_wq_stats;
301+
unsigned int n_stats;
302+
245303
switch (sset) {
246304
case ETH_SS_STATS:
247-
return enic_n_tx_stats + enic_n_rx_stats + enic_n_gen_stats;
305+
n_per_rq_stats = NUM_ENIC_PER_RQ_STATS * enic->rq_count;
306+
n_per_wq_stats = NUM_ENIC_PER_WQ_STATS * enic->wq_count;
307+
n_stats = NUM_ENIC_TX_STATS + NUM_ENIC_RX_STATS +
308+
NUM_ENIC_GEN_STATS +
309+
n_per_rq_stats + n_per_wq_stats;
310+
return n_stats;
248311
default:
249312
return -EOPNOTSUPP;
250313
}
@@ -256,6 +319,7 @@ static void enic_get_ethtool_stats(struct net_device *netdev,
256319
struct enic *enic = netdev_priv(netdev);
257320
struct vnic_stats *vstats;
258321
unsigned int i;
322+
unsigned int j;
259323
int err;
260324

261325
err = enic_dev_stats_dump(enic, &vstats);
@@ -266,12 +330,30 @@ static void enic_get_ethtool_stats(struct net_device *netdev,
266330
if (err == -ENOMEM)
267331
return;
268332

269-
for (i = 0; i < enic_n_tx_stats; i++)
333+
for (i = 0; i < NUM_ENIC_TX_STATS; i++)
270334
*(data++) = ((u64 *)&vstats->tx)[enic_tx_stats[i].index];
271-
for (i = 0; i < enic_n_rx_stats; i++)
335+
for (i = 0; i < NUM_ENIC_RX_STATS; i++)
272336
*(data++) = ((u64 *)&vstats->rx)[enic_rx_stats[i].index];
273-
for (i = 0; i < enic_n_gen_stats; i++)
337+
for (i = 0; i < NUM_ENIC_GEN_STATS; i++)
274338
*(data++) = ((u64 *)&enic->gen_stats)[enic_gen_stats[i].index];
339+
for (i = 0; i < enic->rq_count; i++) {
340+
struct enic_rq_stats *rqstats = &enic->rq_stats[i];
341+
int index;
342+
343+
for (j = 0; j < NUM_ENIC_PER_RQ_STATS; j++) {
344+
index = enic_per_rq_stats[j].index;
345+
*(data++) = ((u64 *)rqstats)[index];
346+
}
347+
}
348+
for (i = 0; i < enic->wq_count; i++) {
349+
struct enic_wq_stats *wqstats = &enic->wq_stats[i];
350+
int index;
351+
352+
for (j = 0; j < NUM_ENIC_PER_WQ_STATS; j++) {
353+
index = enic_per_wq_stats[j].index;
354+
*(data++) = ((u64 *)wqstats)[index];
355+
}
356+
}
275357
}
276358

277359
static u32 enic_get_msglevel(struct net_device *netdev)

0 commit comments

Comments
 (0)