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

selftests: drv-net: assume stats refresh is 0 if no ethtool -c support 



Tests using HW stats wait for them to stabilize, using data from
ethtool -c as the delay. Not all drivers implement ethtool -c
so handle the errors gracefully.

Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Link: https://patch.msgid.link/20241220003116.1458863-1-kuba@kernel.org


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

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

+7 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ import time 
from pathlib import Path

from lib.py import KsftSkipEx, KsftXfailEx

from lib.py import ksft_setup

from lib.py import cmd, ethtool, ip

from lib.py import cmd, ethtool, ip, CmdExitFailure

from lib.py import NetNS, NetdevSimDev

from .remote import Remote
@@ -234,7 +234,12 @@ class NetDrvEpEnv: 
        Good drivers will tell us via ethtool what their sync period is.

        """

        if self._stats_settle_time is None:

            data = {}

            try:

                data = ethtool("-c " + self.ifname, json=True)[0]

            except CmdExitFailure as e:

                if "Operation not supported" not in e.cmd.stderr:

                    raise



            self._stats_settle_time = 0.025 + \

                data.get('stats-block-usecs', 0) / 1000 / 1000

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

+4 −2
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ import time 




class CmdExitFailure(Exception):

    pass

    def __init__(self, msg, cmd_obj):

        super().__init__(msg)

        self.cmd = cmd_obj





class cmd:
@@ -48,7 +50,7 @@ class cmd: 
            if len(stderr) > 0 and stderr[-1] == "\n":

                stderr = stderr[:-1]

            raise CmdExitFailure("Command failed: %s\nSTDOUT: %s\nSTDERR: %s" %

                                 (self.proc.args, stdout, stderr))

                                 (self.proc.args, stdout, stderr), self)





class bkg(cmd):