[PATCH net-next v1 1/2] selftests: pp-bench: remove unneeded linux/version.h

[PATCH net-next v1 1/2] selftests: pp-bench: remove unneeded linux/version.h

[Mina Almasry]

linux/version.h was used by the out-of-tree version, but not needed in
the upstream one anymore.

While I'm at it, sort the includes.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202506271434.Gk0epC9H-lkp@intel.com/
Signed-off-by: Mina Almasry <almasrymina@google.com>
---
 .../selftests/net/bench/page_pool/bench_page_pool_simple.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c b/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c
index f183d5e30dc6..1cd3157fb6a9 100644
--- a/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c
+++ b/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c
@@ -5,15 +5,12 @@
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/interrupt.h>
+#include <linux/limits.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
-
-#include <linux/version.h>
 #include <net/page_pool/helpers.h>
 
-#include <linux/interrupt.h>
-#include <linux/limits.h>
-
 #include "time_bench.h"
 
 static int verbose = 1;

base-commit: 8efa26fcbf8a7f783fd1ce7dd2a409e9b7758df0
-- 
2.50.0.727.gbf7dc18ff4-goog

[PATCH net-next v1 2/2] selftests: pp-bench: remove page_pool_put_page wrapper

[Mina Almasry]

Minor cleanup: remove the pointless looking _ wrapper around
page_pool_put_page, and just do the call directly.

Signed-off-by: Mina Almasry <almasrymina@google.com>
---
 .../net/bench/page_pool/bench_page_pool_simple.c     | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c b/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c
index 1cd3157fb6a9..cb6468adbda4 100644
--- a/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c
+++ b/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c
@@ -16,12 +16,6 @@
 static int verbose = 1;
 #define MY_POOL_SIZE 1024
 
-static void _page_pool_put_page(struct page_pool *pool, struct page *page,
-				bool allow_direct)
-{
-	page_pool_put_page(pool, page, -1, allow_direct);
-}
-
 /* Makes tests selectable. Useful for perf-record to analyze a single test.
  * Hint: Bash shells support writing binary number like: $((2#101010)
  *
@@ -121,7 +115,7 @@ static void pp_fill_ptr_ring(struct page_pool *pp, int elems)
 	for (i = 0; i < elems; i++)
 		array[i] = page_pool_alloc_pages(pp, gfp_mask);
 	for (i = 0; i < elems; i++)
-		_page_pool_put_page(pp, array[i], false);
+		page_pool_put_page(pp, array[i], -1, false);
 
 	kfree(array);
 }
@@ -180,14 +174,14 @@ static int time_bench_page_pool(struct time_bench_record *rec, void *data,
 
 		} else if (type == type_ptr_ring) {
 			/* Normal return path */
