Commit 9fd31de4 authored by Jiawen Wu's avatar Jiawen Wu Committed by Duanqiang Wen
Browse files

net: libwx: support hardware statistics 

mainline inclusion
from mainline-v6.7-rc1
commit 46b92e10d631b6a2c06d151929e87f1d39d72b8a
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I93QRU
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=46b92e10d631b6a2c06d151929e87f1d39d72b8a



---------------------------------------------------------

Implement update and clear Rx/Tx statistics.

Signed-off-by: default avatarJiawen Wu <jiawenwu@trustnetic.com>
Link: https://lore.kernel.org/r/20231011091906.70486-2-jiawenwu@trustnetic.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDuanqiang Wen <duanqiangwen@net-swift.com>
parent 42893f63

drivers/net/ethernet/wangxun/libwx/wx_ethtool.c

+169 −0
Original line number Diff line number Diff line
@@ -3,9 +3,171 @@ 


#include <linux/pci.h>

#include <linux/phy.h>

#include <linux/ethtool.h>



#include "wx_type.h"

#include "wx_ethtool.h"

#include "wx_hw.h"



struct wx_stats {

	char stat_string[ETH_GSTRING_LEN];

	size_t sizeof_stat;

	off_t stat_offset;

};



#define WX_STAT(str, m) { \

		.stat_string = str, \

		.sizeof_stat = sizeof(((struct wx *)0)->m), \

		.stat_offset = offsetof(struct wx, m) }



static const struct wx_stats wx_gstrings_stats[] = {

	WX_STAT("rx_dma_pkts", stats.gprc),

	WX_STAT("tx_dma_pkts", stats.gptc),

	WX_STAT("rx_dma_bytes", stats.gorc),

	WX_STAT("tx_dma_bytes", stats.gotc),

	WX_STAT("rx_total_pkts", stats.tpr),

	WX_STAT("tx_total_pkts", stats.tpt),

	WX_STAT("rx_long_length_count", stats.roc),

	WX_STAT("rx_short_length_count", stats.ruc),

	WX_STAT("os2bmc_rx_by_bmc", stats.o2bgptc),

	WX_STAT("os2bmc_tx_by_bmc", stats.b2ospc),

	WX_STAT("os2bmc_tx_by_host", stats.o2bspc),

	WX_STAT("os2bmc_rx_by_host", stats.b2ogprc),

	WX_STAT("rx_no_dma_resources", stats.rdmdrop),

	WX_STAT("tx_busy", tx_busy),

	WX_STAT("non_eop_descs", non_eop_descs),

	WX_STAT("tx_restart_queue", restart_queue),

	WX_STAT("rx_csum_offload_good_count", hw_csum_rx_good),

	WX_STAT("rx_csum_offload_errors", hw_csum_rx_error),

	WX_STAT("alloc_rx_buff_failed", alloc_rx_buff_failed),

};



/* drivers allocates num_tx_queues and num_rx_queues symmetrically so

 * we set the num_rx_queues to evaluate to num_tx_queues. This is

 * used because we do not have a good way to get the max number of

 * rx queues with CONFIG_RPS disabled.

 */

#define WX_NUM_RX_QUEUES netdev->num_tx_queues

#define WX_NUM_TX_QUEUES netdev->num_tx_queues



#define WX_QUEUE_STATS_LEN ( \

		(WX_NUM_TX_QUEUES + WX_NUM_RX_QUEUES) * \

		(sizeof(struct wx_queue_stats) / sizeof(u64)))

#define WX_GLOBAL_STATS_LEN  ARRAY_SIZE(wx_gstrings_stats)

#define WX_STATS_LEN (WX_GLOBAL_STATS_LEN + WX_QUEUE_STATS_LEN)



int wx_get_sset_count(struct net_device *netdev, int sset)

{

	switch (sset) {

	case ETH_SS_STATS:

		return WX_STATS_LEN;

	default:

		return -EOPNOTSUPP;

	}

}

EXPORT_SYMBOL(wx_get_sset_count);



void wx_get_strings(struct net_device *netdev, u32 stringset, u8 *data)

{

	u8 *p = data;

	int i;



	switch (stringset) {

	case ETH_SS_STATS:

		for (i = 0; i < WX_GLOBAL_STATS_LEN; i++)

			ethtool_sprintf(&p, wx_gstrings_stats[i].stat_string);

		for (i = 0; i < netdev->num_tx_queues; i++) {

			ethtool_sprintf(&p, "tx_queue_%u_packets", i);

			ethtool_sprintf(&p, "tx_queue_%u_bytes", i);

		}

		for (i = 0; i < WX_NUM_RX_QUEUES; i++) {

			ethtool_sprintf(&p, "rx_queue_%u_packets", i);

			ethtool_sprintf(&p, "rx_queue_%u_bytes", i);

		}

		break;

	}

}

