Commit 4be4a91d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'eth-fbnic-cleanup-and-add-a-few-stats' 

Jakub Kicinski says:

====================
eth: fbnic: cleanup and add a few stats

Cleanup trival problems with fbnic and add the PCIe and RPC (Rx parser)
stats.

All stats are read under rtnl_lock for now, so the code is pretty
trivial. We'll need to add more locking when we start gathering
drops used by .ndo_get_stats64.
====================

Link: https://patch.msgid.link/20241115015344.757567-1-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 357c52ff 79da2aaa

Documentation/networking/device_drivers/ethernet/meta/fbnic.rst

+43 −0
Original line number Diff line number Diff line
@@ -27,3 +27,46 @@ driver takes over. 
devlink dev info provides version information for all three components. In

addition to the version the hg commit hash of the build is included as a

separate entry.



Statistics

----------



RPC (Rx parser)

~~~~~~~~~~~~~~~



 - ``rpc_unkn_etype``: frames containing unknown EtherType

 - ``rpc_unkn_ext_hdr``: frames containing unknown IPv6 extension header

 - ``rpc_ipv4_frag``: frames containing IPv4 fragment

 - ``rpc_ipv6_frag``: frames containing IPv6 fragment

 - ``rpc_ipv4_esp``: frames with IPv4 ESP encapsulation

 - ``rpc_ipv6_esp``: frames with IPv6 ESP encapsulation

 - ``rpc_tcp_opt_err``: frames which encountered TCP option parsing error

 - ``rpc_out_of_hdr_err``: frames where header was larger than parsable region

 - ``ovr_size_err``: oversized frames



PCIe

~~~~



The fbnic driver exposes PCIe hardware performance statistics through debugfs

(``pcie_stats``). These statistics provide insights into PCIe transaction

behavior and potential performance bottlenecks.



1. PCIe Transaction Counters:



   These counters track PCIe transaction activity:

        - ``pcie_ob_rd_tlp``: Outbound read Transaction Layer Packets count

        - ``pcie_ob_rd_dword``: DWORDs transferred in outbound read transactions

        - ``pcie_ob_wr_tlp``: Outbound write Transaction Layer Packets count

        - ``pcie_ob_wr_dword``: DWORDs transferred in outbound write

	  transactions

        - ``pcie_ob_cpl_tlp``: Outbound completion TLP count

        - ``pcie_ob_cpl_dword``: DWORDs transferred in outbound completion TLPs



2. PCIe Resource Monitoring:



   These counters indicate PCIe resource exhaustion events:

        - ``pcie_ob_rd_no_tag``: Read requests dropped due to tag unavailability

        - ``pcie_ob_rd_no_cpl_cred``: Read requests dropped due to completion

	  credit exhaustion

        - ``pcie_ob_rd_no_np_cred``: Read requests dropped due to non-posted

	  credit exhaustion

drivers/net/ethernet/meta/fbnic/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
obj-$(CONFIG_FBNIC) += fbnic.o



fbnic-y := fbnic_csr.o \

	   fbnic_debugfs.o \

	   fbnic_devlink.o \

	   fbnic_ethtool.o \

	   fbnic_fw.o \

drivers/net/ethernet/meta/fbnic/fbnic.h

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
struct fbnic_dev {

	struct device *dev;

	struct net_device *netdev;

	struct dentry *dbg_fbd;

	struct device *hwmon;



