Commit af7b3b4a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

eth: bnxt: support per-queue statistics 



Support per-queue statistics API in bnxt.

$ ethtool -S eth0
NIC statistics:
     [0]: rx_ucast_packets: 1418
     [0]: rx_mcast_packets: 178
     [0]: rx_bcast_packets: 0
     [0]: rx_discards: 0
     [0]: rx_errors: 0
     [0]: rx_ucast_bytes: 1141815
     [0]: rx_mcast_bytes: 16766
     [0]: rx_bcast_bytes: 0
     [0]: tx_ucast_packets: 1734
...

$ ./cli.py --spec netlink/specs/netdev.yaml \
   --dump qstats-get --json '{"scope": "queue"}'
[{'ifindex': 2,
  'queue-id': 0,
  'queue-type': 'rx',
  'rx-alloc-fail': 0,
  'rx-bytes': 1164931,
  'rx-packets': 1641},
...
 {'ifindex': 2,
  'queue-id': 0,
  'queue-type': 'tx',
  'tx-bytes': 631494,
  'tx-packets': 1771},
...

Reset the per queue counters:
$ ethtool -L eth0 combined 4

Inspect again:

$ ./cli.py --spec netlink/specs/netdev.yaml \
   --dump qstats-get --json '{"scope": "queue"}'
[{'ifindex': 2,
  'queue-id': 0,
  'queue-type': 'rx',
  'rx-alloc-fail': 0,
  'rx-bytes': 32397,
  'rx-packets': 145},
...
 {'ifindex': 2,
  'queue-id': 0,
  'queue-type': 'tx',
  'tx-bytes': 37481,
  'tx-packets': 196},
...

$ ethtool -S eth0 | head
NIC statistics:
     [0]: rx_ucast_packets: 174
     [0]: rx_mcast_packets: 3
     [0]: rx_bcast_packets: 0
     [0]: rx_discards: 0
     [0]: rx_errors: 0
     [0]: rx_ucast_bytes: 37151
     [0]: rx_mcast_bytes: 267
     [0]: rx_bcast_bytes: 0
     [0]: tx_ucast_packets: 267
...

Totals are still correct:

$ ./cli.py --spec netlink/specs/netdev.yaml --dump qstats-get
[{'ifindex': 2,
  'rx-alloc-fail': 0,
  'rx-bytes': 281949995,
  'rx-packets': 216524,
  'tx-bytes': 52694905,
  'tx-packets': 75546}]
$ ip -s link show dev eth0
2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000
    link/ether 14:23:f2:61:05:40 brd ff:ff:ff:ff:ff:ff
    RX:  bytes packets errors dropped  missed   mcast
     282519546  218100      0       0       0     516
    TX:  bytes packets errors dropped carrier collsns
      53323054   77674      0       0       0       0

Acked-by: default avatarStanislav Fomichev <sdf@google.com>
Reviewed-by: default avatarAmritha Nambiar <amritha.nambiar@intel.com>
Reviewed-by: default avatarMichael Chan <michael.chan@broadcom.com>
Reviewed-by: default avatarXuan Zhuo <xuanzhuo@linux.alibaba.com>
Link: https://lore.kernel.org/r/20240306195509.1502746-4-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 92f8b1f5

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+65 −0
Original line number Diff line number Diff line
@@ -14523,6 +14523,70 @@ static const struct net_device_ops bnxt_netdev_ops = { 
	.ndo_bridge_setlink	= bnxt_bridge_setlink,

};



static void bnxt_get_queue_stats_rx(struct net_device *dev, int i,

				    struct netdev_queue_stats_rx *stats)

{

	struct bnxt *bp = netdev_priv(dev);

	struct bnxt_cp_ring_info *cpr;

	u64 *sw;



	cpr = &bp->bnapi[i]->cp_ring;

	sw = cpr->stats.sw_stats;



	stats->packets = 0;

	stats->packets += BNXT_GET_RING_STATS64(sw, rx_ucast_pkts);

	stats->packets += BNXT_GET_RING_STATS64(sw, rx_mcast_pkts);

	stats->packets += BNXT_GET_RING_STATS64(sw, rx_bcast_pkts);



	stats->bytes = 0;

	stats->bytes += BNXT_GET_RING_STATS64(sw, rx_ucast_bytes);

	stats->bytes += BNXT_GET_RING_STATS64(sw, rx_mcast_bytes);

	stats->bytes += BNXT_GET_RING_STATS64(sw, rx_bcast_bytes);



	stats->alloc_fail = cpr->sw_stats.rx.rx_oom_discards;

}



static void bnxt_get_queue_stats_tx(struct net_device *dev, int i,

				    struct netdev_queue_stats_tx *stats)

{

	struct bnxt *bp = netdev_priv(dev);

	struct bnxt_napi *bnapi;

	u64 *sw;



	bnapi = bp->tx_ring[bp->tx_ring_map[i]].bnapi;

	sw = bnapi->cp_ring.stats.sw_stats;



	stats->packets = 0;

	stats->packets += BNXT_GET_RING_STATS64(sw, tx_ucast_pkts);

	stats->packets += BNXT_GET_RING_STATS64(sw, tx_mcast_pkts);

	stats->packets += BNXT_GET_RING_STATS64(sw, tx_bcast_pkts);



	stats->bytes = 0;

	stats->bytes += BNXT_GET_RING_STATS64(sw, tx_ucast_bytes);

	stats->bytes += BNXT_GET_RING_STATS64(sw, tx_mcast_bytes);

	stats->bytes += BNXT_GET_RING_STATS64(sw, tx_bcast_bytes);

}



static void bnxt_get_base_stats(struct net_device *dev,

				struct netdev_queue_stats_rx *rx,

				struct netdev_queue_stats_tx *tx)

{

	struct bnxt *bp = netdev_priv(dev);



	rx->packets = bp->net_stats_prev.rx_packets;

	rx->bytes = bp->net_stats_prev.rx_bytes;

	rx->alloc_fail = bp->ring_err_stats_prev.rx_total_oom_discards;



	tx->packets = bp->net_stats_prev.tx_packets;

	tx->bytes = bp->net_stats_prev.tx_bytes;

}



static const struct netdev_stat_ops bnxt_stat_ops = {

	.get_queue_stats_rx	= bnxt_get_queue_stats_rx,

	.get_queue_stats_tx	= bnxt_get_queue_stats_tx,

	.get_base_stats		= bnxt_get_base_stats,

};



static void bnxt_remove_one(struct pci_dev *pdev)

{

	struct net_device *dev = pci_get_drvdata(pdev);
@@ -14970,6 +15034,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto init_err_free;



	dev->netdev_ops = &bnxt_netdev_ops;

	dev->stat_ops = &bnxt_stat_ops;

	dev->watchdog_timeo = BNXT_TX_TIMEOUT;

	dev->ethtool_ops = &bnxt_ethtool_ops;

	pci_set_drvdata(pdev, dev);