EXPORT_SYMBOL(wx_get_strings);



void wx_get_ethtool_stats(struct net_device *netdev,

			  struct ethtool_stats *stats, u64 *data)

{

	struct wx *wx = netdev_priv(netdev);

	struct wx_ring *ring;

	unsigned int start;

	int i, j;

	char *p;



	wx_update_stats(wx);



	for (i = 0; i < WX_GLOBAL_STATS_LEN; i++) {

		p = (char *)wx + wx_gstrings_stats[i].stat_offset;

		data[i] = (wx_gstrings_stats[i].sizeof_stat ==

			   sizeof(u64)) ? *(u64 *)p : *(u32 *)p;

	}



	for (j = 0; j < netdev->num_tx_queues; j++) {

		ring = wx->tx_ring[j];

		if (!ring) {

			data[i++] = 0;

			data[i++] = 0;

			continue;

		}



		do {

			start = u64_stats_fetch_begin(&ring->syncp);

			data[i] = ring->stats.packets;

			data[i + 1] = ring->stats.bytes;

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

		i += 2;

	}

	for (j = 0; j < WX_NUM_RX_QUEUES; j++) {

		ring = wx->rx_ring[j];

		if (!ring) {

			data[i++] = 0;

			data[i++] = 0;

			continue;

		}



		do {

			start = u64_stats_fetch_begin(&ring->syncp);

			data[i] = ring->stats.packets;

			data[i + 1] = ring->stats.bytes;

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

		i += 2;

	}

}

EXPORT_SYMBOL(wx_get_ethtool_stats);



void wx_get_mac_stats(struct net_device *netdev,

		      struct ethtool_eth_mac_stats *mac_stats)

{

	struct wx *wx = netdev_priv(netdev);

	struct wx_hw_stats *hwstats;



	wx_update_stats(wx);



	hwstats = &wx->stats;

	mac_stats->MulticastFramesXmittedOK = hwstats->mptc;

	mac_stats->BroadcastFramesXmittedOK = hwstats->bptc;

	mac_stats->MulticastFramesReceivedOK = hwstats->mprc;

	mac_stats->BroadcastFramesReceivedOK = hwstats->bprc;

}

EXPORT_SYMBOL(wx_get_mac_stats);



void wx_get_pause_stats(struct net_device *netdev,

			struct ethtool_pause_stats *stats)

{

	struct wx *wx = netdev_priv(netdev);

	struct wx_hw_stats *hwstats;



	wx_update_stats(wx);



	hwstats = &wx->stats;

	stats->tx_pause_frames = hwstats->lxontxc + hwstats->lxofftxc;

	stats->rx_pause_frames = hwstats->lxonoffrxc;

}

EXPORT_SYMBOL(wx_get_pause_stats);



void wx_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *info)

{
@@ -14,5 +176,12 @@ void wx_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *info) 
	strscpy(info->driver, wx->driver_name, sizeof(info->driver));

	strscpy(info->fw_version, wx->eeprom_id, sizeof(info->fw_version));

	strscpy(info->bus_info, pci_name(wx->pdev), sizeof(info->bus_info));

	if (wx->num_tx_queues <= WX_NUM_TX_QUEUES) {

		info->n_stats = WX_STATS_LEN -

				   (WX_NUM_TX_QUEUES - wx->num_tx_queues) *

				   (sizeof(struct wx_queue_stats) / sizeof(u64)) * 2;

	} else {

		info->n_stats = WX_STATS_LEN;

	}

}

EXPORT_SYMBOL(wx_get_drvinfo);

drivers/net/ethernet/wangxun/libwx/wx_ethtool.h

+8 −0
Original line number Diff line number Diff line
@@ -4,5 +4,13 @@ 
#ifndef _WX_ETHTOOL_H_

#define _WX_ETHTOOL_H_



int wx_get_sset_count(struct net_device *netdev, int sset);

void wx_get_strings(struct net_device *netdev, u32 stringset, u8 *data);

void wx_get_ethtool_stats(struct net_device *netdev,

			  struct ethtool_stats *stats, u64 *data);

void wx_get_mac_stats(struct net_device *netdev,

		      struct ethtool_eth_mac_stats *mac_stats);

void wx_get_pause_stats(struct net_device *netdev,

			struct ethtool_pause_stats *stats);

void wx_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *info);

#endif /* _WX_ETHTOOL_H_ */

drivers/net/ethernet/wangxun/libwx/wx_hw.c

+99 −0
Original line number Diff line number Diff line
@@ -1911,6 +1911,105 @@ int wx_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid) 
}

EXPORT_SYMBOL(wx_vlan_rx_kill_vid);



/**

 * wx_update_stats - Update the board statistics counters.

 * @wx: board private structure

 **/

