Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
net :mana :Add remaining GDMA stats for MANA to ethtool
Extend performance counter stats in 'ethtool -S <interface>'
for MANA VF to include all GDMA stat counter.
Tested-on: Ubuntu22
Testcases:
1. LISA testcase:
PERF-NETWORK-TCP-THROUGHPUT-MULTICONNECTION-NTTTCP-Synthetic
2. LISA testcase:
PERF-NETWORK-TCP-THROUGHPUT-MULTICONNECTION-NTTTCP-SRIOV
Signed-off-by: Shradha Gupta <shradhagupta@linux.microsoft.com>
Link: https://lore.kernel.org/r/1700830950-803-1-git-send-email-shradhagupta@linux.microsoft.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
authored by
Shradha Gupta
and committed by
Paolo Abeni
e1df5202
dba1b8a7
+120
-15
+47
-2
drivers/net/ethernet/microsoft/mana/mana_en.c
+47
-2
drivers/net/ethernet/microsoft/mana/mana_en.c
···
2385
2385
2386
2386
mana_gd_init_req_hdr(&req.hdr, MANA_QUERY_GF_STAT,
2387
2387
sizeof(req), sizeof(resp));
2388
-
req.req_stats = STATISTICS_FLAGS_HC_TX_BYTES |
2388
+
req.req_stats = STATISTICS_FLAGS_RX_DISCARDS_NO_WQE |
2389
+
STATISTICS_FLAGS_RX_ERRORS_VPORT_DISABLED |
2390
+
STATISTICS_FLAGS_HC_RX_BYTES |
2391
+
STATISTICS_FLAGS_HC_RX_UCAST_PACKETS |
2392
+
STATISTICS_FLAGS_HC_RX_UCAST_BYTES |
2393
+
STATISTICS_FLAGS_HC_RX_MCAST_PACKETS |
2394
+
STATISTICS_FLAGS_HC_RX_MCAST_BYTES |
2395
+
STATISTICS_FLAGS_HC_RX_BCAST_PACKETS |
2396
+
STATISTICS_FLAGS_HC_RX_BCAST_BYTES |
2397
+
STATISTICS_FLAGS_TX_ERRORS_GF_DISABLED |
2398
+
STATISTICS_FLAGS_TX_ERRORS_VPORT_DISABLED |
2399
+
STATISTICS_FLAGS_TX_ERRORS_INVAL_VPORT_OFFSET_PACKETS |
2400
+
STATISTICS_FLAGS_TX_ERRORS_VLAN_ENFORCEMENT |
2401
+
STATISTICS_FLAGS_TX_ERRORS_ETH_TYPE_ENFORCEMENT |
2402
+
STATISTICS_FLAGS_TX_ERRORS_SA_ENFORCEMENT |
2403
+
STATISTICS_FLAGS_TX_ERRORS_SQPDID_ENFORCEMENT |
2404
+
STATISTICS_FLAGS_TX_ERRORS_CQPDID_ENFORCEMENT |
2405
+
STATISTICS_FLAGS_TX_ERRORS_MTU_VIOLATION |
2406
+
STATISTICS_FLAGS_TX_ERRORS_INVALID_OOB |
2407
+
STATISTICS_FLAGS_HC_TX_BYTES |
2389
2408
STATISTICS_FLAGS_HC_TX_UCAST_PACKETS |
2390
2409
STATISTICS_FLAGS_HC_TX_UCAST_BYTES |
2391
2410
STATISTICS_FLAGS_HC_TX_MCAST_PACKETS |
2392
2411
STATISTICS_FLAGS_HC_TX_MCAST_BYTES |
2393
2412
STATISTICS_FLAGS_HC_TX_BCAST_PACKETS |
2394
-
STATISTICS_FLAGS_HC_TX_BCAST_BYTES;
2413
+
STATISTICS_FLAGS_HC_TX_BCAST_BYTES |
2414
+
STATISTICS_FLAGS_TX_ERRORS_GDMA_ERROR;
2395
2415
2396
2416
err = mana_send_request(apc->ac, &req, sizeof(req), &resp,
2397
2417
sizeof(resp));
···
2427
2407
return;
2428
2408
}
2429
2409
2410
+
apc->eth_stats.hc_rx_discards_no_wqe = resp.rx_discards_nowqe;
2411
+
apc->eth_stats.hc_rx_err_vport_disabled = resp.rx_err_vport_disabled;
2412
+
apc->eth_stats.hc_rx_bytes = resp.hc_rx_bytes;
2413
+
apc->eth_stats.hc_rx_ucast_pkts = resp.hc_rx_ucast_pkts;
2414
+
apc->eth_stats.hc_rx_ucast_bytes = resp.hc_rx_ucast_bytes;
2415
+
apc->eth_stats.hc_rx_bcast_pkts = resp.hc_rx_bcast_pkts;
2416
+
apc->eth_stats.hc_rx_bcast_bytes = resp.hc_rx_bcast_bytes;
2417
+
apc->eth_stats.hc_rx_mcast_pkts = resp.hc_rx_mcast_pkts;
2418
+
apc->eth_stats.hc_rx_mcast_bytes = resp.hc_rx_mcast_bytes;
2419
+
apc->eth_stats.hc_tx_err_gf_disabled = resp.tx_err_gf_disabled;
2420
+
apc->eth_stats.hc_tx_err_vport_disabled = resp.tx_err_vport_disabled;
2421
+
apc->eth_stats.hc_tx_err_inval_vportoffset_pkt =
2422
+
resp.tx_err_inval_vport_offset_pkt;
2423
+
apc->eth_stats.hc_tx_err_vlan_enforcement =
2424
+
resp.tx_err_vlan_enforcement;
2425
+
apc->eth_stats.hc_tx_err_eth_type_enforcement =
2426
+
resp.tx_err_ethtype_enforcement;
2427
+
apc->eth_stats.hc_tx_err_sa_enforcement = resp.tx_err_SA_enforcement;
2428
+
apc->eth_stats.hc_tx_err_sqpdid_enforecement =
2429
+
resp.tx_err_SQPDID_enforcement;
2430
+
apc->eth_stats.hc_tx_err_cqpdid_enforcement =
2431
+
resp.tx_err_CQPDID_enforcement;
2432
+
apc->eth_stats.hc_tx_err_mtu_violation = resp.tx_err_mtu_violation;
2433
+
apc->eth_stats.hc_tx_err_inval_oob = resp.tx_err_inval_oob;
2430
2434
apc->eth_stats.hc_tx_bytes = resp.hc_tx_bytes;
2431
2435
apc->eth_stats.hc_tx_ucast_pkts = resp.hc_tx_ucast_pkts;
2432
2436
apc->eth_stats.hc_tx_ucast_bytes = resp.hc_tx_ucast_bytes;
···
2458
2414
apc->eth_stats.hc_tx_bcast_bytes = resp.hc_tx_bcast_bytes;
2459
2415
apc->eth_stats.hc_tx_mcast_pkts = resp.hc_tx_mcast_pkts;
2460
2416
apc->eth_stats.hc_tx_mcast_bytes = resp.hc_tx_mcast_bytes;
2417
+
apc->eth_stats.hc_tx_err_gdma = resp.tx_err_gdma;
2461
2418
}
2462
2419
2463
2420
static int mana_init_port(struct net_device *ndev)
+40
drivers/net/ethernet/microsoft/mana/mana_ethtool.c
+40
drivers/net/ethernet/microsoft/mana/mana_ethtool.c
···
13
13
} mana_eth_stats[] = {
14
14
{"stop_queue", offsetof(struct mana_ethtool_stats, stop_queue)},
15
15
{"wake_queue", offsetof(struct mana_ethtool_stats, wake_queue)},
16
+
{"hc_rx_discards_no_wqe", offsetof(struct mana_ethtool_stats,
17
+
hc_rx_discards_no_wqe)},
18
+
{"hc_rx_err_vport_disabled", offsetof(struct mana_ethtool_stats,
19
+
hc_rx_err_vport_disabled)},
20
+
{"hc_rx_bytes", offsetof(struct mana_ethtool_stats, hc_rx_bytes)},
21
+
{"hc_rx_ucast_pkts", offsetof(struct mana_ethtool_stats,
22
+
hc_rx_ucast_pkts)},
23
+
{"hc_rx_ucast_bytes", offsetof(struct mana_ethtool_stats,
24
+
hc_rx_ucast_bytes)},
25
+
{"hc_rx_bcast_pkts", offsetof(struct mana_ethtool_stats,
26
+
hc_rx_bcast_pkts)},
27
+
{"hc_rx_bcast_bytes", offsetof(struct mana_ethtool_stats,
28
+
hc_rx_bcast_bytes)},
29
+
{"hc_rx_mcast_pkts", offsetof(struct mana_ethtool_stats,
30
+
hc_rx_mcast_pkts)},
31
+
{"hc_rx_mcast_bytes", offsetof(struct mana_ethtool_stats,
32
+
hc_rx_mcast_bytes)},
33
+
{"hc_tx_err_gf_disabled", offsetof(struct mana_ethtool_stats,
34
+
hc_tx_err_gf_disabled)},
35
+
{"hc_tx_err_vport_disabled", offsetof(struct mana_ethtool_stats,
36
+
hc_tx_err_vport_disabled)},
37
+
{"hc_tx_err_inval_vportoffset_pkt",
38
+
offsetof(struct mana_ethtool_stats,
39
+
hc_tx_err_inval_vportoffset_pkt)},
40
+
{"hc_tx_err_vlan_enforcement", offsetof(struct mana_ethtool_stats,
41
+
hc_tx_err_vlan_enforcement)},
42
+
{"hc_tx_err_eth_type_enforcement",
43
+
offsetof(struct mana_ethtool_stats, hc_tx_err_eth_type_enforcement)},
44
+
{"hc_tx_err_sa_enforcement", offsetof(struct mana_ethtool_stats,
45
+
hc_tx_err_sa_enforcement)},
46
+
{"hc_tx_err_sqpdid_enforecement",
47
+
offsetof(struct mana_ethtool_stats, hc_tx_err_sqpdid_enforecement)},
48
+
{"hc_tx_err_cqpdid_enforcement",
49
+
offsetof(struct mana_ethtool_stats, hc_tx_err_cqpdid_enforcement)},
50
+
{"hc_tx_err_mtu_violation", offsetof(struct mana_ethtool_stats,
51
+
hc_tx_err_mtu_violation)},
52
+
{"hc_tx_err_inval_oob", offsetof(struct mana_ethtool_stats,
53
+
hc_tx_err_inval_oob)},
54
+
{"hc_tx_err_gdma", offsetof(struct mana_ethtool_stats,
55
+
hc_tx_err_gdma)},
16
56
{"hc_tx_bytes", offsetof(struct mana_ethtool_stats, hc_tx_bytes)},
17
57
{"hc_tx_ucast_pkts", offsetof(struct mana_ethtool_stats,
18
58
hc_tx_ucast_pkts)},
+33
-13
include/net/mana/mana.h
+33
-13
include/net/mana/mana.h
···
353
353
struct mana_ethtool_stats {
354
354
u64 stop_queue;
355
355
u64 wake_queue;
356
+
u64 hc_rx_discards_no_wqe;
357
+
u64 hc_rx_err_vport_disabled;
358
+
u64 hc_rx_bytes;
359
+
u64 hc_rx_ucast_pkts;
360
+
u64 hc_rx_ucast_bytes;
361
+
u64 hc_rx_bcast_pkts;
362
+
u64 hc_rx_bcast_bytes;
363
+
u64 hc_rx_mcast_pkts;
364
+
u64 hc_rx_mcast_bytes;
365
+
u64 hc_tx_err_gf_disabled;
366
+
u64 hc_tx_err_vport_disabled;
367
+
u64 hc_tx_err_inval_vportoffset_pkt;
368
+
u64 hc_tx_err_vlan_enforcement;
369
+
u64 hc_tx_err_eth_type_enforcement;
370
+
u64 hc_tx_err_sa_enforcement;
371
+
u64 hc_tx_err_sqpdid_enforecement;
372
+
u64 hc_tx_err_cqpdid_enforcement;
373
+
u64 hc_tx_err_mtu_violation;
374
+
u64 hc_tx_err_inval_oob;
356
375
u64 hc_tx_bytes;
357
376
u64 hc_tx_ucast_pkts;
358
377
u64 hc_tx_ucast_bytes;
···
379
360
u64 hc_tx_bcast_bytes;
380
361
u64 hc_tx_mcast_pkts;
381
362
u64 hc_tx_mcast_bytes;
363
+
u64 hc_tx_err_gdma;
382
364
u64 tx_cqe_err;
383
365
u64 tx_cqe_unknown_type;
384
366
u64 rx_coalesced_err;
···
622
602
struct gdma_resp_hdr hdr;
623
603
u64 reported_stats;
624
604
/* rx errors/discards */
625
-
u64 discard_rx_nowqe;
626
-
u64 err_rx_vport_disabled;
605
+
u64 rx_discards_nowqe;
606
+
u64 rx_err_vport_disabled;
627
607
/* rx bytes/packets */
628
608
u64 hc_rx_bytes;
629
609
u64 hc_rx_ucast_pkts;
···
633
613
u64 hc_rx_mcast_pkts;
634
614
u64 hc_rx_mcast_bytes;
635
615
/* tx errors */
636
-
u64 err_tx_gf_disabled;
637
-
u64 err_tx_vport_disabled;
638
-
u64 err_tx_inval_vport_offset_pkt;
639
-
u64 err_tx_vlan_enforcement;
640
-
u64 err_tx_ethtype_enforcement;
641
-
u64 err_tx_SA_enforecement;
642
-
u64 err_tx_SQPDID_enforcement;
643
-
u64 err_tx_CQPDID_enforcement;
644
-
u64 err_tx_mtu_violation;
645
-
u64 err_tx_inval_oob;
616
+
u64 tx_err_gf_disabled;
617
+
u64 tx_err_vport_disabled;
618
+
u64 tx_err_inval_vport_offset_pkt;
619
+
u64 tx_err_vlan_enforcement;
620
+
u64 tx_err_ethtype_enforcement;
621
+
u64 tx_err_SA_enforcement;
622
+
u64 tx_err_SQPDID_enforcement;
623
+
u64 tx_err_CQPDID_enforcement;
624
+
u64 tx_err_mtu_violation;
625
+
u64 tx_err_inval_oob;
646
626
/* tx bytes/packets */
647
627
u64 hc_tx_bytes;
648
628
u64 hc_tx_ucast_pkts;
···
652
632
u64 hc_tx_mcast_pkts;
653
633
u64 hc_tx_mcast_bytes;
654
634
/* tx error */
655
-
u64 err_tx_gdma;
635
+
u64 tx_err_gdma;
656
636
}; /* HW DATA */
657
637
658
638
/* Configure vPort Rx Steering */