| 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: <20241211223231.397203-7-anthony.l.nguyen@intel.com>
Date: Wed, 11 Dec 2024 14:32:14 -0800
From: Tony Nguyen <anthony.l.nguyen@...el.com>
To: davem@...emloft.net,
kuba@...nel.org,
pabeni@...hat.com,
edumazet@...gle.com,
andrew+netdev@...n.ch,
netdev@...r.kernel.org
Cc: Przemek Kitszel <przemyslaw.kitszel@...el.com>,
anthony.l.nguyen@...el.com,
wojciech.drewek@...el.com,
mateusz.polchlopek@...el.com,
joe@...ches.com,
horms@...nel.org,
jiri@...nulli.us,
apw@...onical.com,
lukas.bulwahn@...il.com,
dwaipayanray1@...il.com,
Igor Bagnucki <igor.bagnucki@...el.com>,
Pucha Himasekhar Reddy <himasekharx.reddy.pucha@...el.com>
Subject: [PATCH net-next 6/7] ice: dump ethtool stats and skb by Tx hang devlink health reporter
From: Przemek Kitszel <przemyslaw.kitszel@...el.com>
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>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@...el.com> (A Contingent worker at Intel)
Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@...el.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@...el.com>
---
.../net/ethernet/intel/ice/devlink/health.c | 36 +++++++++++++++++++
drivers/net/ethernet/intel/ice/ice_ethtool.c | 10 +++---
drivers/net/ethernet/intel/ice/ice_ethtool.h | 2 ++
.../ethernet/intel/ice/ice_ethtool_common.h | 19 ++++++++++
4 files changed, 62 insertions(+), 5 deletions(-)
create mode 100644 drivers/net/ethernet/intel/ice/ice_ethtool_common.h
diff --git a/drivers/net/ethernet/intel/ice/devlink/health.c b/drivers/net/ethernet/intel/ice/devlink/health.c
index b8c5a1c372dc..b0abb6d4e3e4 100644
--- a/drivers/net/ethernet/intel/ice/devlink/health.c
+++ b/drivers/net/ethernet/intel/ice/devlink/health.c
@@ -3,6 +3,7 @@
#include "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,10 +88,12 @@ 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;
if (!event)
return 0;
+ skb = event->tx_ring->tx_buf->skb;
devlink_fmsg_obj_nest_start(fmsg);
ICE_DEVLINK_FMSG_PUT_FIELD(fmsg, event, head);
ICE_DEVLINK_FMSG_PUT_FIELD(fmsg, event, intr);
@@ -71,8 +104,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 3072634bf049..b552439fc1f9 100644
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -1507,7 +1507,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);
@@ -1887,7 +1887,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:
@@ -1990,9 +1990,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);
diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.h b/drivers/net/ethernet/intel/ice/ice_ethtool.h
index 8f2ad1c172c0..a1a34440557d 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_ */
--
2.42.0
Powered by blists - more mailing lists