void wx_update_stats(struct wx *wx)

{

	struct wx_hw_stats *hwstats = &wx->stats;



	u64 non_eop_descs = 0, alloc_rx_buff_failed = 0;

	u64 hw_csum_rx_good = 0, hw_csum_rx_error = 0;

	u64 restart_queue = 0, tx_busy = 0;

	u32 i;



	/* gather some stats to the wx struct that are per queue */

	for (i = 0; i < wx->num_rx_queues; i++) {

		struct wx_ring *rx_ring = wx->rx_ring[i];



		non_eop_descs += rx_ring->rx_stats.non_eop_descs;

		alloc_rx_buff_failed += rx_ring->rx_stats.alloc_rx_buff_failed;

		hw_csum_rx_good += rx_ring->rx_stats.csum_good_cnt;

		hw_csum_rx_error += rx_ring->rx_stats.csum_err;

	}

	wx->non_eop_descs = non_eop_descs;

	wx->alloc_rx_buff_failed = alloc_rx_buff_failed;

	wx->hw_csum_rx_error = hw_csum_rx_error;

	wx->hw_csum_rx_good = hw_csum_rx_good;



	for (i = 0; i < wx->num_tx_queues; i++) {

		struct wx_ring *tx_ring = wx->tx_ring[i];



		restart_queue += tx_ring->tx_stats.restart_queue;

		tx_busy += tx_ring->tx_stats.tx_busy;

	}

	wx->restart_queue = restart_queue;

	wx->tx_busy = tx_busy;



	hwstats->gprc += rd32(wx, WX_RDM_PKT_CNT);

	hwstats->gptc += rd32(wx, WX_TDM_PKT_CNT);

	hwstats->gorc += rd64(wx, WX_RDM_BYTE_CNT_LSB);

	hwstats->gotc += rd64(wx, WX_TDM_BYTE_CNT_LSB);

	hwstats->tpr += rd64(wx, WX_RX_FRAME_CNT_GOOD_BAD_L);

	hwstats->tpt += rd64(wx, WX_TX_FRAME_CNT_GOOD_BAD_L);

	hwstats->crcerrs += rd64(wx, WX_RX_CRC_ERROR_FRAMES_L);

	hwstats->rlec += rd64(wx, WX_RX_LEN_ERROR_FRAMES_L);

	hwstats->bprc += rd64(wx, WX_RX_BC_FRAMES_GOOD_L);

	hwstats->bptc += rd64(wx, WX_TX_BC_FRAMES_GOOD_L);

	hwstats->mprc += rd64(wx, WX_RX_MC_FRAMES_GOOD_L);

	hwstats->mptc += rd64(wx, WX_TX_MC_FRAMES_GOOD_L);

	hwstats->roc += rd32(wx, WX_RX_OVERSIZE_FRAMES_GOOD);

	hwstats->ruc += rd32(wx, WX_RX_UNDERSIZE_FRAMES_GOOD);

	hwstats->lxonoffrxc += rd32(wx, WX_MAC_LXONOFFRXC);

	hwstats->lxontxc += rd32(wx, WX_RDB_LXONTXC);

	hwstats->lxofftxc += rd32(wx, WX_RDB_LXOFFTXC);

	hwstats->o2bgptc += rd32(wx, WX_TDM_OS2BMC_CNT);

	hwstats->b2ospc += rd32(wx, WX_MNG_BMC2OS_CNT);

	hwstats->o2bspc += rd32(wx, WX_MNG_OS2BMC_CNT);

	hwstats->b2ogprc += rd32(wx, WX_RDM_BMC2OS_CNT);

	hwstats->rdmdrop += rd32(wx, WX_RDM_DRP_PKT);



	for (i = 0; i < wx->mac.max_rx_queues; i++)

		hwstats->qmprc += rd32(wx, WX_PX_MPRC(i));

}

EXPORT_SYMBOL(wx_update_stats);



/**

 *  wx_clear_hw_cntrs - Generic clear hardware counters

 *  @wx: board private structure

 *

 *  Clears all hardware statistics counters by reading them from the hardware

 *  Statistics counters are clear on read.

 **/

void wx_clear_hw_cntrs(struct wx *wx)

