* [PATCH v4 net-next 0/2] net: mvneta: add support for page_pool_get_stats
@ 2022-04-11 15:11 Lorenzo Bianconi
2022-04-11 15:11 ` [PATCH v4 net-next 1/2] net: page_pool: introduce ethtool stats Lorenzo Bianconi
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Lorenzo Bianconi @ 2022-04-11 15:11 UTC (permalink / raw)
To: netdev
Cc: lorenzo.bianconi, davem, kuba, pabeni, thomas.petazzoni,
ilias.apalodimas, jbrouer, andrew, jdamato
Introduce page_pool stats ethtool APIs in order to avoid driver duplicated
code.
Changes since v3:
- get rid of wrong for loop in page_pool_ethtool_stats_get()
- add API stubs when page_pool_stats are not compiled in
Changes since v2:
- remove enum list of page_pool stats in page_pool.h
- remove leftover change in mvneta.c for ethtool_stats array allocation
Changes since v1:
- move stats accounting to page_pool code
- move stats string management to page_pool code
Lorenzo Bianconi (2):
net: page_pool: introduce ethtool stats
net: mvneta: add support for page_pool_get_stats
drivers/net/ethernet/marvell/Kconfig | 1 +
drivers/net/ethernet/marvell/mvneta.c | 20 ++++++++-
include/net/page_pool.h | 21 +++++++++
net/core/page_pool.c | 63 ++++++++++++++++++++++++++-
4 files changed, 103 insertions(+), 2 deletions(-)
--
2.35.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v4 net-next 1/2] net: page_pool: introduce ethtool stats
2022-04-11 15:11 [PATCH v4 net-next 0/2] net: mvneta: add support for page_pool_get_stats Lorenzo Bianconi
@ 2022-04-11 15:11 ` Lorenzo Bianconi
2022-04-11 15:11 ` [PATCH v4 net-next 2/2] net: mvneta: add support for page_pool_get_stats Lorenzo Bianconi
2022-04-11 20:35 ` [PATCH v4 net-next 0/2] " Jakub Kicinski
2 siblings, 0 replies; 5+ messages in thread
From: Lorenzo Bianconi @ 2022-04-11 15:11 UTC (permalink / raw)
To: netdev
Cc: lorenzo.bianconi, davem, kuba, pabeni, thomas.petazzoni,
ilias.apalodimas, jbrouer, andrew, jdamato
Introduce page_pool APIs to report stats through ethtool and reduce
duplicated code in each driver.
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
include/net/page_pool.h | 21 ++++++++++++++
net/core/page_pool.c | 63 ++++++++++++++++++++++++++++++++++++++++-
2 files changed, 83 insertions(+), 1 deletion(-)
diff --git a/include/net/page_pool.h b/include/net/page_pool.h
index ea5fb70e5101..813c93499f20 100644
--- a/include/net/page_pool.h
+++ b/include/net/page_pool.h
@@ -117,6 +117,10 @@ struct page_pool_stats {
struct page_pool_recycle_stats recycle_stats;
};
+int page_pool_ethtool_stats_get_count(void);
+u8 *page_pool_ethtool_stats_get_strings(u8 *data);
+u64 *page_pool_ethtool_stats_get(u64 *data, void *stats);
+
/*
* Drivers that wish to harvest page pool stats and report them to users
* (perhaps via ethtool, debugfs, or another mechanism) can allocate a
@@ -124,6 +128,23 @@ struct page_pool_stats {
*/
bool page_pool_get_stats(struct page_pool *pool,
struct page_pool_stats *stats);
+#else
+
+static inline int page_pool_ethtool_stats_get_count(void)
+{
+ return 0;
+}
+
+static inline u8 *page_pool_ethtool_stats_get_strings(u8 *data)
+{
+ return data;
+}
+
+static inline u64 *page_pool_ethtool_stats_get(u64 *data, void *stats)
+{
+ return data;
+}
+
#endif
struct page_pool {
diff --git a/net/core/page_pool.c b/net/core/page_pool.c
index 4af55d28ffa3..90130f5a519e 100644
--- a/net/core/page_pool.c
+++ b/net/core/page_pool.c
@@ -18,6 +18,7 @@
#include <linux/page-flags.h>
#include <linux/mm.h> /* for __put_page() */
#include <linux/poison.h>
+#include <linux/ethtool.h>
#include <trace/events/page_pool.h>
@@ -42,6 +43,20 @@
this_cpu_add(s->__stat, val); \
} while (0)
+static const char pp_stats[][ETH_GSTRING_LEN] = {
+ "rx_pp_alloc_fast",
+ "rx_pp_alloc_slow",
+ "rx_pp_alloc_slow_ho",
+ "rx_pp_alloc_empty",
+ "rx_pp_alloc_refill",
+ "rx_pp_alloc_waive",
+ "rx_pp_recycle_cached",
+ "rx_pp_recycle_cache_full",
+ "rx_pp_recycle_ring",
+ "rx_pp_recycle_ring_full",
+ "rx_pp_recycle_released_ref",
+};
+
bool page_pool_get_stats(struct page_pool *pool,
struct page_pool_stats *stats)
{
@@ -50,7 +65,13 @@ bool page_pool_get_stats(struct page_pool *pool,
if (!stats)
return false;
- memcpy(&stats->alloc_stats, &pool->alloc_stats, sizeof(pool->alloc_stats));
+ /* The caller is responsible to initialize stats. */
+ stats->alloc_stats.fast += pool->alloc_stats.fast;
+ stats->alloc_stats.slow += pool->alloc_stats.slow;
+ stats->alloc_stats.slow_high_order += pool->alloc_stats.slow_high_order;
+ stats->alloc_stats.empty += pool->alloc_stats.empty;
+ stats->alloc_stats.refill += pool->alloc_stats.refill;
+ stats->alloc_stats.waive += pool->alloc_stats.waive;
for_each_possible_cpu(cpu) {
const struct page_pool_recycle_stats *pcpu =
@@ -66,6 +87,46 @@ bool page_pool_get_stats(struct page_pool *pool,
return true;
}
EXPORT_SYMBOL(page_pool_get_stats);
+
+u8 *page_pool_ethtool_stats_get_strings(u8 *data)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(pp_stats); i++) {
+ memcpy(data, pp_stats[i], ETH_GSTRING_LEN);
+ data += ETH_GSTRING_LEN;
+ }
+
+ return data;
+}
+EXPORT_SYMBOL(page_pool_ethtool_stats_get_strings);
+
+int page_pool_ethtool_stats_get_count(void)
+{
+ return ARRAY_SIZE(pp_stats);
+}
+EXPORT_SYMBOL(page_pool_ethtool_stats_get_count);
+
+u64 *page_pool_ethtool_stats_get(u64 *data, void *stats)
+{
+ struct page_pool_stats *pp_stats = stats;
+
+ *data++ = pp_stats->alloc_stats.fast;
+ *data++ = pp_stats->alloc_stats.slow;
+ *data++ = pp_stats->alloc_stats.slow_high_order;
+ *data++ = pp_stats->alloc_stats.empty;
+ *data++ = pp_stats->alloc_stats.refill;
+ *data++ = pp_stats->alloc_stats.waive;
+ *data++ = pp_stats->recycle_stats.cached;
+ *data++ = pp_stats->recycle_stats.cache_full;
+ *data++ = pp_stats->recycle_stats.ring;
+ *data++ = pp_stats->recycle_stats.ring_full;
+ *data++ = pp_stats->recycle_stats.released_refcnt;
+
+ return data;
+}
+EXPORT_SYMBOL(page_pool_ethtool_stats_get);
+
#else
#define alloc_stat_inc(pool, __stat)
#define recycle_stat_inc(pool, __stat)
--
2.35.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v4 net-next 2/2] net: mvneta: add support for page_pool_get_stats
2022-04-11 15:11 [PATCH v4 net-next 0/2] net: mvneta: add support for page_pool_get_stats Lorenzo Bianconi
2022-04-11 15:11 ` [PATCH v4 net-next 1/2] net: page_pool: introduce ethtool stats Lorenzo Bianconi
@ 2022-04-11 15:11 ` Lorenzo Bianconi
2022-04-11 20:35 ` [PATCH v4 net-next 0/2] " Jakub Kicinski
2 siblings, 0 replies; 5+ messages in thread
From: Lorenzo Bianconi @ 2022-04-11 15:11 UTC (permalink / raw)
To: netdev
Cc: lorenzo.bianconi, davem, kuba, pabeni, thomas.petazzoni,
ilias.apalodimas, jbrouer, andrew, jdamato
Introduce support for the page_pool stats APIs into mvneta driver.
Report page_pool stats through ethtool.
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/ethernet/marvell/Kconfig | 1 +
drivers/net/ethernet/marvell/mvneta.c | 20 +++++++++++++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig
index fe0989c0fc25..1240cb2dc07f 100644
--- a/drivers/net/ethernet/marvell/Kconfig
+++ b/drivers/net/ethernet/marvell/Kconfig
@@ -62,6 +62,7 @@ config MVNETA
select MVMDIO
select PHYLINK
select PAGE_POOL
+ select PAGE_POOL_STATS
help
This driver supports the network interface units in the
Marvell ARMADA XP, ARMADA 370, ARMADA 38x and
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 934f6dd90992..f6a54c7f0c69 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -4735,6 +4735,9 @@ static void mvneta_ethtool_get_strings(struct net_device *netdev, u32 sset,
for (i = 0; i < ARRAY_SIZE(mvneta_statistics); i++)
memcpy(data + i * ETH_GSTRING_LEN,
mvneta_statistics[i].name, ETH_GSTRING_LEN);
+
+ data += ETH_GSTRING_LEN * ARRAY_SIZE(mvneta_statistics);
+ page_pool_ethtool_stats_get_strings(data);
}
}
@@ -4847,6 +4850,17 @@ static void mvneta_ethtool_update_stats(struct mvneta_port *pp)
}
}
+static void mvneta_ethtool_pp_stats(struct mvneta_port *pp, u64 *data)
+{
+ struct page_pool_stats stats = {};
+ int i;
+
+ for (i = 0; i < rxq_number; i++)
+ page_pool_get_stats(pp->rxqs[i].page_pool, &stats);
+
+ page_pool_ethtool_stats_get(data, &stats);
+}
+
static void mvneta_ethtool_get_stats(struct net_device *dev,
struct ethtool_stats *stats, u64 *data)
{
@@ -4857,12 +4871,16 @@ static void mvneta_ethtool_get_stats(struct net_device *dev,
for (i = 0; i < ARRAY_SIZE(mvneta_statistics); i++)
*data++ = pp->ethtool_stats[i];
+
+ mvneta_ethtool_pp_stats(pp, data);
}
static int mvneta_ethtool_get_sset_count(struct net_device *dev, int sset)
{
if (sset == ETH_SS_STATS)
- return ARRAY_SIZE(mvneta_statistics);
+ return ARRAY_SIZE(mvneta_statistics) +
+ page_pool_ethtool_stats_get_count();
+
return -EOPNOTSUPP;
}
--
2.35.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v4 net-next 0/2] net: mvneta: add support for page_pool_get_stats
2022-04-11 15:11 [PATCH v4 net-next 0/2] net: mvneta: add support for page_pool_get_stats Lorenzo Bianconi
2022-04-11 15:11 ` [PATCH v4 net-next 1/2] net: page_pool: introduce ethtool stats Lorenzo Bianconi
2022-04-11 15:11 ` [PATCH v4 net-next 2/2] net: mvneta: add support for page_pool_get_stats Lorenzo Bianconi
@ 2022-04-11 20:35 ` Jakub Kicinski
2022-04-11 21:12 ` Lorenzo Bianconi
2 siblings, 1 reply; 5+ messages in thread
From: Jakub Kicinski @ 2022-04-11 20:35 UTC (permalink / raw)
To: Lorenzo Bianconi
Cc: netdev, lorenzo.bianconi, davem, pabeni, thomas.petazzoni,
ilias.apalodimas, jbrouer, andrew, jdamato
On Mon, 11 Apr 2022 17:11:40 +0200 Lorenzo Bianconi wrote:
> Introduce page_pool stats ethtool APIs in order to avoid driver duplicated
> code.
Does not apply at the time of posting.
If series depends on other patches people post it as RFC until
dependencies are merged.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v4 net-next 0/2] net: mvneta: add support for page_pool_get_stats
2022-04-11 20:35 ` [PATCH v4 net-next 0/2] " Jakub Kicinski
@ 2022-04-11 21:12 ` Lorenzo Bianconi
0 siblings, 0 replies; 5+ messages in thread
From: Lorenzo Bianconi @ 2022-04-11 21:12 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Lorenzo Bianconi, netdev, davem, pabeni, thomas.petazzoni,
ilias.apalodimas, jbrouer, andrew, jdamato
[-- Attachment #1: Type: text/plain, Size: 595 bytes --]
> On Mon, 11 Apr 2022 17:11:40 +0200 Lorenzo Bianconi wrote:
> > Introduce page_pool stats ethtool APIs in order to avoid driver duplicated
> > code.
>
> Does not apply at the time of posting.
Yep, sorry. This series depends on the following patch I posted:
"v2: page_pool: Add recycle stats to page_pool_put_page_bulk"
https://lore.kernel.org/netdev/CAC_iWjJZYBR2OAUJuqrUU+UxX3G17OLZ6sgchOhfaWgB=reGTw@mail.gmail.com/T/#t
I will repost when it is merged.
Regards,
Lorenzo
>
> If series depends on other patches people post it as RFC until
> dependencies are merged.
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-04-11 21:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-11 15:11 [PATCH v4 net-next 0/2] net: mvneta: add support for page_pool_get_stats Lorenzo Bianconi
2022-04-11 15:11 ` [PATCH v4 net-next 1/2] net: page_pool: introduce ethtool stats Lorenzo Bianconi
2022-04-11 15:11 ` [PATCH v4 net-next 2/2] net: mvneta: add support for page_pool_get_stats Lorenzo Bianconi
2022-04-11 20:35 ` [PATCH v4 net-next 0/2] " Jakub Kicinski
2022-04-11 21:12 ` Lorenzo Bianconi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.