| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 11 Dec 2023 17:18:27 +0000
From: <edward.cree@....com>
To: <linux-net-drivers@....com>, <davem@...emloft.net>, <kuba@...nel.org>,
<pabeni@...hat.com>, <edumazet@...gle.com>
CC: Edward Cree <ecree.xilinx@...il.com>, <netdev@...r.kernel.org>,
<habetsm.xilinx@...il.com>, Jonathan Cooper <jonathan.s.cooper@....com>
Subject: [PATCH net-next 2/7] sfc: debugfs for channels
From: Edward Cree <ecree.xilinx@...il.com>
Expose each channel's IRQ number and EVQ read pointer.
Reviewed-by: Jonathan Cooper <jonathan.s.cooper@....com>
Signed-off-by: Edward Cree <ecree.xilinx@...il.com>
---
drivers/net/ethernet/sfc/debugfs.c | 51 +++++++++++++++++++++++++
drivers/net/ethernet/sfc/debugfs.h | 15 ++++++++
drivers/net/ethernet/sfc/efx_channels.c | 8 ++++
drivers/net/ethernet/sfc/net_driver.h | 6 +++
4 files changed, 80 insertions(+)
diff --git a/drivers/net/ethernet/sfc/debugfs.c b/drivers/net/ethernet/sfc/debugfs.c
index cf800addb4ff..b46339249794 100644
--- a/drivers/net/ethernet/sfc/debugfs.c
+++ b/drivers/net/ethernet/sfc/debugfs.c
@@ -78,6 +78,54 @@ void efx_update_debugfs_netdev(struct efx_nic *efx)
mutex_unlock(&efx->debugfs_symlink_mutex);
}
+#define EFX_DEBUGFS_CHANNEL(_type, _name) \
+ debugfs_create_##_type(#_name, 0444, channel->debug_dir, &channel->_name)
+
+/* Create basic debugfs parameter files for an Efx channel */
+static void efx_init_debugfs_channel_files(struct efx_channel *channel)
+{
+ EFX_DEBUGFS_CHANNEL(bool, enabled);
+ EFX_DEBUGFS_CHANNEL(u32, irq); /* actually an int */
+ EFX_DEBUGFS_CHANNEL(u32, eventq_read_ptr);
+}
+
+/**
+ * efx_init_debugfs_channel - create debugfs directory for channel
+ * @channel: Efx channel
+ *
+ * Create a debugfs directory containing parameter-files for @channel.
+ * The directory must be cleaned up using efx_fini_debugfs_channel().
+ *
+ * Return: a negative error code or 0 on success.
+ */
+int efx_init_debugfs_channel(struct efx_channel *channel)
+{
+ char name[EFX_DEBUGFS_NAME_LEN];
+
+ if (!channel->efx->debug_channels_dir)
+ return -ENODEV;
+ if (snprintf(name, sizeof(name), "%d", channel->channel)
+ >= sizeof(name))
+ return -ENAMETOOLONG;
+ channel->debug_dir = debugfs_create_dir(name, channel->efx->debug_channels_dir);
+ if (!channel->debug_dir)
+ return -ENOMEM;
+ efx_init_debugfs_channel_files(channel);
+ return 0;
+}
+
+/**
+ * efx_fini_debugfs_channel - remove debugfs directory for channel
+ * @channel: Efx channel
+ *
+ * Remove directory created for @channel by efx_init_debugfs_channel().
+ */
+void efx_fini_debugfs_channel(struct efx_channel *channel)
+{
+ debugfs_remove_recursive(channel->debug_dir);
+ channel->debug_dir = NULL;
+}
+
static int efx_debugfs_enum_read(struct seq_file *s, void *d)
{
struct efx_debugfs_enum_data *data = s->private;
@@ -160,6 +208,9 @@ int efx_init_debugfs_nic(struct efx_nic *efx)
if (!efx->debug_dir)
return -ENOMEM;
efx_init_debugfs_nic_files(efx);
+ /* Create channels subdirectory */
+ efx->debug_channels_dir = debugfs_create_dir("channels",
+ efx->debug_dir);
return 0;
}
diff --git a/drivers/net/ethernet/sfc/debugfs.h b/drivers/net/ethernet/sfc/debugfs.h
index 1fe40fbffa5e..4af4a03d1b97 100644
--- a/drivers/net/ethernet/sfc/debugfs.h
+++ b/drivers/net/ethernet/sfc/debugfs.h
@@ -22,11 +22,20 @@
* bound and created a &struct efx_nic, there is a directory &efx_nic.debug_dir
* in "cards" whose name is the PCI address of the device; it is to this
* directory that the netdev symlink points.
+ *
+ * Under this directory, besides top-level parameter files, are:
+ *
+ * * "channels/" (&efx_nic.debug_channels_dir). For each channel, this will
+ * contain a directory (&efx_channel.debug_dir), whose name is the channel
+ * index (in decimal).
*/
void efx_fini_debugfs_netdev(struct net_device *net_dev);
void efx_update_debugfs_netdev(struct efx_nic *efx);
+int efx_init_debugfs_channel(struct efx_channel *channel);
+void efx_fini_debugfs_channel(struct efx_channel *channel);
+
int efx_init_debugfs_nic(struct efx_nic *efx);
void efx_fini_debugfs_nic(struct efx_nic *efx);
@@ -39,6 +48,12 @@ static inline void efx_fini_debugfs_netdev(struct net_device *net_dev) {}
static inline void efx_update_debugfs_netdev(struct efx_nic *efx) {}
+int efx_init_debugfs_channel(struct efx_channel *channel)
+{
+ return 0;
+}
+void efx_fini_debugfs_channel(struct efx_channel *channel) {}
+
static inline int efx_init_debugfs_nic(struct efx_nic *efx)
{
return 0;
diff --git a/drivers/net/ethernet/sfc/efx_channels.c b/drivers/net/ethernet/sfc/efx_channels.c
index c9e17a8208a9..804a25ceea7f 100644
--- a/drivers/net/ethernet/sfc/efx_channels.c
+++ b/drivers/net/ethernet/sfc/efx_channels.c
@@ -19,6 +19,7 @@
#include "nic.h"
#include "sriov.h"
#include "workarounds.h"
+#include "debugfs.h"
/* This is the first interrupt mode to try out of:
* 0 => MSI-X
@@ -667,6 +668,12 @@ static int efx_probe_channel(struct efx_channel *channel)
channel->rx_list = NULL;
+ rc = efx_init_debugfs_channel(channel);
+ if (rc) /* not fatal */
+ netif_err(channel->efx, drv, channel->efx->net_dev,
+ "Failed to create debugfs for channel %d, rc=%d\n",
+ channel->channel, rc);
+
return 0;
fail:
@@ -743,6 +750,7 @@ void efx_remove_channel(struct efx_channel *channel)
netif_dbg(channel->efx, drv, channel->efx->net_dev,
"destroy chan %d\n", channel->channel);
+ efx_fini_debugfs_channel(channel);
efx_for_each_channel_rx_queue(rx_queue, channel)
efx_remove_rx_queue(rx_queue);
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index 961e2db31c6e..2b92c5461fe3 100644
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -528,6 +528,10 @@ struct efx_channel {
#define RPS_FLOW_ID_INVALID 0xFFFFFFFF
u32 *rps_flow_id;
#endif
+#ifdef CONFIG_DEBUG_FS
+ /** @debug_dir: Channel debugfs directory (under @efx->debug_channels_dir) */
+ struct dentry *debug_dir;
+#endif
unsigned int n_rx_tobe_disc;
unsigned int n_rx_ip_hdr_chksum_err;
@@ -1144,6 +1148,8 @@ struct efx_nic {
#ifdef CONFIG_DEBUG_FS
/** @debug_dir: NIC debugfs directory */
struct dentry *debug_dir;
+ /** @debug_channels_dir: contains channel debugfs dirs. Under @debug_dir */
+ struct dentry *debug_channels_dir;
/** @debug_symlink: NIC debugfs symlink (``nic_eth%d``) */
struct dentry *debug_symlink;
/** @debug_interrupt_mode: debugfs details for printing @interrupt_mode */
Powered by blists - more mailing lists