{

	u16 i = 0;



	for (i = 0; i < wx->mac.max_rx_queues; i++)

		wr32(wx, WX_PX_MPRC(i), 0);



	rd32(wx, WX_RDM_PKT_CNT);

	rd32(wx, WX_TDM_PKT_CNT);

	rd64(wx, WX_RDM_BYTE_CNT_LSB);

	rd32(wx, WX_TDM_BYTE_CNT_LSB);

	rd32(wx, WX_RDM_DRP_PKT);

	rd32(wx, WX_RX_UNDERSIZE_FRAMES_GOOD);

	rd32(wx, WX_RX_OVERSIZE_FRAMES_GOOD);

	rd64(wx, WX_RX_FRAME_CNT_GOOD_BAD_L);

	rd64(wx, WX_TX_FRAME_CNT_GOOD_BAD_L);

	rd64(wx, WX_RX_MC_FRAMES_GOOD_L);

	rd64(wx, WX_TX_MC_FRAMES_GOOD_L);

	rd64(wx, WX_RX_BC_FRAMES_GOOD_L);

	rd64(wx, WX_TX_BC_FRAMES_GOOD_L);

	rd64(wx, WX_RX_CRC_ERROR_FRAMES_L);

	rd64(wx, WX_RX_LEN_ERROR_FRAMES_L);

	rd32(wx, WX_RDB_LXONTXC);

	rd32(wx, WX_RDB_LXOFFTXC);

	rd32(wx, WX_MAC_LXONOFFRXC);

}

EXPORT_SYMBOL(wx_clear_hw_cntrs);



/**

 *  wx_start_hw - Prepare hardware for Tx/Rx

 *  @wx: pointer to hardware structure

drivers/net/ethernet/wangxun/libwx/wx_hw.h

+2 −0
Original line number Diff line number Diff line
@@ -34,5 +34,7 @@ int wx_get_pcie_msix_counts(struct wx *wx, u16 *msix_count, u16 max_msix_count); 
int wx_sw_init(struct wx *wx);

int wx_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid);

int wx_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid);

void wx_update_stats(struct wx *wx);

void wx_clear_hw_cntrs(struct wx *wx);



#endif /* _WX_HW_H_ */

drivers/net/ethernet/wangxun/libwx/wx_lib.c

+18 −2
Original line number Diff line number Diff line
@@ -488,6 +488,7 @@ static bool wx_is_non_eop(struct wx_ring *rx_ring, 
		return false;



	rx_ring->rx_buffer_info[ntc].skb = skb;

	rx_ring->rx_stats.non_eop_descs++;



	return true;

}
@@ -721,6 +722,7 @@ static int wx_clean_rx_irq(struct wx_q_vector *q_vector, 


		/* exit if we failed to retrieve a buffer */

		if (!skb) {

			rx_ring->rx_stats.alloc_rx_buff_failed++;

			rx_buffer->pagecnt_bias++;

			break;

		}
@@ -877,9 +879,11 @@ static bool wx_clean_tx_irq(struct wx_q_vector *q_vector, 


		if (__netif_subqueue_stopped(tx_ring->netdev,

					     tx_ring->queue_index) &&

		    netif_running(tx_ring->netdev))

		    netif_running(tx_ring->netdev)) {

			netif_wake_subqueue(tx_ring->netdev,

					    tx_ring->queue_index);

			++tx_ring->tx_stats.restart_queue;

		}

	}



	return !!budget;
@@ -956,6 +960,7 @@ static int wx_maybe_stop_tx(struct wx_ring *tx_ring, u16 size) 


	/* A reprieve! - use start_queue because it doesn't call schedule */

	netif_start_subqueue(tx_ring->netdev, tx_ring->queue_index);

	++tx_ring->tx_stats.restart_queue;



	return 0;

}
@@ -1533,8 +1538,10 @@ static netdev_tx_t wx_xmit_frame_ring(struct sk_buff *skb, 
		count += TXD_USE_COUNT(skb_frag_size(&skb_shinfo(skb)->

						     frags[f]));



	if (wx_maybe_stop_tx(tx_ring, count + 3))

	if (wx_maybe_stop_tx(tx_ring, count + 3)) {

		tx_ring->tx_stats.tx_busy++;

		return NETDEV_TX_BUSY;

	}



	/* record the location of the first descriptor for this packet */

	first = &tx_ring->tx_buffer_info[tx_ring->next_to_use];
@@ -2665,8 +2672,11 @@ void wx_get_stats64(struct net_device *netdev, 
		    struct rtnl_link_stats64 *stats)

{

	struct wx *wx = netdev_priv(netdev);

	struct wx_hw_stats *hwstats;

	int i;



	wx_update_stats(wx);



	rcu_read_lock();

	for (i = 0; i < wx->num_rx_queues; i++) {

		struct wx_ring *ring = READ_ONCE(wx->rx_ring[i]);
@@ -2702,6 +2712,12 @@ void wx_get_stats64(struct net_device *netdev, 
	}



	rcu_read_unlock();



	hwstats = &wx->stats;

	stats->rx_errors = hwstats->crcerrs + hwstats->rlec;

	stats->multicast = hwstats->qmprc;

	stats->rx_length_errors = hwstats->rlec;

	stats->rx_crc_errors = hwstats->crcerrs;

}

EXPORT_SYMBOL(wx_get_stats64);