	u32 __iomem *uc_addr0;
@@ -156,6 +157,11 @@ int fbnic_alloc_irqs(struct fbnic_dev *fbd); 
void fbnic_get_fw_ver_commit_str(struct fbnic_dev *fbd, char *fw_version,

				 const size_t str_sz);



void fbnic_dbg_fbd_init(struct fbnic_dev *fbd);

void fbnic_dbg_fbd_exit(struct fbnic_dev *fbd);

void fbnic_dbg_init(void);

void fbnic_dbg_exit(void);



void fbnic_csr_get_regs(struct fbnic_dev *fbd, u32 *data, u32 *regs_version);

int fbnic_csr_regs_len(struct fbnic_dev *fbd);

drivers/net/ethernet/meta/fbnic/fbnic_csr.h

+47 −0
Original line number Diff line number Diff line
@@ -638,6 +638,16 @@ enum { 
		    FBNIC_RPC_RSS_KEY_DWORD_LEN * 32 - \

		    FBNIC_RPC_RSS_KEY_BIT_LEN)



#define FBNIC_RPC_CNTR_TCP_OPT_ERR	0x0849e		/* 0x21278 */

#define FBNIC_RPC_CNTR_UNKN_ETYPE	0x0849f		/* 0x2127c */

#define FBNIC_RPC_CNTR_IPV4_FRAG	0x084a0		/* 0x21280 */

#define FBNIC_RPC_CNTR_IPV6_FRAG	0x084a1		/* 0x21284 */

#define FBNIC_RPC_CNTR_IPV4_ESP		0x084a2		/* 0x21288 */

#define FBNIC_RPC_CNTR_IPV6_ESP		0x084a3		/* 0x2128c */

#define FBNIC_RPC_CNTR_UNKN_EXT_HDR	0x084a4		/* 0x21290 */

#define FBNIC_RPC_CNTR_OUT_OF_HDR_ERR	0x084a5		/* 0x21294 */

#define FBNIC_RPC_CNTR_OVR_SIZE_ERR	0x084a6		/* 0x21298 */



#define FBNIC_RPC_TCAM_MACDA_VALIDATE	0x0852d		/* 0x214b4 */

#define FBNIC_CSR_END_RPC		0x0856b	/* CSR section delimiter */
@@ -918,6 +928,43 @@ enum { 
#define FBNIC_MAX_QUEUES		128

#define FBNIC_CSR_END_QUEUE	(0x40000 + 0x400 * FBNIC_MAX_QUEUES - 1)



/* PUL User Registers*/

#define FBNIC_PUL_USER_OB_RD_TLP_CNT_31_0 \

					0x3106e		/* 0xc41b8 */

#define FBNIC_PUL_USER_OB_RD_DWORD_CNT_31_0 \

					0x31070		/* 0xc41c0 */

#define FBNIC_PUL_USER_OB_RD_DWORD_CNT_63_32 \

					0x31071		/* 0xc41c4 */

#define FBNIC_PUL_USER_OB_WR_TLP_CNT_31_0 \

					0x31072		/* 0xc41c8 */

#define FBNIC_PUL_USER_OB_WR_TLP_CNT_63_32 \

					0x31073		/* 0xc41cc */

#define FBNIC_PUL_USER_OB_WR_DWORD_CNT_31_0 \

					0x31074		/* 0xc41d0 */

#define FBNIC_PUL_USER_OB_WR_DWORD_CNT_63_32 \

					0x31075		/* 0xc41d4 */

#define FBNIC_PUL_USER_OB_CPL_TLP_CNT_31_0 \

					0x31076		/* 0xc41d8 */

#define FBNIC_PUL_USER_OB_CPL_TLP_CNT_63_32 \

					0x31077		/* 0xc41dc */

#define FBNIC_PUL_USER_OB_CPL_DWORD_CNT_31_0 \

					0x31078		/* 0xc41e0 */

#define FBNIC_PUL_USER_OB_CPL_DWORD_CNT_63_32 \

					0x31079		/* 0xc41e4 */

#define FBNIC_PUL_USER_OB_RD_DBG_CNT_CPL_CRED_31_0 \

					0x3107a		/* 0xc41e8 */

#define FBNIC_PUL_USER_OB_RD_DBG_CNT_CPL_CRED_63_32 \

					0x3107b		/* 0xc41ec */

#define FBNIC_PUL_USER_OB_RD_DBG_CNT_TAG_31_0 \

					0x3107c		/* 0xc41f0 */

#define FBNIC_PUL_USER_OB_RD_DBG_CNT_TAG_63_32 \

					0x3107d		/* 0xc41f4 */

#define FBNIC_PUL_USER_OB_RD_DBG_CNT_NP_CRED_31_0 \

					0x3107e		/* 0xc41f8 */

#define FBNIC_PUL_USER_OB_RD_DBG_CNT_NP_CRED_63_32 \

					0x3107f		/* 0xc41fc */

#define FBNIC_CSR_END_PUL_USER	0x31080	/* CSR section delimiter */



/* BAR 4 CSRs */



/* The IPC mailbox consists of 32 mailboxes, with each mailbox consisting

drivers/net/ethernet/meta/fbnic/fbnic_debugfs.c

0 → 100644
+68 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright (c) Meta Platforms, Inc. and affiliates. */



#include <linux/debugfs.h>

#include <linux/pci.h>

#include <linux/rtnetlink.h>

#include <linux/seq_file.h>



#include "fbnic.h"



static struct dentry *fbnic_dbg_root;



static int fbnic_dbg_pcie_stats_show(struct seq_file *s, void *v)

{

	struct fbnic_dev *fbd = s->private;



	rtnl_lock();

	fbnic_get_hw_stats(fbd);



	seq_printf(s, "ob_rd_tlp: %llu\n", fbd->hw_stats.pcie.ob_rd_tlp.value);

	seq_printf(s, "ob_rd_dword: %llu\n",

		   fbd->hw_stats.pcie.ob_rd_dword.value);

	seq_printf(s, "ob_wr_tlp: %llu\n", fbd->hw_stats.pcie.ob_wr_tlp.value);

	seq_printf(s, "ob_wr_dword: %llu\n",

		   fbd->hw_stats.pcie.ob_wr_dword.value);

	seq_printf(s, "ob_cpl_tlp: %llu\n",

		   fbd->hw_stats.pcie.ob_cpl_tlp.value);

	seq_printf(s, "ob_cpl_dword: %llu\n",

		   fbd->hw_stats.pcie.ob_cpl_dword.value);

	seq_printf(s, "ob_rd_no_tag: %llu\n",

		   fbd->hw_stats.pcie.ob_rd_no_tag.value);

	seq_printf(s, "ob_rd_no_cpl_cred: %llu\n",

		   fbd->hw_stats.pcie.ob_rd_no_cpl_cred.value);

	seq_printf(s, "ob_rd_no_np_cred: %llu\n",

		   fbd->hw_stats.pcie.ob_rd_no_np_cred.value);

	rtnl_unlock();



	return 0;

}



DEFINE_SHOW_ATTRIBUTE(fbnic_dbg_pcie_stats);



void fbnic_dbg_fbd_init(struct fbnic_dev *fbd)

{

	struct pci_dev *pdev = to_pci_dev(fbd->dev);

	const char *name = pci_name(pdev);



	fbd->dbg_fbd = debugfs_create_dir(name, fbnic_dbg_root);

	debugfs_create_file("pcie_stats", 0400, fbd->dbg_fbd, fbd,

			    &fbnic_dbg_pcie_stats_fops);

}



void fbnic_dbg_fbd_exit(struct fbnic_dev *fbd)

{

	debugfs_remove_recursive(fbd->dbg_fbd);

	fbd->dbg_fbd = NULL;

}



void fbnic_dbg_init(void)

{

	fbnic_dbg_root = debugfs_create_dir(fbnic_driver_name, NULL);

}



void fbnic_dbg_exit(void)

{

	debugfs_remove_recursive(fbnic_dbg_root);

	fbnic_dbg_root = NULL;

}