Commit b3820e0e authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Paolo Abeni
Browse files

selftests: drv-net: psp: add tests for destroying devices 



Add tests for making sure device can disappear while associations
exist. This is netdevsim-only since destroying real devices is
more tricky.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDaniel Zahka <daniel.zahka@gmail.com>
Link: https://patch.msgid.link/20250927225420.1443468-9-kuba@kernel.org


Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 81236c74

tools/testing/selftests/drivers/net/hw/lib/py/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ try: 
    from net.lib.py import ksft_disruptive, ksft_exit, ksft_pr, ksft_run, \

        ksft_setup

    from net.lib.py import ksft_eq, ksft_ge, ksft_in, ksft_is, ksft_lt, \

        ksft_ne, ksft_not_in, ksft_raises, ksft_true, ksft_gt

        ksft_ne, ksft_not_in, ksft_raises, ksft_true, ksft_gt, ksft_not_none

    from net.lib.py import NetNSEnter

    from drivers.net.lib.py import GenerateTraffic

    from drivers.net.lib.py import NetDrvEnv, NetDrvEpEnv

tools/testing/selftests/drivers/net/lib/py/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ try: 
    from net.lib.py import ksft_disruptive, ksft_exit, ksft_pr, ksft_run, \

        ksft_setup

    from net.lib.py import ksft_eq, ksft_ge, ksft_in, ksft_is, ksft_lt, \

        ksft_ne, ksft_not_in, ksft_raises, ksft_true, ksft_gt

        ksft_ne, ksft_not_in, ksft_raises, ksft_true, ksft_gt, ksft_not_none

except ModuleNotFoundError as e:

    ksft_pr("Failed importing `net` library from kernel sources")

    ksft_pr(str(e))

tools/testing/selftests/drivers/net/lib/py/env.py

+4 −0
Original line number Diff line number Diff line
@@ -245,6 +245,10 @@ class NetDrvEpEnv(NetDrvEnvBase): 
        if not self.addr_v[ipver] or not self.remote_addr_v[ipver]:

            raise KsftSkipEx(f"Test requires IPv{ipver} connectivity")



    def require_nsim(self):

        if self._ns is None:

            raise KsftXfailEx("Test only works on netdevsim")



    def _require_cmd(self, comm, key, host=None):

        cached = self._required_cmd.get(comm, {})

        if cached.get(key) is None:

tools/testing/selftests/drivers/net/psp.py

+57 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ import time 
from lib.py import defer

from lib.py import ksft_run, ksft_exit, ksft_pr

from lib.py import ksft_true, ksft_eq, ksft_ne, ksft_gt, ksft_raises

from lib.py import ksft_not_none

from lib.py import KsftSkipEx

from lib.py import NetDrvEpEnv, PSPFamily, NlError

from lib.py import bkg, rand_port, wait_port_listen
@@ -500,6 +501,61 @@ def data_stale_key(cfg): 
        _close_psp_conn(cfg, s)





def __nsim_psp_rereg(cfg):

    # The PSP dev ID will change, remember what was there before

    before = set([x['id'] for x in cfg.pspnl.dev_get({}, dump=True)])



    cfg._ns.nsims[0].dfs_write('psp_rereg', '1')



    after = set([x['id'] for x in cfg.pspnl.dev_get({}, dump=True)])



    new_devs = list(after - before)

    ksft_eq(len(new_devs), 1)

    cfg.psp_dev_id = list(after - before)[0]





def removal_device_rx(cfg):

    """ Test removing a netdev / PSD with active Rx assoc """



    # We could technically devlink reload real devices, too

    # but that kills the control socket. So test this on

    # netdevsim only for now

    cfg.require_nsim()



    s = _make_clr_conn(cfg)

    try:

        rx_assoc = cfg.pspnl.rx_assoc({"version": 0,

                                       "dev-id": cfg.psp_dev_id,

                                       "sock-fd": s.fileno()})

        ksft_not_none(rx_assoc)



        __nsim_psp_rereg(cfg)

    finally:

        _close_conn(cfg, s)





def removal_device_bi(cfg):

    """ Test removing a netdev / PSD with active Rx/Tx assoc """



    # We could technically devlink reload real devices, too

    # but that kills the control socket. So test this on

    # netdevsim only for now

    cfg.require_nsim()



    s = _make_clr_conn(cfg)

    try:

        rx_assoc = cfg.pspnl.rx_assoc({"version": 0,

                                       "dev-id": cfg.psp_dev_id,

                                       "sock-fd": s.fileno()})

        cfg.pspnl.tx_assoc({"dev-id": cfg.psp_dev_id,

                            "version": 0,

                            "tx-key": rx_assoc['rx-key'],

                            "sock-fd": s.fileno()})

        __nsim_psp_rereg(cfg)

    finally:

        _close_conn(cfg, s)





def psp_ip_ver_test_builder(name, test_func, psp_ver, ipver):

    """Build test cases for each combo of PSP version and IP version"""

    def test_case(cfg):
@@ -551,7 +607,7 @@ def main() -> None: 
                ]



                ksft_run(cases=cases, globs=globals(),

                         case_pfx={"dev_", "data_", "assoc_"},

                         case_pfx={"dev_", "data_", "assoc_", "removal_"},

                         args=(cfg, ))



                cfg.comm_sock.send(b"exit\0")

tools/testing/selftests/net/lib/py/ksft.py

+5 −0
Original line number Diff line number Diff line
@@ -72,6 +72,11 @@ def ksft_true(a, comment=""): 
        _fail("Check failed", a, "does not eval to True", comment)





def ksft_not_none(a, comment=""):

    if a is None:

        _fail("Check failed", a, "is None", comment)





def ksft_in(a, b, comment=""):

    if a not in b:

        _fail("Check failed", a, "not in", b, comment)