target/linux/generic/backport-5.15/604-v5.19-net-page_pool-introduce-ethtool-stats.patch

   1 commit f3c5264f452a5b0ac1de1f2f657efbabdea3c76a
   2 Author: Lorenzo Bianconi <lorenzo@kernel.org>
   3 Date:   Tue Apr 12 18:31:58 2022 +0200
   4
   5     net: page_pool: introduce ethtool stats
   6
   7     Introduce page_pool APIs to report stats through ethtool and reduce
   8     duplicated code in each driver.
   9
  10     Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  11     Reviewed-by: Jakub Kicinski <kuba@kernel.org>
  12     Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
  13     Signed-off-by: David S. Miller <davem@davemloft.net>
  14
  15 --- a/include/net/page_pool.h
  16 +++ b/include/net/page_pool.h
  17 @@ -115,6 +115,10 @@ struct page_pool_stats {
  18         struct page_pool_recycle_stats recycle_stats;
  19  };
  20
  21 +int page_pool_ethtool_stats_get_count(void);
  22 +u8 *page_pool_ethtool_stats_get_strings(u8 *data);
  23 +u64 *page_pool_ethtool_stats_get(u64 *data, void *stats);
  24 +
  25  /*
  26   * Drivers that wish to harvest page pool stats and report them to users
  27   * (perhaps via ethtool, debugfs, or another mechanism) can allocate a
  28 @@ -122,6 +126,23 @@ struct page_pool_stats {
  29   */
  30  bool page_pool_get_stats(struct page_pool *pool,
  31                          struct page_pool_stats *stats);
  32 +#else
  33 +
  34 +static inline int page_pool_ethtool_stats_get_count(void)
  35 +{
  36 +       return 0;
  37 +}
  38 +
  39 +static inline u8 *page_pool_ethtool_stats_get_strings(u8 *data)
  40 +{
  41 +       return data;
  42 +}
  43 +
  44 +static inline u64 *page_pool_ethtool_stats_get(u64 *data, void *stats)
  45 +{
  46 +       return data;
  47 +}
  48 +
  49  #endif
  50
  51  struct page_pool {
  52 --- a/net/core/page_pool.c
  53 +++ b/net/core/page_pool.c
  54 @@ -18,6 +18,7 @@
  55  #include <linux/page-flags.h>
  56  #include <linux/mm.h> /* for __put_page() */
  57  #include <linux/poison.h>
  58 +#include <linux/ethtool.h>
  59
  60  #include <trace/events/page_pool.h>
  61
  62 @@ -42,6 +43,20 @@
  63                 this_cpu_add(s->__stat, val);                                           \
  64         } while (0)
  65
  66 +static const char pp_stats[][ETH_GSTRING_LEN] = {
  67 +       "rx_pp_alloc_fast",
  68 +       "rx_pp_alloc_slow",
  69 +       "rx_pp_alloc_slow_ho",
  70 +       "rx_pp_alloc_empty",
  71 +       "rx_pp_alloc_refill",
  72 +       "rx_pp_alloc_waive",
  73 +       "rx_pp_recycle_cached",
  74 +       "rx_pp_recycle_cache_full",
  75 +       "rx_pp_recycle_ring",
  76 +       "rx_pp_recycle_ring_full",
  77 +       "rx_pp_recycle_released_ref",
  78 +};
  79 +
  80  bool page_pool_get_stats(struct page_pool *pool,
  81                          struct page_pool_stats *stats)
  82  {
  83 @@ -50,7 +65,13 @@ bool page_pool_get_stats(struct page_poo
  84         if (!stats)
  85                 return false;
  86
  87 -       memcpy(&stats->alloc_stats, &pool->alloc_stats, sizeof(pool->alloc_stats));
  88 +       /* The caller is responsible to initialize stats. */
  89 +       stats->alloc_stats.fast += pool->alloc_stats.fast;
  90 +       stats->alloc_stats.slow += pool->alloc_stats.slow;
  91 +       stats->alloc_stats.slow_high_order += pool->alloc_stats.slow_high_order;
  92 +       stats->alloc_stats.empty += pool->alloc_stats.empty;
  93 +       stats->alloc_stats.refill += pool->alloc_stats.refill;
  94 +       stats->alloc_stats.waive += pool->alloc_stats.waive;
  95
  96         for_each_possible_cpu(cpu) {
  97                 const struct page_pool_recycle_stats *pcpu =
  98 @@ -66,6 +87,46 @@ bool page_pool_get_stats(struct page_poo
  99         return true;
 100  }
 101  EXPORT_SYMBOL(page_pool_get_stats);
 102 +
 103 +u8 *page_pool_ethtool_stats_get_strings(u8 *data)
 104 +{
 105 +       int i;
 106 +
 107 +       for (i = 0; i < ARRAY_SIZE(pp_stats); i++) {
 108 +               memcpy(data, pp_stats[i], ETH_GSTRING_LEN);
 109 +               data += ETH_GSTRING_LEN;
 110 +       }
 111 +
 112 +       return data;
 113 +}
 114 +EXPORT_SYMBOL(page_pool_ethtool_stats_get_strings);
 115 +
 116 +int page_pool_ethtool_stats_get_count(void)
 117 +{
 118 +       return ARRAY_SIZE(pp_stats);
 119 +}
 120 +EXPORT_SYMBOL(page_pool_ethtool_stats_get_count);
 121 +
 122 +u64 *page_pool_ethtool_stats_get(u64 *data, void *stats)
 123 +{
 124 +       struct page_pool_stats *pool_stats = stats;
 125 +
 126 +       *data++ = pool_stats->alloc_stats.fast;
 127 +       *data++ = pool_stats->alloc_stats.slow;
 128 +       *data++ = pool_stats->alloc_stats.slow_high_order;
 129 +       *data++ = pool_stats->alloc_stats.empty;
 130 +       *data++ = pool_stats->alloc_stats.refill;
 131 +       *data++ = pool_stats->alloc_stats.waive;
 132 +       *data++ = pool_stats->recycle_stats.cached;
 133 +       *data++ = pool_stats->recycle_stats.cache_full;
 134 +       *data++ = pool_stats->recycle_stats.ring;
 135 +       *data++ = pool_stats->recycle_stats.ring_full;
 136 +       *data++ = pool_stats->recycle_stats.released_refcnt;
 137 +
 138 +       return data;
 139 +}
 140 +EXPORT_SYMBOL(page_pool_ethtool_stats_get);
 141 +
 142  #else
 143  #define alloc_stat_inc(pool, __stat)
 144  #define recycle_stat_inc(pool, __stat)