-			_page_pool_put_page(pp, page, false);
+			page_pool_put_page(pp, page, -1, false);
 
 		} else if (type == type_page_allocator) {
 			/* Test if not pages are recycled, but instead
 			 * returned back into systems page allocator
 			 */
 			get_page(page); /* cause no-recycling */
-			_page_pool_put_page(pp, page, false);
+			page_pool_put_page(pp, page, -1, false);
 			put_page(page);
 		} else {
 			BUILD_BUG();
-- 
2.50.0.727.gbf7dc18ff4-goog

Re: [PATCH net-next v1 2/2] selftests: pp-bench: remove page_pool_put_page wrapper

[Simon Horman]

On Fri, Jun 27, 2025 at 08:04:52PM +0000, Mina Almasry wrote:
> Minor cleanup: remove the pointless looking _ wrapper around
> page_pool_put_page, and just do the call directly.
> 
> Signed-off-by: Mina Almasry <almasrymina@google.com>

Reviewed-by: Simon Horman <horms@kernel.org>

Re: [PATCH net-next v1 2/2] selftests: pp-bench: remove page_pool_put_page wrapper

[Toke Høiland-Jørgensen]

Mina Almasry <almasrymina@google.com> writes:

> Minor cleanup: remove the pointless looking _ wrapper around
> page_pool_put_page, and just do the call directly.
>
> Signed-off-by: Mina Almasry <almasrymina@google.com>

Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com>

Re: [PATCH net-next v1 2/2] selftests: pp-bench: remove page_pool_put_page wrapper

[Ilias Apalodimas]

On Fri, 27 Jun 2025 at 23:05, Mina Almasry <almasrymina@google.com> wrote:
>
> Minor cleanup: remove the pointless looking _ wrapper around
> page_pool_put_page, and just do the call directly.
>
> Signed-off-by: Mina Almasry <almasrymina@google.com>

Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

> ---
>  .../net/bench/page_pool/bench_page_pool_simple.c     | 12 +++---------
>  1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c b/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c
> index 1cd3157fb6a9..cb6468adbda4 100644
> --- a/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c
> +++ b/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c
> @@ -16,12 +16,6 @@
>  static int verbose = 1;
>  #define MY_POOL_SIZE 1024
>
> -static void _page_pool_put_page(struct page_pool *pool, struct page *page,
> -                               bool allow_direct)
> -{
> -       page_pool_put_page(pool, page, -1, allow_direct);
> -}
> -
>  /* Makes tests selectable. Useful for perf-record to analyze a single test.
>   * Hint: Bash shells support writing binary number like: $((2#101010)
>   *
> @@ -121,7 +115,7 @@ static void pp_fill_ptr_ring(struct page_pool *pp, int elems)
>         for (i = 0; i < elems; i++)
>                 array[i] = page_pool_alloc_pages(pp, gfp_mask);
>         for (i = 0; i < elems; i++)
> -               _page_pool_put_page(pp, array[i], false);
> +               page_pool_put_page(pp, array[i], -1, false);
>
>         kfree(array);
>  }
> @@ -180,14 +174,14 @@ static int time_bench_page_pool(struct time_bench_record *rec, void *data,
>
>                 } else if (type == type_ptr_ring) {
>                         /* Normal return path */
> -                       _page_pool_put_page(pp, page, false);
> +                       page_pool_put_page(pp, page, -1, false);
>
>                 } else if (type == type_page_allocator) {
>                         /* Test if not pages are recycled, but instead
>                          * returned back into systems page allocator
>                          */
>                         get_page(page); /* cause no-recycling */
> -                       _page_pool_put_page(pp, page, false);
> +                       page_pool_put_page(pp, page, -1, false);
>                         put_page(page);
>                 } else {
>                         BUILD_BUG();
> --
> 2.50.0.727.gbf7dc18ff4-goog
>

Re: [PATCH net-next v1 2/2] selftests: pp-bench: remove page_pool_put_page wrapper

[Jesper Dangaard Brouer]

On 27/06/2025 22.04, Mina Almasry wrote:
> Minor cleanup: remove the pointless looking _ wrapper around
> page_pool_put_page, and just do the call directly.
> 
> Signed-off-by: Mina Almasry <almasrymina@google.com>
> ---
>   .../net/bench/page_pool/bench_page_pool_simple.c     | 12 +++---------
>   1 file changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c b/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c
> index 1cd3157fb6a9..cb6468adbda4 100644
> --- a/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c
> +++ b/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c
> @@ -16,12 +16,6 @@
>   static int verbose = 1;
>   #define MY_POOL_SIZE 1024
>   
> -static void _page_pool_put_page(struct page_pool *pool, struct page *page,
> -				bool allow_direct)
> -{
> -	page_pool_put_page(pool, page, -1, allow_direct);
> -}
> -
>   /* Makes tests selectable. Useful for perf-record to analyze a single test.
>    * Hint: Bash shells support writing binary number like: $((2#101010)
>    *
> @@ -121,7 +115,7 @@ static void pp_fill_ptr_ring(struct page_pool *pp, int elems)
>   	for (i = 0; i < elems; i++)
>   		array[i] = page_pool_alloc_pages(pp, gfp_mask);
>   	for (i = 0; i < elems; i++)
> -		_page_pool_put_page(pp, array[i], false);
> +		page_pool_put_page(pp, array[i], -1, false);
>   
>   	kfree(array);
>   }
> @@ -180,14 +174,14 @@ static int time_bench_page_pool(struct time_bench_record *rec, void *data,
>   
>   		} else if (type == type_ptr_ring) {
>   			/* Normal return path */
> -			_page_pool_put_page(pp, page, false);
> +			page_pool_put_page(pp, page, -1, false);
>   
>   		} else if (type == type_page_allocator) {
>   			/* Test if not pages are recycled, but instead
>   			 * returned back into systems page allocator
>   			 */
>   			get_page(page); /* cause no-recycling */
> -			_page_pool_put_page(pp, page, false);
> +			page_pool_put_page(pp, page, -1, false);
>   			put_page(page);

The get_page() + put_page() trick is a fairly ugly workaround that I
added when Jakub removed page_pool_release_page() in commit 535b9c61bdef
("net: page_pool: hide page_pool_release_page()").

These extra refcnt increments will make the test slower, but if we are
just aware of this, then we can still compare incremental changes.

Acked-by: Jesper Dangaard Brouer <hawk@kernel.org>

>   		} else {
>   			BUILD_BUG();

Re: [PATCH net-next v1 1/2] selftests: pp-bench: remove unneeded linux/version.h

[Simon Horman]

On Fri, Jun 27, 2025 at 08:04:51PM +0000, Mina Almasry wrote:
> linux/version.h was used by the out-of-tree version, but not needed in
> the upstream one anymore.
> 
> While I'm at it, sort the includes.
> 
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202506271434.Gk0epC9H-lkp@intel.com/
> Signed-off-by: Mina Almasry <almasrymina@google.com>

Reviewed-by: Simon Horman <horms@kernel.org>

Re: [PATCH net-next v1 1/2] selftests: pp-bench: remove unneeded linux/version.h

[Toke Høiland-Jørgensen]

Mina Almasry <almasrymina@google.com> writes:

> linux/version.h was used by the out-of-tree version, but not needed in
> the upstream one anymore.
>
> While I'm at it, sort the includes.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202506271434.Gk0epC9H-lkp@intel.com/
> Signed-off-by: Mina Almasry <almasrymina@google.com>

Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com>

Re: [PATCH net-next v1 1/2] selftests: pp-bench: remove unneeded linux/version.h

[Ilias Apalodimas]

On Fri, 27 Jun 2025 at 23:05, Mina Almasry <almasrymina@google.com> wrote:
>
> linux/version.h was used by the out-of-tree version, but not needed in
> the upstream one anymore.
>
> While I'm at it, sort the includes.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202506271434.Gk0epC9H-lkp@intel.com/
> Signed-off-by: Mina Almasry <almasrymina@google.com>
> ---
>  .../selftests/net/bench/page_pool/bench_page_pool_simple.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)

Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

