| Message ID | 20240912171251.937743-14-sdf@fomichev.me (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | selftests: ncdevmem: Add ncdevmem to ksft | expand |
On Thu, Sep 12, 2024 at 10:13 AM Stanislav Fomichev <sdf@fomichev.me> wrote: > > Only RX side for now and small message to test the setup. > In the future, we can extend it to TX side and to testing > both sides with a couple of megs of data. > > make \ > -C tools/testing/selftests \ > TARGETS="drivers/net" \ > install INSTALL_PATH=~/tmp/ksft > > scp ~/tmp/ksft ${HOST}: > scp ~/tmp/ksft ${PEER}: > > cfg+="NETIF=${DEV}\n" > cfg+="LOCAL_V6=${HOST_IP}\n" > cfg+="REMOTE_V6=${PEER_IP}\n" > cfg+="REMOTE_TYPE=ssh\n" > cfg+="REMOTE_ARGS=root@${PEER}\n" > > echo -e "$cfg" | ssh root@${HOST} "cat > ksft/drivers/net/net.config" > ssh root@${HOST} "cd ksft && ./run_kselftest.sh -t drivers/net:devmem.py" > > Cc: Mina Almasry <almasrymina@google.com> > Signed-off-by: Stanislav Fomichev <sdf@fomichev.me> Thank you _very_ much. I had an action item to figure this out, and awesome to see you beat me to it! I'll take a deeper look and test and provide reviewed-by. > --- > tools/testing/selftests/drivers/net/Makefile | 1 + > tools/testing/selftests/drivers/net/devmem.py | 46 +++++++++++++++++++ > 2 files changed, 47 insertions(+) > create mode 100755 tools/testing/selftests/drivers/net/devmem.py > > diff --git a/tools/testing/selftests/drivers/net/Makefile b/tools/testing/selftests/drivers/net/Makefile > index bb8f7374942e..00da59970a76 100644 > --- a/tools/testing/selftests/drivers/net/Makefile > +++ b/tools/testing/selftests/drivers/net/Makefile > @@ -5,6 +5,7 @@ TEST_INCLUDES := $(wildcard lib/py/*.py) \ > ../../net/lib.sh \ > > TEST_PROGS := \ > + devmem.py \ > netcons_basic.sh \ > ping.py \ > queues.py \ > diff --git a/tools/testing/selftests/drivers/net/devmem.py b/tools/testing/selftests/drivers/net/devmem.py > new file mode 100755 > index 000000000000..bbd32e0b0fe2 > --- /dev/null > +++ b/tools/testing/selftests/drivers/net/devmem.py > @@ -0,0 +1,46 @@ > +#!/usr/bin/env python3 > +# SPDX-License-Identifier: GPL-2.0 > + > +import errno > +from lib.py import ksft_run, ksft_exit > +from lib.py import ksft_eq, KsftSkipEx > +from lib.py import NetDrvEpEnv > +from lib.py import bkg, cmd, rand_port, wait_port_listen > +from lib.py import ksft_disruptive > + > + > +def require_devmem(cfg): > + if not hasattr(cfg, "_devmem_probed"): > + port = rand_port() > + probe_command = f"./ncdevmem -P -f {cfg.ifname} -s {cfg.v6} -p {port}" > + cfg._devmem_supported = cmd(probe_command, fail=False, shell=True).ret == 0 > + cfg._devmem_probed = True > + > + if not cfg._devmem_supported: > + raise KsftSkipEx("Test requires devmem support") > + > + > +@ksft_disruptive > +def check_rx(cfg) -> None: > + cfg.require_v6() > + require_devmem(cfg) > + > + port = rand_port() > + listen_cmd = f"./ncdevmem -l -f {cfg.ifname} -s {cfg.v6} -p {port}" > + > + with bkg(listen_cmd) as nc: > + wait_port_listen(port) > + cmd(f"echo -e \"hello\\nworld\"| nc {cfg.v6} {port}", host=cfg.remote, shell=True) > + > + ksft_eq(nc.stdout.strip(), "hello\nworld") > + > + > +def main() -> None: > + with NetDrvEpEnv(__file__) as cfg: > + ksft_run([check_rx], > + args=(cfg, )) > + ksft_exit() > + > + > +if __name__ == "__main__": > + main() > -- > 2.46.0 > -- Thanks, Mina
diff --git a/tools/testing/selftests/drivers/net/Makefile b/tools/testing/selftests/drivers/net/Makefile index bb8f7374942e..00da59970a76 100644 --- a/tools/testing/selftests/drivers/net/Makefile +++ b/tools/testing/selftests/drivers/net/Makefile @@ -5,6 +5,7 @@ TEST_INCLUDES := $(wildcard lib/py/*.py) \ ../../net/lib.sh \ TEST_PROGS := \ + devmem.py \ netcons_basic.sh \ ping.py \ queues.py \ diff --git a/tools/testing/selftests/drivers/net/devmem.py b/tools/testing/selftests/drivers/net/devmem.py new file mode 100755 index 000000000000..bbd32e0b0fe2 --- /dev/null +++ b/tools/testing/selftests/drivers/net/devmem.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +import errno +from lib.py import ksft_run, ksft_exit +from lib.py import ksft_eq, KsftSkipEx +from lib.py import NetDrvEpEnv +from lib.py import bkg, cmd, rand_port, wait_port_listen +from lib.py import ksft_disruptive + + +def require_devmem(cfg): + if not hasattr(cfg, "_devmem_probed"): + port = rand_port() + probe_command = f"./ncdevmem -P -f {cfg.ifname} -s {cfg.v6} -p {port}" + cfg._devmem_supported = cmd(probe_command, fail=False, shell=True).ret == 0 + cfg._devmem_probed = True + + if not cfg._devmem_supported: + raise KsftSkipEx("Test requires devmem support") + + +@ksft_disruptive +def check_rx(cfg) -> None: + cfg.require_v6() + require_devmem(cfg) + + port = rand_port() + listen_cmd = f"./ncdevmem -l -f {cfg.ifname} -s {cfg.v6} -p {port}" + + with bkg(listen_cmd) as nc: + wait_port_listen(port) + cmd(f"echo -e \"hello\\nworld\"| nc {cfg.v6} {port}", host=cfg.remote, shell=True) + + ksft_eq(nc.stdout.strip(), "hello\nworld") + + +def main() -> None: + with NetDrvEpEnv(__file__) as cfg: + ksft_run([check_rx], + args=(cfg, )) + ksft_exit() + + +if __name__ == "__main__": + main()
Only RX side for now and small message to test the setup. In the future, we can extend it to TX side and to testing both sides with a couple of megs of data. make \ -C tools/testing/selftests \ TARGETS="drivers/net" \ install INSTALL_PATH=~/tmp/ksft scp ~/tmp/ksft ${HOST}: scp ~/tmp/ksft ${PEER}: cfg+="NETIF=${DEV}\n" cfg+="LOCAL_V6=${HOST_IP}\n" cfg+="REMOTE_V6=${PEER_IP}\n" cfg+="REMOTE_TYPE=ssh\n" cfg+="REMOTE_ARGS=root@${PEER}\n" echo -e "$cfg" | ssh root@${HOST} "cat > ksft/drivers/net/net.config" ssh root@${HOST} "cd ksft && ./run_kselftest.sh -t drivers/net:devmem.py" Cc: Mina Almasry <almasrymina@google.com> Signed-off-by: Stanislav Fomichev <sdf@fomichev.me> --- tools/testing/selftests/drivers/net/Makefile | 1 + tools/testing/selftests/drivers/net/devmem.py | 46 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100755 tools/testing/selftests/drivers/net/devmem.py