From: Cosmin Ratiu <[email protected]> Put init_psp_dev() and the logic for requiring a psp version into a shared lib, since they will soon be used by a second test file.
No functional change for psp.py. Signed-off-by: Cosmin Ratiu <[email protected]> Reviewed-by: Dragos Tatulea <[email protected]> Signed-off-by: Tariq Toukan <[email protected]> --- tools/testing/selftests/drivers/net/Makefile | 4 + tools/testing/selftests/drivers/net/psp.py | 77 ++++++------------- .../testing/selftests/drivers/net/psp_lib.py | 57 ++++++++++++++ 3 files changed, 85 insertions(+), 53 deletions(-) create mode 100644 tools/testing/selftests/drivers/net/psp_lib.py diff --git a/tools/testing/selftests/drivers/net/Makefile b/tools/testing/selftests/drivers/net/Makefile index d5bf4cb638a8..d68f9ab8955d 100644 --- a/tools/testing/selftests/drivers/net/Makefile +++ b/tools/testing/selftests/drivers/net/Makefile @@ -27,6 +27,10 @@ TEST_PROGS := \ xdp.py \ # end of TEST_PROGS +TEST_FILES := \ + psp_lib.py \ +# end of TEST_FILES + # YNL files, must be before "include ..lib.mk" YNL_GEN_FILES := psp_responder TEST_GEN_FILES += $(YNL_GEN_FILES) diff --git a/tools/testing/selftests/drivers/net/psp.py b/tools/testing/selftests/drivers/net/psp.py index 315648a770d0..47983fb8c7c2 100755 --- a/tools/testing/selftests/drivers/net/psp.py +++ b/tools/testing/selftests/drivers/net/psp.py @@ -11,6 +11,8 @@ import struct import termios import time +from psp_lib import init_psp_dev, require_version + 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 @@ -122,34 +124,13 @@ def _get_stat(cfg, key): # Test case boiler plate # -def _init_psp_dev(cfg, use_psp_ifindex=False): - if not hasattr(cfg, 'psp_dev_id'): - # Figure out which local device we are testing against - # For NetDrvContEnv: use psp_ifindex instead of ifindex - target_ifindex = cfg.psp_ifindex if use_psp_ifindex else cfg.ifindex - for dev in cfg.pspnl.dev_get({}, dump=True): - if dev['ifindex'] == target_ifindex: - cfg.psp_info = dev - cfg.psp_dev_id = cfg.psp_info['id'] - break - else: - raise KsftSkipEx("No PSP devices found") - - # Enable PSP if necessary - cap = cfg.psp_info['psp-versions-cap'] - ena = cfg.psp_info['psp-versions-ena'] - if cap != ena: - cfg.pspnl.dev_set({'id': cfg.psp_dev_id, 'psp-versions-ena': cap}) - defer(cfg.pspnl.dev_set, {'id': cfg.psp_dev_id, - 'psp-versions-ena': ena }) - # # Test cases # def dev_list_devices(cfg): """ Dump all devices """ - _init_psp_dev(cfg) + init_psp_dev(cfg) devices = cfg.pspnl.dev_get({}, dump=True) @@ -161,7 +142,7 @@ def dev_list_devices(cfg): def dev_get_device(cfg): """ Get the device we intend to use """ - _init_psp_dev(cfg) + init_psp_dev(cfg) dev = cfg.pspnl.dev_get({'id': cfg.psp_dev_id}) ksft_eq(dev['id'], cfg.psp_dev_id) @@ -180,7 +161,7 @@ def dev_get_device_bad(cfg): def dev_rotate(cfg): """ Test key rotation """ - _init_psp_dev(cfg) + init_psp_dev(cfg) prev_rotations = _get_stat(cfg, 'key-rotations') @@ -195,7 +176,7 @@ def dev_rotate(cfg): def dev_rotate_spi(cfg): """ Test key rotation and SPI check """ - _init_psp_dev(cfg) + init_psp_dev(cfg) top_a = top_b = 0 with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s: @@ -217,7 +198,7 @@ def dev_rotate_spi(cfg): def assoc_basic(cfg): """ Test creating associations """ - _init_psp_dev(cfg) + init_psp_dev(cfg) with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s: assoc = cfg.pspnl.rx_assoc({"version": 0, @@ -237,7 +218,7 @@ def assoc_basic(cfg): def assoc_bad_dev(cfg): """ Test creating associations with bad device ID """ - _init_psp_dev(cfg) + init_psp_dev(cfg) with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s: with ksft_raises(NlError) as cm: @@ -249,7 +230,7 @@ def assoc_bad_dev(cfg): def assoc_sk_only_conn(cfg): """ Test creating associations based on socket """ - _init_psp_dev(cfg) + init_psp_dev(cfg) with _make_clr_conn(cfg) as s: assoc = cfg.pspnl.rx_assoc({"version": 0, @@ -263,7 +244,7 @@ def assoc_sk_only_conn(cfg): def assoc_sk_only_mismatch(cfg): """ Test creating associations based on socket (dev mismatch) """ - _init_psp_dev(cfg) + init_psp_dev(cfg) with _make_clr_conn(cfg) as s: with ksft_raises(NlError) as cm: @@ -278,7 +259,7 @@ def assoc_sk_only_mismatch(cfg): def assoc_sk_only_mismatch_tx(cfg): """ Test creating associations based on socket (dev mismatch) """ - _init_psp_dev(cfg) + init_psp_dev(cfg) with _make_clr_conn(cfg) as s: with ksft_raises(NlError) as cm: @@ -296,7 +277,7 @@ def assoc_sk_only_mismatch_tx(cfg): def assoc_sk_only_unconn(cfg): """ Test creating associations based on socket (unconnected, should fail) """ - _init_psp_dev(cfg) + init_psp_dev(cfg) with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s: with ksft_raises(NlError) as cm: @@ -309,7 +290,7 @@ def assoc_sk_only_unconn(cfg): def assoc_version_mismatch(cfg): """ Test creating associations where Rx and Tx PSP versions do not match """ - _init_psp_dev(cfg) + init_psp_dev(cfg) versions = list(cfg.psp_info['psp-versions-cap']) if len(versions) < 2: @@ -335,7 +316,7 @@ def assoc_version_mismatch(cfg): def assoc_twice(cfg): """ Test reusing Tx assoc for two sockets """ - _init_psp_dev(cfg) + init_psp_dev(cfg) def rx_assoc_check(s): assoc = cfg.pspnl.rx_assoc({"version": 0, @@ -369,19 +350,9 @@ def assoc_twice(cfg): def _data_basic_send(cfg, version, ipver): """ Test basic data send """ - _init_psp_dev(cfg) - - # Version 0 is required by spec, don't let it skip - if version: - name = cfg.pspnl.consts["version"].entries_by_val[version].name - if name not in cfg.psp_info['psp-versions-cap']: - with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s: - with ksft_raises(NlError) as cm: - cfg.pspnl.rx_assoc({"version": version, - "dev-id": cfg.psp_dev_id, - "sock-fd": s.fileno()}) - ksft_eq(cm.exception.nl_msg.error, -errno.EOPNOTSUPP) - raise KsftSkipEx("PSP version not supported", name) + init_psp_dev(cfg) + + require_version(cfg, version) s = _make_psp_conn(cfg, version, ipver) @@ -418,7 +389,7 @@ def __bad_xfer_do(cfg, s, tx, version='hdr0-aes-gcm-128'): def data_send_bad_key(cfg): """ Test send data with bad key """ - _init_psp_dev(cfg) + init_psp_dev(cfg) s = _make_psp_conn(cfg) @@ -433,7 +404,7 @@ def data_send_bad_key(cfg): def data_send_disconnect(cfg): """ Test socket close after sending data """ - _init_psp_dev(cfg) + init_psp_dev(cfg) with _make_psp_conn(cfg) as s: assoc = cfg.pspnl.rx_assoc({"version": 0, @@ -451,7 +422,7 @@ def data_send_disconnect(cfg): def _data_mss_adjust(cfg, ipver): - _init_psp_dev(cfg) + init_psp_dev(cfg) # First figure out what the MSS would be without any adjustments s = _make_clr_conn(cfg, ipver) @@ -491,7 +462,7 @@ def _data_mss_adjust(cfg, ipver): def data_stale_key(cfg): """ Test send on a double-rotated key """ - _init_psp_dev(cfg) + init_psp_dev(cfg) prev_stale = _get_stat(cfg, 'stale-events') s = _make_psp_conn(cfg) @@ -766,7 +737,7 @@ def _psp_dev_get_check_netkit_psp_assoc(cfg): def _dev_assoc_no_nsid(cfg): """ Test dev-assoc and dev-disassoc without nsid attribute """ - _init_psp_dev(cfg, True) + init_psp_dev(cfg, True) # Associate without nsid - should look up ifindex in caller's netns cfg.pspnl.dev_assoc({'id': cfg.psp_dev_id, @@ -800,7 +771,7 @@ def _psp_dev_assoc_cleanup_on_netkit_del(cfg): Creates a disposable netkit pair for this test to avoid destroying the shared environment. """ - _init_psp_dev(cfg, True) + init_psp_dev(cfg, True) defer(delattr, cfg, 'psp_dev_id') defer(delattr, cfg, 'psp_info') @@ -877,7 +848,7 @@ def _try_disassoc(cfg, psp_dev_id, ifindex, nsid=None): def _assoc_nk_guest(cfg): """Associate nk_guest with PSP device and register cleanup via defer().""" - _init_psp_dev(cfg, True) + init_psp_dev(cfg, True) cfg.pspnl.dev_assoc({'id': cfg.psp_dev_id, 'ifindex': cfg.nk_guest_ifindex, diff --git a/tools/testing/selftests/drivers/net/psp_lib.py b/tools/testing/selftests/drivers/net/psp_lib.py new file mode 100644 index 000000000000..d450db81cfc2 --- /dev/null +++ b/tools/testing/selftests/drivers/net/psp_lib.py @@ -0,0 +1,57 @@ +# SPDX-License-Identifier: GPL-2.0 + +"""Shared helpers for the PSP selftests.""" + +import errno +import socket + +from lib.py import defer +from lib.py import ksft_eq, ksft_raises +from lib.py import KsftSkipEx +from lib.py import NlError + + +def require_version(cfg, version): + """Skip unless the device supports a PSP version. + + Version 0 is required by the spec, so it never skips. Before + skipping, check that the kernel rejects the unsupported version + properly - this is the only coverage that path gets. + """ + if not version: + return + + name = cfg.pspnl.consts["version"].entries_by_val[version].name + if name in cfg.psp_info['psp-versions-cap']: + return + + with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s: + with ksft_raises(NlError) as cm: + cfg.pspnl.rx_assoc({"version": version, + "dev-id": cfg.psp_dev_id, + "sock-fd": s.fileno()}) + ksft_eq(cm.exception.nl_msg.error, -errno.EOPNOTSUPP) + raise KsftSkipEx("PSP version not supported", name) + + +def init_psp_dev(cfg, use_psp_ifindex=False): + """Find the PSP device under test and enable all supported versions.""" + if not hasattr(cfg, 'psp_dev_id'): + # Figure out which local device we are testing against + # For NetDrvContEnv: use psp_ifindex instead of ifindex + target_ifindex = cfg.psp_ifindex if use_psp_ifindex else cfg.ifindex + for dev in cfg.pspnl.dev_get({}, dump=True): + if dev['ifindex'] == target_ifindex: + cfg.psp_info = dev + cfg.psp_dev_id = cfg.psp_info['id'] + break + else: + raise KsftSkipEx("No PSP devices found") + + # Enable PSP if necessary + cap = cfg.psp_info['psp-versions-cap'] + ena = cfg.psp_info['psp-versions-ena'] + if cap != ena: + cfg.pspnl.dev_set({'id': cfg.psp_dev_id, 'psp-versions-ena': cap}) + defer(cfg.pspnl.dev_set, {'id': cfg.psp_dev_id, + 'psp-versions-ena': ena}) -- 2.44.0
