netdev - Re: [PATCH net-next v2 2/2] net: selftest: add test for netdev netlink queue-get API

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] [day] [month] [year] [list]

Message-ID: <5d1acb78-afd9-4a41-8306-347cb5bbeae7@davidwei.uk>
Date: Tue, 23 Apr 2024 13:04:19 -0700
From: David Wei <dw@...idwei.uk>
To: Willem de Bruijn <willemdebruijn.kernel@...il.com>, netdev@...r.kernel.org
Cc: Jakub Kicinski <kuba@...nel.org>, "David S. Miller"
 <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>,
 Paolo Abeni <pabeni@...hat.com>
Subject: Re: [PATCH net-next v2 2/2] net: selftest: add test for netdev
 netlink queue-get API

On 2024-04-21 7:56 am, Willem de Bruijn wrote:
> David Wei wrote:
>> Add a selftest for netdev generic netlink. For now there is only a
>> single test that exercises the `queue-get` API.
>>
>> The test works with netdevsim by default or with a real device by
>> setting NETIF.
>>
>> Signed-off-by: David Wei <dw@...idwei.uk>
>> ---
>>  tools/testing/selftests/drivers/net/Makefile  |  1 +
>>  .../selftests/drivers/net/lib/py/env.py       |  6 +-
>>  tools/testing/selftests/drivers/net/queues.py | 59 +++++++++++++++++++
>>  tools/testing/selftests/net/lib/py/nsim.py    |  4 +-
>>  4 files changed, 66 insertions(+), 4 deletions(-)
>>  create mode 100755 tools/testing/selftests/drivers/net/queues.py
>>
>> diff --git a/tools/testing/selftests/drivers/net/Makefile b/tools/testing/selftests/drivers/net/Makefile
>> index 379cdb1960a7..118a73650dbc 100644
>> --- a/tools/testing/selftests/drivers/net/Makefile
>> +++ b/tools/testing/selftests/drivers/net/Makefile
>> @@ -3,5 +3,6 @@
>>  TEST_INCLUDES := $(wildcard lib/py/*.py)
>>  
>>  TEST_PROGS := stats.py
>> +TEST_PROGS += queues.py
>>  
>>  include ../../lib.mk
>> diff --git a/tools/testing/selftests/drivers/net/lib/py/env.py b/tools/testing/selftests/drivers/net/lib/py/env.py
>> index e1abe9491daf..0ac4e9e6cd84 100644
>> --- a/tools/testing/selftests/drivers/net/lib/py/env.py
>> +++ b/tools/testing/selftests/drivers/net/lib/py/env.py
>> @@ -7,7 +7,7 @@ from lib.py import ip
>>  from lib.py import NetdevSimDev
>>  
>>  class NetDrvEnv:
>> -    def __init__(self, src_path):
>> +    def __init__(self, src_path, **kwargs):
>>          self._ns = None
>>  
>>          self.env = os.environ.copy()
>> @@ -16,11 +16,13 @@ class NetDrvEnv:
>>          if 'NETIF' in self.env:
>>              self.dev = ip("link show dev " + self.env['NETIF'], json=True)[0]
>>          else:
>> -            self._ns = NetdevSimDev()
>> +            self._ns = NetdevSimDev(**kwargs)
>>              self.dev = self._ns.nsims[0].dev
>>          self.ifindex = self.dev['ifindex']
>>  
>>      def __enter__(self):
>> +        ip(f"link set dev {self.dev['ifname']} up")
>> +
>>          return self
>>  
>>      def __exit__(self, ex_type, ex_value, ex_tb):
>> diff --git a/tools/testing/selftests/drivers/net/queues.py b/tools/testing/selftests/drivers/net/queues.py
>> new file mode 100755
>> index 000000000000..c23cd5a932cb
>> --- /dev/null
>> +++ b/tools/testing/selftests/drivers/net/queues.py
>> @@ -0,0 +1,59 @@
>> +#!/usr/bin/env python3
>> +# SPDX-License-Identifier: GPL-2.0
>> +
>> +from lib.py import ksft_run, ksft_eq, KsftSkipEx
>> +from lib.py import NetdevFamily
>> +from lib.py import NetDrvEnv
>> +from lib.py import cmd
>> +import glob
>> +
>> +
>> +def sys_get_queues(ifname) -> int:
>> +    folders = glob.glob(f'/sys/class/net/{ifname}/queues/rx-*')
>> +    return len(folders)
>> +
>> +
>> +def nl_get_queues(cfg, nl):
>> +    queues = nl.queue_get({'ifindex': cfg.ifindex}, dump=True)
>> +    if queues:
>> +        return len([q for q in queues if q['type'] == 'rx'])
>> +    return None
>> +
>> +
>> +def get_queues(cfg, nl) -> None:
>> +    queues = nl_get_queues(cfg, nl)
>> +    if not queues:
>> +        raise KsftSkipEx("queue-get not supported by device")
>> +
>> +    expected = sys_get_queues(cfg.dev['ifname'])
>> +    ksft_eq(queues, expected)
>> +
>> +
>> +def addremove_queues(cfg, nl) -> None:
>> +    queues = nl_get_queues(cfg, nl)
>> +    if not queues:
>> +        raise KsftSkipEx("queue-get not supported by device")
>> +
>> +    expected = sys_get_queues(cfg.dev['ifname'])
>> +    ksft_eq(queues, expected)
>> +
> 
> This is a copy of get_queues() above

I'll remove this part of the test case.

> 
>> +    # reduce queue count by 1
>> +    expected = expected - 1
> 
> Verify first that queue count > 1. Which it isn't in the test setup.

Thanks, I'll make sure changing the queues for a real device doesn't go
out of bounds.

> 
>> +    cmd(f"ethtool -L {cfg.dev['ifname']} combined {expected}")
>> +    queues = nl_get_queues(cfg, nl)
>> +    ksft_eq(queues, expected)
>> +
>> +    # increase queue count by 1
>> +    expected = expected + 1
>> +    cmd(f"ethtool -L {cfg.dev['ifname']} combined {expected}")
>> +    queues = nl_get_queues(cfg, nl)
>> +    ksft_eq(queues, expected)
>> +
>> +
>> +def main() -> None:
>> +    with NetDrvEnv(__file__, queue_count=3) as cfg:
>> +        ksft_run([get_queues, addremove_queues], args=(cfg, NetdevFamily()))
>> +
>> +
> 
>