From: Saeed Mahameed <saeedm@nvidia.com>
Expose the stats of the new headers page pool.
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Reviewed-by: Dragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: Cosmin Ratiu <cratiu@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
---
.../ethernet/mellanox/mlx5/core/en_stats.c | 53 +++++++++++++++++++
.../ethernet/mellanox/mlx5/core/en_stats.h | 24 +++++++++
2 files changed, 77 insertions(+)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
index 19664fa7f217..dcfe86d6dc83 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
@@ -205,6 +205,18 @@ static const struct counter_desc sw_stats_desc[] = {
{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_recycle_ring) },
{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_recycle_ring_full) },
{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_recycle_released_ref) },
+
+ { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_hd_alloc_fast) },
+ { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_hd_alloc_slow) },
+ { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_hd_alloc_slow_high_order) },
+ { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_hd_alloc_empty) },
+ { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_hd_alloc_refill) },
+ { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_hd_alloc_waive) },
+ { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_hd_recycle_cached) },
+ { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_hd_recycle_cache_full) },
+ { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_hd_recycle_ring) },
+ { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_hd_recycle_ring_full) },
+ { MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_pp_hd_recycle_released_ref) },
#ifdef CONFIG_MLX5_EN_TLS
{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_tls_decrypted_packets) },
{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_tls_decrypted_bytes) },
@@ -384,6 +396,18 @@ static void mlx5e_stats_grp_sw_update_stats_rq_stats(struct mlx5e_sw_stats *s,
s->rx_pp_recycle_ring += rq_stats->pp_recycle_ring;
s->rx_pp_recycle_ring_full += rq_stats->pp_recycle_ring_full;
s->rx_pp_recycle_released_ref += rq_stats->pp_recycle_released_ref;
+
+ s->rx_pp_hd_alloc_fast += rq_stats->pp_hd_alloc_fast;
+ s->rx_pp_hd_alloc_slow += rq_stats->pp_hd_alloc_slow;
+ s->rx_pp_hd_alloc_empty += rq_stats->pp_hd_alloc_empty;
+ s->rx_pp_hd_alloc_refill += rq_stats->pp_hd_alloc_refill;
+ s->rx_pp_hd_alloc_waive += rq_stats->pp_hd_alloc_waive;
+ s->rx_pp_hd_alloc_slow_high_order += rq_stats->pp_hd_alloc_slow_high_order;
+ s->rx_pp_hd_recycle_cached += rq_stats->pp_hd_recycle_cached;
+ s->rx_pp_hd_recycle_cache_full += rq_stats->pp_hd_recycle_cache_full;
+ s->rx_pp_hd_recycle_ring += rq_stats->pp_hd_recycle_ring;
+ s->rx_pp_hd_recycle_ring_full += rq_stats->pp_hd_recycle_ring_full;
+ s->rx_pp_hd_recycle_released_ref += rq_stats->pp_hd_recycle_released_ref;
#ifdef CONFIG_MLX5_EN_TLS
s->rx_tls_decrypted_packets += rq_stats->tls_decrypted_packets;
s->rx_tls_decrypted_bytes += rq_stats->tls_decrypted_bytes;
@@ -511,6 +535,23 @@ static void mlx5e_stats_update_stats_rq_page_pool(struct mlx5e_channel *c)
rq_stats->pp_recycle_ring = stats.recycle_stats.ring;
rq_stats->pp_recycle_ring_full = stats.recycle_stats.ring_full;
rq_stats->pp_recycle_released_ref = stats.recycle_stats.released_refcnt;
+
+ pool = c->rq.hd_page_pool;
+ if (!pool || !page_pool_get_stats(pool, &stats))
+ return;
+
+ rq_stats->pp_hd_alloc_fast = stats.alloc_stats.fast;
+ rq_stats->pp_hd_alloc_slow = stats.alloc_stats.slow;
+ rq_stats->pp_hd_alloc_slow_high_order = stats.alloc_stats.slow_high_order;
+ rq_stats->pp_hd_alloc_empty = stats.alloc_stats.empty;
+ rq_stats->pp_hd_alloc_waive = stats.alloc_stats.waive;
+ rq_stats->pp_hd_alloc_refill = stats.alloc_stats.refill;
+
+ rq_stats->pp_hd_recycle_cached = stats.recycle_stats.cached;
+ rq_stats->pp_hd_recycle_cache_full = stats.recycle_stats.cache_full;
+ rq_stats->pp_hd_recycle_ring = stats.recycle_stats.ring;
+ rq_stats->pp_hd_recycle_ring_full = stats.recycle_stats.ring_full;
+ rq_stats->pp_hd_recycle_released_ref = stats.recycle_stats.released_refcnt;
}
static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(sw)
@@ -2130,6 +2171,18 @@ static const struct counter_desc rq_stats_desc[] = {
{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_recycle_ring) },
{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_recycle_ring_full) },
{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_recycle_released_ref) },
+
+ { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_hd_alloc_fast) },
+ { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_hd_alloc_slow) },
+ { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_hd_alloc_slow_high_order) },
+ { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_hd_alloc_empty) },
+ { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_hd_alloc_refill) },
+ { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_hd_alloc_waive) },
+ { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_hd_recycle_cached) },
+ { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_hd_recycle_cache_full) },
+ { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_hd_recycle_ring) },
+ { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_hd_recycle_ring_full) },
+ { MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, pp_hd_recycle_released_ref) },
#ifdef CONFIG_MLX5_EN_TLS
{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, tls_decrypted_packets) },
{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, tls_decrypted_bytes) },
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
index def5dea1463d..113221dfcdfa 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
@@ -226,6 +226,18 @@ struct mlx5e_sw_stats {
u64 rx_pp_recycle_ring;
u64 rx_pp_recycle_ring_full;
u64 rx_pp_recycle_released_ref;
+
+ u64 rx_pp_hd_alloc_fast;
+ u64 rx_pp_hd_alloc_slow;
+ u64 rx_pp_hd_alloc_slow_high_order;
+ u64 rx_pp_hd_alloc_empty;
+ u64 rx_pp_hd_alloc_refill;
+ u64 rx_pp_hd_alloc_waive;
+ u64 rx_pp_hd_recycle_cached;
+ u64 rx_pp_hd_recycle_cache_full;
+ u64 rx_pp_hd_recycle_ring;
+ u64 rx_pp_hd_recycle_ring_full;
+ u64 rx_pp_hd_recycle_released_ref;
#ifdef CONFIG_MLX5_EN_TLS
u64 tx_tls_encrypted_packets;
u64 tx_tls_encrypted_bytes;
@@ -394,6 +406,18 @@ struct mlx5e_rq_stats {
u64 pp_recycle_ring;
u64 pp_recycle_ring_full;
u64 pp_recycle_released_ref;
+
+ u64 pp_hd_alloc_fast;
+ u64 pp_hd_alloc_slow;
+ u64 pp_hd_alloc_slow_high_order;
+ u64 pp_hd_alloc_empty;
+ u64 pp_hd_alloc_refill;
+ u64 pp_hd_alloc_waive;
+ u64 pp_hd_recycle_cached;
+ u64 pp_hd_recycle_cache_full;
+ u64 pp_hd_recycle_ring;
+ u64 pp_hd_recycle_ring_full;
+ u64 pp_hd_recycle_released_ref;
#ifdef CONFIG_MLX5_EN_TLS
u64 tls_decrypted_packets;
u64 tls_decrypted_bytes;
--
2.31.1On Fri, 23 May 2025 00:41:22 +0300 Tariq Toukan wrote: > Expose the stats of the new headers page pool. Nope. We have a netlink API for page pool stats.
On 22 May 15:31, Jakub Kicinski wrote: >On Fri, 23 May 2025 00:41:22 +0300 Tariq Toukan wrote: >> Expose the stats of the new headers page pool. > >Nope. We have a netlink API for page pool stats. > We already expose the stats of the main pool in ethtool. So it will be an inconvenience to keep exposing half of the stats. So either we delete both or keep both. Some of us rely on this for debug
On Thu, 2025-05-22 at 15:58 -0700, Saeed Mahameed wrote: > On 22 May 15:31, Jakub Kicinski wrote: > > On Fri, 23 May 2025 00:41:22 +0300 Tariq Toukan wrote: > > > Expose the stats of the new headers page pool. > > > > Nope. We have a netlink API for page pool stats. > > > > We already expose the stats of the main pool in ethtool. > So it will be an inconvenience to keep exposing half of the stats. > So either we delete both or keep both. Some of us rely on this for > debug > What is the conclusion here? Do we keep this patch, to have all the stats in the same place? Or do we remove it, and then half of the stats will be accessible through both ethtool and netlink, and the other half only via netlink? Cosmin.
On 06/06/2025 13:43, Cosmin Ratiu wrote: > On Thu, 2025-05-22 at 15:58 -0700, Saeed Mahameed wrote: >> On 22 May 15:31, Jakub Kicinski wrote: >>> On Fri, 23 May 2025 00:41:22 +0300 Tariq Toukan wrote: >>>> Expose the stats of the new headers page pool. >>> >>> Nope. We have a netlink API for page pool stats. >>> >> >> We already expose the stats of the main pool in ethtool. >> So it will be an inconvenience to keep exposing half of the stats. >> So either we delete both or keep both. Some of us rely on this for >> debug >> > > What is the conclusion here? > Do we keep this patch, to have all the stats in the same place? > Or do we remove it, and then half of the stats will be accessible > through both ethtool and netlink, and the other half only via netlink? > > Cosmin. IIRC, the netlink API shows only the overall/sum, right? ethtool stats show you per-ring numbers, this is very helpful for system monitoring and perf debug.
On Sun, 8 Jun 2025 13:09:16 +0300 Tariq Toukan wrote: > >> We already expose the stats of the main pool in ethtool. > >> So it will be an inconvenience to keep exposing half of the stats. > >> So either we delete both or keep both. Some of us rely on this for > >> debug > >> > > > > What is the conclusion here? > > Do we keep this patch, to have all the stats in the same place? > > Or do we remove it, and then half of the stats will be accessible > > through both ethtool and netlink, and the other half only via netlink? Unfortunately by that logic we would never be able to move away from deprecated APIs. > IIRC, the netlink API shows only the overall/sum, right? Wrong. > ethtool stats show you per-ring numbers, this is very helpful for system > monitoring and perf debug.
© 2016 - 2025 Red Hat, Inc.