netdev - Re: [PATCH net-next v3 10/12] selftests: ncdevmem: Run selftest when none of the -s or -c has been provided

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAHS8izMCwm+iW2u_jTTzNW0DPV7Rc3HHev+t8N+iof4XmaeChw@mail.gmail.com>
Date: Tue, 15 Oct 2024 01:47:48 +0300
From: Mina Almasry <almasrymina@...gle.com>
To: Stanislav Fomichev <sdf@...ichev.me>
Cc: netdev@...r.kernel.org, davem@...emloft.net, edumazet@...gle.com, 
	kuba@...nel.org, pabeni@...hat.com
Subject: Re: [PATCH net-next v3 10/12] selftests: ncdevmem: Run selftest when
 none of the -s or -c has been provided

On Wed, Oct 9, 2024 at 8:13 PM Stanislav Fomichev <sdf@...ichev.me> wrote:
>
> This will be used as a 'probe' mode in the selftest to check whether
> the device supports the devmem or not. Use hard-coded queue layout
> (two last queues) and prevent user from passing custom -q and/or -t.
>
> Cc: Mina Almasry <almasrymina@...gle.com>
> Signed-off-by: Stanislav Fomichev <sdf@...ichev.me>
> ---
>  tools/testing/selftests/net/ncdevmem.c | 42 ++++++++++++++++++++------
>  1 file changed, 32 insertions(+), 10 deletions(-)
>
> diff --git a/tools/testing/selftests/net/ncdevmem.c b/tools/testing/selftests/net/ncdevmem.c
> index 90aacfb3433f..3a456c058241 100644
> --- a/tools/testing/selftests/net/ncdevmem.c
> +++ b/tools/testing/selftests/net/ncdevmem.c
> @@ -64,7 +64,7 @@ static char *client_ip;
>  static char *port;
>  static size_t do_validation;
>  static int start_queue = -1;
> -static int num_queues = 1;
> +static int num_queues = -1;
>  static char *ifname;
>  static unsigned int ifindex;
>  static unsigned int dmabuf_id;
> @@ -706,19 +706,31 @@ int main(int argc, char *argv[])
>                 }
>         }
>
> -       if (!server_ip)
> -               error(1, 0, "Missing -s argument\n");
> -
> -       if (!port)
> -               error(1, 0, "Missing -p argument\n");
> -
>         if (!ifname)
>                 error(1, 0, "Missing -f argument\n");
>
>         ifindex = if_nametoindex(ifname);
>
> -       if (start_queue < 0) {
> -               start_queue = rxq_num(ifindex) - 1;
> +       if (!server_ip && !client_ip) {
> +               if (start_queue < 0 && num_queues < 0) {
> +                       num_queues = rxq_num(ifindex);
> +                       if (num_queues < 0)
> +                               error(1, 0, "couldn't detect number of queues\n");
> +                       /* make sure can bind to multiple queues */
> +                       start_queues = num_queues / 2;
> +                       num_queues /= 2;
> +               }
> +
> +               if (start_queue < 0 || num_queues < 0)
> +                       error(1, 0, "Both -t and -q are requred\n");
> +
> +               run_devmem_tests();
> +               return 0;
> +       }
> +
> +       if (start_queue < 0 && num_queues < 0) {
> +               num_queues = 1;
> +               start_queue = rxq_num(ifindex) - num_queues;
>

Nit: this can be written into the more readable:

// set start_queues = rxq_num / 2;
if (!server_ip && !client_ip) {
  // set num_queues rxq_num/2
  run_devmem_tests();
} else {
  // set num_queue = 1.
  run_server();
}

With build error fixed:

Reviewed-by: Mina Almasry <almasrymina@...gle.com>


-- 
Thanks,
Mina