From: David Arinzon <darinzon@amazon.com>
To: David Miller <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, <netdev@vger.kernel.org>
Cc: David Arinzon <darinzon@amazon.com>,
Eric Dumazet <edumazet@google.com>,
Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,
"Richard Cochran" <richardcochran@gmail.com>,
"Woodhouse, David" <dwmw@amazon.com>,
"Machulsky, Zorik" <zorik@amazon.com>,
"Matushevsky, Alexander" <matua@amazon.com>,
Saeed Bshara <saeedb@amazon.com>, "Wilson, Matt" <msw@amazon.com>,
"Liguori, Anthony" <aliguori@amazon.com>,
"Bshara, Nafea" <nafea@amazon.com>,
"Schmeilin, Evgeny" <evgenys@amazon.com>,
"Belgazal, Netanel" <netanel@amazon.com>,
"Saidi, Ali" <alisaidi@amazon.com>,
"Herrenschmidt, Benjamin" <benh@amazon.com>,
"Kiyanovski, Arthur" <akiyano@amazon.com>,
"Dagan, Noam" <ndagan@amazon.com>,
"Bernstein, Amit" <amitbern@amazon.com>,
"Agroskin, Shay" <shayagr@amazon.com>,
"Abboud, Osama" <osamaabb@amazon.com>,
"Ostrovsky, Evgeny" <evostrov@amazon.com>,
"Tabachnik, Ofir" <ofirt@amazon.com>,
"Machnikowski, Maciek" <maciek@machnikowski.net>,
Rahul Rameshbabu <rrameshbabu@nvidia.com>,
Gal Pressman <gal@nvidia.com>,
Vadim Fedorenko <vadim.fedorenko@linux.dev>
Subject: [PATCH v7 net-next 4/5] net: ena: PHC stats through sysfs
Date: Tue, 18 Feb 2025 20:39:47 +0200 [thread overview]
Message-ID: <20250218183948.757-5-darinzon@amazon.com> (raw)
In-Reply-To: <20250218183948.757-1-darinzon@amazon.com>
The patch allows retrieving PHC statistics
through sysfs.
In case the feature is not enabled (through `phc_enable`
sysfs entry), no output will be written.
Signed-off-by: David Arinzon <darinzon@amazon.com>
---
drivers/net/ethernet/amazon/ena/ena_ethtool.c | 5 --
drivers/net/ethernet/amazon/ena/ena_netdev.h | 6 +++
drivers/net/ethernet/amazon/ena/ena_sysfs.c | 50 +++++++++++++++++++
3 files changed, 56 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
index b442d247..28cc0163 100644
--- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c
+++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
@@ -11,11 +11,6 @@
#include "ena_xdp.h"
#include "ena_phc.h"
-struct ena_stats {
- char name[ETH_GSTRING_LEN];
- int stat_offset;
-};
-
struct ena_hw_metrics {
char name[ETH_GSTRING_LEN];
};
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.h b/drivers/net/ethernet/amazon/ena/ena_netdev.h
index e3c7ed9c..c10d1305 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.h
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.h
@@ -14,6 +14,7 @@
#include <linux/interrupt.h>
#include <linux/netdevice.h>
#include <linux/skbuff.h>
+#include <linux/ethtool.h>
#include <net/xdp.h>
#include <uapi/linux/bpf.h>
@@ -389,6 +390,11 @@ struct ena_adapter {
u32 xdp_num_queues;
};
+struct ena_stats {
+ char name[ETH_GSTRING_LEN];
+ int stat_offset;
+};
+
void ena_set_ethtool_ops(struct net_device *netdev);
void ena_dump_stats_to_dmesg(struct ena_adapter *adapter);
diff --git a/drivers/net/ethernet/amazon/ena/ena_sysfs.c b/drivers/net/ethernet/amazon/ena/ena_sysfs.c
index d0ded92d..10993594 100644
--- a/drivers/net/ethernet/amazon/ena/ena_sysfs.c
+++ b/drivers/net/ethernet/amazon/ena/ena_sysfs.c
@@ -65,6 +65,52 @@ static ssize_t ena_phc_enable_get(struct device *dev,
static DEVICE_ATTR(phc_enable, S_IRUGO | S_IWUSR, ena_phc_enable_get,
ena_phc_enable_set);
+#define ENA_STAT_ENA_COM_PHC_ENTRY(stat) { \
+ .name = #stat, \
+ .stat_offset = offsetof(struct ena_com_stats_phc, stat) / sizeof(u64) \
+}
+
+const struct ena_stats ena_stats_ena_com_phc_strings[] = {
+ ENA_STAT_ENA_COM_PHC_ENTRY(phc_cnt),
+ ENA_STAT_ENA_COM_PHC_ENTRY(phc_exp),
+ ENA_STAT_ENA_COM_PHC_ENTRY(phc_skp),
+ ENA_STAT_ENA_COM_PHC_ENTRY(phc_err),
+};
+
+u16 ena_stats_array_ena_com_phc_size = ARRAY_SIZE(ena_stats_ena_com_phc_strings);
+
+static ssize_t ena_phc_stats_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct ena_adapter *adapter = dev_get_drvdata(dev);
+ int i, rc, chars_written = 0;
+
+ if (!ena_phc_is_active(adapter))
+ return 0;
+
+ for (i = 0; i < ena_stats_array_ena_com_phc_size; i++) {
+ const struct ena_stats *ena_stats;
+ u64 *ptr;
+
+ ena_stats = &ena_stats_ena_com_phc_strings[i];
+ ptr = (u64 *)&adapter->ena_dev->phc.stats +
+ ena_stats->stat_offset;
+ rc = snprintf(buf,
+ ETH_GSTRING_LEN + sizeof(u64),
+ "%s: %llu\n",
+ ena_stats->name,
+ *ptr);
+
+ buf += rc;
+ chars_written += rc;
+ }
+
+ return chars_written;
+}
+
+static DEVICE_ATTR(phc_stats, S_IRUGO, ena_phc_stats_show, NULL);
+
/******************************************************************************
*****************************************************************************/
int ena_sysfs_init(struct device *dev)
@@ -72,6 +118,9 @@ int ena_sysfs_init(struct device *dev)
if (device_create_file(dev, &dev_attr_phc_enable))
dev_err(dev, "Failed to create phc_enable sysfs entry");
+ if (device_create_file(dev, &dev_attr_phc_stats))
+ dev_err(dev, "Failed to create phc_stats sysfs entry");
+
return 0;
}
@@ -80,4 +129,5 @@ int ena_sysfs_init(struct device *dev)
void ena_sysfs_terminate(struct device *dev)
{
device_remove_file(dev, &dev_attr_phc_enable);
+ device_remove_file(dev, &dev_attr_phc_stats);
}
--
2.47.1
next prev parent reply other threads:[~2025-02-18 18:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-18 18:39 [PATCH v7 net-next 0/5] PHC support in ENA driver David Arinzon
2025-02-18 18:39 ` [PATCH v7 net-next 1/5] net: ena: Add PHC support in the " David Arinzon
2025-02-18 18:39 ` [PATCH v7 net-next 2/5] net: ena: PHC silent reset David Arinzon
2025-02-18 18:39 ` [PATCH v7 net-next 3/5] net: ena: PHC enable through sysfs David Arinzon
2025-03-03 15:00 ` Leon Romanovsky
2025-02-18 18:39 ` David Arinzon [this message]
2025-02-21 2:08 ` [PATCH v7 net-next 4/5] net: ena: PHC stats " Jakub Kicinski
2025-02-25 17:52 ` Arinzon, David
2025-02-25 9:38 ` Simon Horman
2025-02-25 17:53 ` Arinzon, David
2025-02-18 18:39 ` [PATCH v7 net-next 5/5] net: ena: Add PHC documentation David Arinzon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250218183948.757-5-darinzon@amazon.com \
--to=darinzon@amazon.com \
--cc=akiyano@amazon.com \
--cc=aliguori@amazon.com \
--cc=alisaidi@amazon.com \
--cc=amitbern@amazon.com \
--cc=benh@amazon.com \
--cc=davem@davemloft.net \
--cc=dwmw@amazon.com \
--cc=edumazet@google.com \
--cc=evgenys@amazon.com \
--cc=evostrov@amazon.com \
--cc=gal@nvidia.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=maciek@machnikowski.net \
--cc=matua@amazon.com \
--cc=msw@amazon.com \
--cc=nafea@amazon.com \
--cc=ndagan@amazon.com \
--cc=netanel@amazon.com \
--cc=netdev@vger.kernel.org \
--cc=ofirt@amazon.com \
--cc=osamaabb@amazon.com \
--cc=pabeni@redhat.com \
--cc=richardcochran@gmail.com \
--cc=rrameshbabu@nvidia.com \
--cc=saeedb@amazon.com \
--cc=shayagr@amazon.com \
--cc=vadim.fedorenko@linux.dev \
--cc=zorik@amazon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).