>
> diff --git a/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c b/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c
> index f183d5e30dc6..1cd3157fb6a9 100644
> --- a/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c
> +++ b/tools/testing/selftests/net/bench/page_pool/bench_page_pool_simple.c
> @@ -5,15 +5,12 @@
>   */
>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> +#include <linux/interrupt.h>
> +#include <linux/limits.h>
>  #include <linux/module.h>
>  #include <linux/mutex.h>
> -
> -#include <linux/version.h>
>  #include <net/page_pool/helpers.h>
>
> -#include <linux/interrupt.h>
> -#include <linux/limits.h>
> -
>  #include "time_bench.h"
>
>  static int verbose = 1;
>
> base-commit: 8efa26fcbf8a7f783fd1ce7dd2a409e9b7758df0
> --
> 2.50.0.727.gbf7dc18ff4-goog
>

Re: [PATCH net-next v1 1/2] selftests: pp-bench: remove unneeded linux/version.h

[Jesper Dangaard Brouer]

On 27/06/2025 22.04, Mina Almasry wrote:
> linux/version.h was used by the out-of-tree version, but not needed in
> the upstream one anymore.
> 
> While I'm at it, sort the includes.
> 
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202506271434.Gk0epC9H-lkp@intel.com/
> Signed-off-by: Mina Almasry <almasrymina@google.com>
> ---
>   .../selftests/net/bench/page_pool/bench_page_pool_simple.c | 7 ++-----
>   1 file changed, 2 insertions(+), 5 deletions(-)

Acked-by: Jesper Dangaard Brouer <hawk@kernel.org>

Re: [PATCH net-next v1 1/2] selftests: pp-bench: remove unneeded linux/version.h

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Fri, 27 Jun 2025 20:04:51 +0000 you wrote:
> linux/version.h was used by the out-of-tree version, but not needed in
> the upstream one anymore.
> 
> While I'm at it, sort the includes.
> 
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202506271434.Gk0epC9H-lkp@intel.com/
> Signed-off-by: Mina Almasry <almasrymina@google.com>
> 
> [...]

Here is the summary with links:
  - [net-next,v1,1/2] selftests: pp-bench: remove unneeded linux/version.h
    https://git.kernel.org/netdev/net-next/c/8d3e0982f7c2
  - [net-next,v1,2/2] selftests: pp-bench: remove page_pool_put_page wrapper
    https://git.kernel.org/netdev/net-next/c/be75d319d1b3

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html