Commit 6c2a4c2f authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Paolo Abeni
Browse files

net: tn40xx: add per queue netdev-genl stats support 



Add support for the netdev-genl per queue stats API.

./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml \
--dump qstats-get --json '{"scope":"queue"}'
[{'ifindex': 4,
  'queue-id': 0,
  'queue-type': 'rx',
  'rx-alloc-fail': 0,
  'rx-bytes': 266613,
  'rx-packets': 3325},
 {'ifindex': 4,
  'queue-id': 0,
  'queue-type': 'tx',
  'tx-bytes': 142823367,
  'tx-packets': 2387}]

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@gmail.com>
Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Link: https://patch.msgid.link/20240706064324.137574-1-fujita.tomonori@gmail.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 417d8818

drivers/net/ethernet/tehuti/tn40.c

+52 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/pci.h>

#include <linux/phylink.h>

#include <linux/vmalloc.h>

#include <net/netdev_queues.h>

#include <net/page_pool/helpers.h>



#include "tn40.h"
@@ -378,6 +379,7 @@ static int tn40_rx_receive(struct tn40_priv *priv, int budget) 
		if (!skb) {

			u64_stats_update_begin(&priv->syncp);

			priv->stats.rx_dropped++;

			priv->alloc_fail++;

			u64_stats_update_end(&priv->syncp);

			tn40_recycle_rx_buffer(priv, rxdd);

			break;
@@ -1584,6 +1586,53 @@ static const struct ethtool_ops tn40_ethtool_ops = { 
	.get_link_ksettings = tn40_ethtool_get_link_ksettings,

};



static void tn40_get_queue_stats_rx(struct net_device *ndev, int idx,

				    struct netdev_queue_stats_rx *stats)

{

	struct tn40_priv *priv = netdev_priv(ndev);

	unsigned int start;



	do {

		start = u64_stats_fetch_begin(&priv->syncp);



		stats->packets = priv->stats.rx_packets;

		stats->bytes = priv->stats.rx_bytes;

		stats->alloc_fail = priv->alloc_fail;

	} while (u64_stats_fetch_retry(&priv->syncp, start));

}



static void tn40_get_queue_stats_tx(struct net_device *ndev, int idx,

				    struct netdev_queue_stats_tx *stats)

{

	struct tn40_priv *priv = netdev_priv(ndev);

	unsigned int start;



	do {

		start = u64_stats_fetch_begin(&priv->syncp);



		stats->packets = priv->stats.tx_packets;

		stats->bytes = priv->stats.tx_bytes;

	} while (u64_stats_fetch_retry(&priv->syncp, start));

}



static void tn40_get_base_stats(struct net_device *ndev,

				struct netdev_queue_stats_rx *rx,

				struct netdev_queue_stats_tx *tx)

{

	rx->packets = 0;

	rx->bytes = 0;

	rx->alloc_fail = 0;



	tx->packets = 0;

	tx->bytes = 0;

}



static const struct netdev_stat_ops tn40_stat_ops = {

	.get_queue_stats_rx = tn40_get_queue_stats_rx,

	.get_queue_stats_tx = tn40_get_queue_stats_tx,

	.get_base_stats = tn40_get_base_stats,

};



static int tn40_priv_init(struct tn40_priv *priv)

{

	int ret;
@@ -1613,6 +1662,7 @@ static struct net_device *tn40_netdev_alloc(struct pci_dev *pdev) 
		return NULL;

	ndev->netdev_ops = &tn40_netdev_ops;

	ndev->ethtool_ops = &tn40_ethtool_ops;

	ndev->stat_ops = &tn40_stat_ops;

	ndev->tx_queue_len = TN40_NDEV_TXQ_LEN;

	ndev->mem_start = pci_resource_start(pdev, 0);

	ndev->mem_end = pci_resource_end(pdev, 0);

drivers/net/ethernet/tehuti/tn40.h

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ struct tn40_priv { 


	int stats_flag;

	struct rtnl_link_stats64 stats;

	u64 alloc_fail;

	struct u64_stats_sync syncp;



	u8 txd_size;