| Message ID | 20241213152244.3080955-5-kuba@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1234810b1649e9d781aeafd4b23fb1fcfbf95d8f |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | netdev: fix repeated netlink messages in queue dumps | expand |
On Fri, Dec 13, 2024 at 07:22:43AM -0800, Jakub Kicinski wrote: > This test already catches a netlink bug fixed by this series, > but only when running on HW with many queues. Make sure the > netdevsim instance created has a lot of queues, and constrain > the size of the recv_buffer used by netlink. > > While at it test both rx and tx queues. Thanks for expanding the test to cover TX, as well. > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > --- > CC: shuah@kernel.org > CC: linux-kselftest@vger.kernel.org > --- > tools/testing/selftests/drivers/net/queues.py | 23 +++++++++++-------- > 1 file changed, 13 insertions(+), 10 deletions(-) > > diff --git a/tools/testing/selftests/drivers/net/queues.py b/tools/testing/selftests/drivers/net/queues.py > index 30f29096e27c..9c5473abbd78 100755 > --- a/tools/testing/selftests/drivers/net/queues.py > +++ b/tools/testing/selftests/drivers/net/queues.py > @@ -8,25 +8,28 @@ from lib.py import cmd > import glob > > > -def sys_get_queues(ifname) -> int: > - folders = glob.glob(f'/sys/class/net/{ifname}/queues/rx-*') > +def sys_get_queues(ifname, qtype='rx') -> int: > + folders = glob.glob(f'/sys/class/net/{ifname}/queues/{qtype}-*') > return len(folders) > > > -def nl_get_queues(cfg, nl): > +def nl_get_queues(cfg, nl, qtype='rx'): > queues = nl.queue_get({'ifindex': cfg.ifindex}, dump=True) > if queues: > - return len([q for q in queues if q['type'] == 'rx']) > + return len([q for q in queues if q['type'] == qtype]) > 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') > + snl = NetdevFamily(recv_size=4096) > > - expected = sys_get_queues(cfg.dev['ifname']) > - ksft_eq(queues, expected) > + for qtype in ['rx', 'tx']: > + queues = nl_get_queues(cfg, snl, qtype) > + if not queues: > + raise KsftSkipEx('queue-get not supported by device') > + > + expected = sys_get_queues(cfg.dev['ifname'], qtype) > + ksft_eq(queues, expected) > > > def addremove_queues(cfg, nl) -> None: > @@ -57,7 +60,7 @@ import glob > > > def main() -> None: > - with NetDrvEnv(__file__, queue_count=3) as cfg: > + with NetDrvEnv(__file__, queue_count=100) as cfg: > ksft_run([get_queues, addremove_queues], args=(cfg, NetdevFamily())) > ksft_exit() > Reviewed-by: Joe Damato <jdamato@fastly.com>
Jakub Kicinski <kuba@kernel.org> writes: > This test already catches a netlink bug fixed by this series, > but only when running on HW with many queues. Make sure the > netdevsim instance created has a lot of queues, and constrain > the size of the recv_buffer used by netlink. > > While at it test both rx and tx queues. > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > --- > CC: shuah@kernel.org > CC: linux-kselftest@vger.kernel.org > --- > tools/testing/selftests/drivers/net/queues.py | 23 +++++++++++-------- > 1 file changed, 13 insertions(+), 10 deletions(-) > > diff --git a/tools/testing/selftests/drivers/net/queues.py b/tools/testing/selftests/drivers/net/queues.py > index 30f29096e27c..9c5473abbd78 100755 > --- a/tools/testing/selftests/drivers/net/queues.py > +++ b/tools/testing/selftests/drivers/net/queues.py > @@ -8,25 +8,28 @@ from lib.py import cmd > import glob > > > -def sys_get_queues(ifname) -> int: > - folders = glob.glob(f'/sys/class/net/{ifname}/queues/rx-*') > +def sys_get_queues(ifname, qtype='rx') -> int: > + folders = glob.glob(f'/sys/class/net/{ifname}/queues/{qtype}-*') > return len(folders) > > > -def nl_get_queues(cfg, nl): > +def nl_get_queues(cfg, nl, qtype='rx'): > queues = nl.queue_get({'ifindex': cfg.ifindex}, dump=True) > if queues: > - return len([q for q in queues if q['type'] == 'rx']) > + return len([q for q in queues if q['type'] == qtype]) > 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') > + snl = NetdevFamily(recv_size=4096) > > - expected = sys_get_queues(cfg.dev['ifname']) > - ksft_eq(queues, expected) > + for qtype in ['rx', 'tx']: > + queues = nl_get_queues(cfg, snl, qtype) > + if not queues: > + raise KsftSkipEx('queue-get not supported by device') Passing qtype in the message might be helpful here. > + > + expected = sys_get_queues(cfg.dev['ifname'], qtype) > + ksft_eq(queues, expected) > > > def addremove_queues(cfg, nl) -> None: > @@ -57,7 +60,7 @@ import glob > > > def main() -> None: > - with NetDrvEnv(__file__, queue_count=3) as cfg: > + with NetDrvEnv(__file__, queue_count=100) as cfg: > ksft_run([get_queues, addremove_queues], args=(cfg, NetdevFamily())) > ksft_exit() Hmm, get_queues() doesn't use the passed-in NetdevFamily(), but that gets created anyway for addremove_queues(), so whatever. Reviewed-by: Petr Machata <petrm@nvidia.com>
diff --git a/tools/testing/selftests/drivers/net/queues.py b/tools/testing/selftests/drivers/net/queues.py index 30f29096e27c..9c5473abbd78 100755 --- a/tools/testing/selftests/drivers/net/queues.py +++ b/tools/testing/selftests/drivers/net/queues.py @@ -8,25 +8,28 @@ from lib.py import cmd import glob -def sys_get_queues(ifname) -> int: - folders = glob.glob(f'/sys/class/net/{ifname}/queues/rx-*') +def sys_get_queues(ifname, qtype='rx') -> int: + folders = glob.glob(f'/sys/class/net/{ifname}/queues/{qtype}-*') return len(folders) -def nl_get_queues(cfg, nl): +def nl_get_queues(cfg, nl, qtype='rx'): queues = nl.queue_get({'ifindex': cfg.ifindex}, dump=True) if queues: - return len([q for q in queues if q['type'] == 'rx']) + return len([q for q in queues if q['type'] == qtype]) 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') + snl = NetdevFamily(recv_size=4096) - expected = sys_get_queues(cfg.dev['ifname']) - ksft_eq(queues, expected) + for qtype in ['rx', 'tx']: + queues = nl_get_queues(cfg, snl, qtype) + if not queues: + raise KsftSkipEx('queue-get not supported by device') + + expected = sys_get_queues(cfg.dev['ifname'], qtype) + ksft_eq(queues, expected) def addremove_queues(cfg, nl) -> None: @@ -57,7 +60,7 @@ import glob def main() -> None: - with NetDrvEnv(__file__, queue_count=3) as cfg: + with NetDrvEnv(__file__, queue_count=100) as cfg: ksft_run([get_queues, addremove_queues], args=(cfg, NetdevFamily())) ksft_exit()
This test already catches a netlink bug fixed by this series, but only when running on HW with many queues. Make sure the netdevsim instance created has a lot of queues, and constrain the size of the recv_buffer used by netlink. While at it test both rx and tx queues. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- CC: shuah@kernel.org CC: linux-kselftest@vger.kernel.org --- tools/testing/selftests/drivers/net/queues.py | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-)