Commit e514d773 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

selftests: drv-net: replace the rpath helper with Path objects 

The single letter + "path" helpers do not have many fans (see Link).
Use a Path object with a better name. test_dir is the replacement
for rpath(), net_lib_dir is a new path of the $ksft/net/lib directory.

The Path() class overloads the "/" operator and can be cast to string
automatically, so to get a path to a file tests can do:

    path = env.test_dir / "binary"

Link: https://lore.kernel.org/CA+FuTSemTNVZ5MxXkq8T9P=DYm=nSXcJnL7CJBPZNAT_9UFisQ@mail.gmail.com


Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Link: https://patch.msgid.link/20250327222315.1098596-2-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 7220e8f4

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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ def _get_hds_mode(cfg, netnl) -> str: 




def _xdp_onoff(cfg):

    prog = cfg.rpath("../../net/lib/xdp_dummy.bpf.o")

    prog = cfg.net_lib_dir / "xdp_dummy.bpf.o"

    ip("link set dev %s xdp obj %s sec xdp" %

       (cfg.ifname, prog))

    ip("link set dev %s xdp off" % cfg.ifname)

tools/testing/selftests/drivers/net/hw/csum.py

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ def main() -> None: 
    with NetDrvEpEnv(__file__, nsim_test=False) as cfg:

        check_nic_features(cfg)



        cfg.bin_local = cfg.rpath("../../../net/lib/csum")

        cfg.bin_local = cfg.net_lib_dir / "csum"

        cfg.bin_remote = cfg.remote.deploy(cfg.bin_local)



        cases = []

tools/testing/selftests/drivers/net/hw/irq.py

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ def check_reconfig_queues(cfg) -> None: 
def check_reconfig_xdp(cfg) -> None:

    def reconfig(cfg) -> None:

        ip(f"link set dev %s xdp obj %s sec xdp" %

            (cfg.ifname, cfg.rpath("xdp_dummy.bpf.o")))

           (cfg.ifname, cfg.test_dir / "xdp_dummy.bpf.o"))

        ip(f"link set dev %s xdp off" % cfg.ifname)



    _check_reconfig(cfg, reconfig)

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

+8 −13
Original line number Diff line number Diff line
@@ -13,22 +13,17 @@ from .remote import Remote 
class NetDrvEnvBase:

    """

    Base class for a NIC / host envirnoments

    """

    def __init__(self, src_path):

        self.src_path = src_path

        self.env = self._load_env_file()



    def rpath(self, path):

    Attributes:

      test_dir: Path to the source directory of the test

      net_lib_dir: Path to the net/lib directory

    """

        Get an absolute path to a file based on a path relative to the directory

        containing the test which constructed env.

    def __init__(self, src_path):

        self.src_path = Path(src_path)

        self.test_dir = self.src_path.parent.resolve()

        self.net_lib_dir = (Path(__file__).parent / "../../../../net/lib").resolve()



        For example, if the test.py is in the same directory as

        a binary (built from helper.c), the test can use env.rpath("helper")

        to get the absolute path to the binary

        """

        src_dir = Path(self.src_path).parent.resolve()

        return (src_dir / path).as_posix()

        self.env = self._load_env_file()



    def _load_env_file(self):

        env = os.environ.copy()

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

+2 −2
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ def nl_get_queues(cfg, nl, qtype='rx'): 


def check_xsk(cfg, nl, xdp_queue_id=0) -> None:

    # Probe for support

    xdp = cmd(cfg.rpath("xdp_helper") + ' - -', fail=False)

    xdp = cmd(f'{cfg.test_dir / "xdp_helper"} - -', fail=False)

    if xdp.ret == 255:

        raise KsftSkipEx('AF_XDP unsupported')

    elif xdp.ret > 0:

        raise KsftFailEx('unable to create AF_XDP socket')



    with bkg(f'{cfg.rpath("xdp_helper")} {cfg.ifindex} {xdp_queue_id}',

    with bkg(f'{cfg.test_dir / "xdp_helper"} {cfg.ifindex} {xdp_queue_id}',

             ksft_wait=3):



        rx = tx = False