| 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
| ||
|
Message-Id: <20240821133714.61417-6-przemyslaw.kitszel@intel.com>
Date: Wed, 21 Aug 2024 15:37:13 +0200
From: Przemek Kitszel <przemyslaw.kitszel@...el.com>
To: intel-wired-lan@...ts.osuosl.org,
Jiri Pirko <jiri@...nulli.us>,
Tony Nguyen <anthony.l.nguyen@...el.com>
Cc: netdev@...r.kernel.org,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Paolo Abeni <pabeni@...hat.com>,
Jakub Kicinski <kuba@...nel.org>,
nex.sw.ncis.osdt.itp.upstreaming@...el.com,
apw@...onical.com,
joe@...ches.com,
dwaipayanray1@...il.com,
lukas.bulwahn@...il.com,
akpm@...ux-foundation.org,
willemb@...gle.com,
Przemek Kitszel <przemyslaw.kitszel@...el.com>,
Igor Bagnucki <igor.bagnucki@...el.com>,
Wojciech Drewek <wojciech.drewek@...el.com>,
Simon Horman <horms@...nel.org>,
Mateusz Polchlopek <mateusz.polchlopek@...el.com>
Subject: [PATCH iwl-next v3 5/6] ice: dump ethtool stats and skb by Tx hang devlink health reporter
Print the ethtool stats and skb diagnostic information as part of Tx hang
devlink health dump.
Move the declarations of ethtool functions that devlink health uses out
to a new file: ice_ethtool_common.h
To utilize our existing ethtool code in this context, convert it to
non-static.
Reviewed-by: Igor Bagnucki <igor.bagnucki@...el.com>
Reviewed-by: Wojciech Drewek <wojciech.drewek@...el.com>
Reviewed-by: Simon Horman <horms@...nel.org>
Signed-off-by: Mateusz Polchlopek <mateusz.polchlopek@...el.com>
Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@...el.com>
---
drivers/net/ethernet/intel/ice/ice_ethtool.h | 2 +
.../ethernet/intel/ice/ice_ethtool_common.h | 19 ++++++++++
.../intel/ice/devlink/devlink_health.c | 37 +++++++++++++++++++
drivers/net/ethernet/intel/ice/ice_ethtool.c | 10 ++---
4 files changed, 63 insertions(+), 5 deletions(-)
create mode 100644 drivers/net/ethernet/intel/ice/ice_ethtool_common.h
diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.h b/drivers/net/ethernet/intel/ice/ice_ethtool.h
index 9acccae38625..fd021d2813f8 100644
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.h
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.h
@@ -4,6 +4,8 @@
#ifndef _ICE_ETHTOOL_H_
#define _ICE_ETHTOOL_H_
+#include "ice_ethtool_common.h"
+
struct ice_phy_type_to_ethtool {
u64 aq_link_speed;
u8 link_mode;
diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool_common.h b/drivers/net/ethernet/intel/ice/ice_ethtool_common.h
new file mode 100644
index 000000000000..0c772056f006
--- /dev/null
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool_common.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2024, Intel Corporation. */
+
+#ifndef _ICE_ETHTOOL_COMMON_H_
+#define _ICE_ETHTOOL_COMMON_H_
+
+/**
+ * DOC: ice_ethtool_common.h
+ *
+ * This header is for ethtool related code that is reused in other places.
+ */
+
+void ice_get_strings(struct net_device *netdev, u32 stringset, u8 *data);
+int ice_get_sset_count(struct net_device *netdev, int sset);
+void ice_get_ethtool_stats(struct net_device *netdev,
+ struct ethtool_stats __always_unused *stats,
+ u64 *data);
+
+#endif /* _ICE_ETHTOOL_COMMON_H_ */
diff --git a/drivers/net/ethernet/intel/ice/devlink/devlink_health.c b/drivers/net/ethernet/intel/ice/devlink/devlink_health.c
index 193dd4d00578..086042260235 100644
--- a/drivers/net/ethernet/intel/ice/devlink/devlink_health.c
+++ b/drivers/net/ethernet/intel/ice/devlink/devlink_health.c
@@ -3,6 +3,7 @@
#include "devlink_health.h"
#include "ice.h"
+#include "ice_ethtool_common.h"
#define ICE_DEVLINK_FMSG_PUT_FIELD(fmsg, obj, name) \
devlink_fmsg_put(fmsg, #name, (obj)->name)
@@ -26,6 +27,36 @@ static void ice_devlink_health_report(struct devlink_health_reporter *reporter,
devlink_health_report(reporter, msg, priv_ctx);
}
+static void ice_dump_ethtool_stats_to_fmsg(struct devlink_fmsg *fmsg,
+ struct net_device *netdev)
+{
+ const u32 string_set = ETH_SS_STATS;
+ u64 *stats;
+ u8 *names;
+ int scnt;
+
+ scnt = ice_get_sset_count(netdev, string_set);
+ devlink_fmsg_put(fmsg, "stats-cnt", (u32)scnt);
+ if (scnt <= 0)
+ return;
+
+ names = kcalloc(scnt, ETH_GSTRING_LEN, GFP_KERNEL);
+ stats = kcalloc(scnt, sizeof(*stats), GFP_KERNEL);
+ if (!names || !stats)
+ goto out;
+
+ ice_get_strings(netdev, string_set, names);
+ ice_get_ethtool_stats(netdev, NULL, stats);
+
+ devlink_fmsg_obj_nest_start(fmsg);
+ for (int i = 0; i < scnt; ++i)
+ devlink_fmsg_put(fmsg, &names[i * ETH_GSTRING_LEN], stats[i]);
+ devlink_fmsg_obj_nest_end(fmsg);
+out:
+ kfree(names);
+ kfree(stats);
+}
+
/**
* ice_fmsg_put_ptr - put hex value of pointer into fmsg
*
@@ -57,6 +88,9 @@ static int ice_tx_hang_reporter_dump(struct devlink_health_reporter *reporter,
struct netlink_ext_ack *extack)
{
struct ice_tx_hang_event *event = priv_ctx;
+ struct sk_buff *skb;
+
+ skb = event->tx_ring->tx_buf->skb;
if (!event)
return 0;
@@ -71,8 +105,11 @@ static int ice_tx_hang_reporter_dump(struct devlink_health_reporter *reporter,
devlink_fmsg_put(fmsg, "irq-mapping", event->tx_ring->q_vector->name);
ice_fmsg_put_ptr(fmsg, "desc-ptr", event->tx_ring->desc);
ice_fmsg_put_ptr(fmsg, "dma-ptr", (void *)(long)event->tx_ring->dma);
+ ice_fmsg_put_ptr(fmsg, "skb-ptr", skb);
devlink_fmsg_binary_pair_put(fmsg, "desc", event->tx_ring->desc,
event->tx_ring->count * sizeof(struct ice_tx_desc));
+ devlink_fmsg_dump_skb(fmsg, skb);
+ ice_dump_ethtool_stats_to_fmsg(fmsg, event->tx_ring->vsi->netdev);
devlink_fmsg_obj_nest_end(fmsg);
return 0;
diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
index 143c8b9e58fe..8c6bc94a0ed3 100644
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -1529,7 +1529,7 @@ __ice_get_strings(struct net_device *netdev, u32 stringset, u8 *data,
}
}
-static void ice_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
+void ice_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
{
struct ice_netdev_priv *np = netdev_priv(netdev);
@@ -1909,7 +1909,7 @@ static int ice_set_priv_flags(struct net_device *netdev, u32 flags)
return ret;
}
-static int ice_get_sset_count(struct net_device *netdev, int sset)
+int ice_get_sset_count(struct net_device *netdev, int sset)
{
switch (sset) {
case ETH_SS_STATS:
@@ -2012,9 +2012,9 @@ __ice_get_ethtool_stats(struct net_device *netdev,
}
}
-static void
-ice_get_ethtool_stats(struct net_device *netdev,
- struct ethtool_stats __always_unused *stats, u64 *data)
+void ice_get_ethtool_stats(struct net_device *netdev,
+ struct ethtool_stats __always_unused *stats,
+ u64 *data)
{
struct ice_netdev_priv *np = netdev_priv(netdev);
--
2.39.3
Powered by blists - more mailing lists