diff --git a/tools/testing/selftests/drivers/net/gro_lib.py b/tools/testing/selftests/drivers/net/gro_lib.py
index 45ded8477a50..8edae7d736a9 100644
--- a/tools/testing/selftests/drivers/net/gro_lib.py
+++ b/tools/testing/selftests/drivers/net/gro_lib.py
@@ -189,7 +189,8 @@ def _setup_queue_count(cfg, num_queues):
def _run_gro_bin(cfg, test_name, protocol=None, num_flows=None,
- order_check=False, verbose=False, fail=False):
+ order_check=False, verbose=False, fail=False,
+ common_args=None):
"""Run gro binary with given test and return the process result."""
if not hasattr(cfg, "bin_remote"):
cfg.bin_local = cfg.net_lib_dir / "gro"@@ -217,6 +218,8 @@ def _run_gro_bin(cfg, test_name, protocol=None, num_flows=None,
base_args.append("--order-check")
if verbose:
base_args.append("--verbose")
+ if common_args:
+ base_args += common_args
args = " ".join(base_args)
@@ -341,8 +344,11 @@ def _gro_variants():
yield protocol, test_name
-def run_test(cfg, mode, protocol, test_name):
- """Run a single GRO test with retries."""
+def run_test(cfg, mode, protocol, test_name, common_args=None):
+ """Run a single GRO test with retries.
+
+ common_args are extra arguments passed to both gro sender and receiver.
+ """
ipver = "6" if protocol[-1] == "6" else "4"
cfg.require_ipver(ipver)@@ -356,7 +362,8 @@ def run_test(cfg, mode, protocol, test_name):
for attempt in range(max_retries):
fail_now = attempt >= max_retries - 1
rx_proc = _run_gro_bin(cfg, test_name, protocol=protocol,
- verbose=True, fail=fail_now)
+ verbose=True, fail=fail_now,
+ common_args=common_args)
if rx_proc.ret == 0:
returndiff --git a/tools/testing/selftests/drivers/net/hw/Makefile b/tools/testing/selftests/drivers/net/hw/Makefile
index 6105be8e590f..daa7e52f236e 100644
--- a/tools/testing/selftests/drivers/net/hw/Makefile
+++ b/tools/testing/selftests/drivers/net/hw/Makefile
@@ -13,6 +13,20 @@ else
$(warning excluding iouring tests, liburing not installed or too old)
endif
+# psp_gro.py uses the gro binary in PSP mode, which requires OpenSSL.
+PKG_CONFIG ?= pkg-config
+HAVE_OPENSSL := $(shell echo 'int main(void) { return 0; }' | \
+ $(CC) -x c - -include openssl/evp.h \
+ $(shell $(PKG_CONFIG) --cflags --libs libcrypto 2>/dev/null \
+ || echo -lcrypto) \
+ -o /dev/null >/dev/null 2>&1 && echo 1)
+
+ifeq ($(HAVE_OPENSSL),1)
+COND_PROGS += psp_gro.py
+else
+$(warning excluding PSP GRO tests, libcrypto not installed)
+endif
+
TEST_GEN_FILES := \
$(COND_GEN_FILES) \
# end of TEST_GEN_FILES@@ -40,6 +54,7 @@ TEST_PROGS = \
nk_qlease.py \
ntuple.py \
pp_alloc_fail.py \
+ $(COND_PROGS) \
rss_api.py \
rss_ctx.py \
rss_drv.py \
@@ -64,6 +79,8 @@ TEST_FILES := \
TEST_INCLUDES := \
$(wildcard lib/py/*.py ../lib/py/*.py) \
+ ../gro_lib.py \
+ ../psp_lib.py \
../../../net/lib.sh \
../../../net/forwarding/ipip_lib.sh \
../../../net/forwarding/lib.sh \
diff --git a/tools/testing/selftests/drivers/net/hw/config b/tools/testing/selftests/drivers/net/hw/config
index d89a9ba17655..060ed1423bf3 100644
--- a/tools/testing/selftests/drivers/net/hw/config
+++ b/tools/testing/selftests/drivers/net/hw/config
@@ -8,6 +8,7 @@ CONFIG_INET6_ESP=y
CONFIG_INET6_ESP_OFFLOAD=y
CONFIG_INET_ESP=y
CONFIG_INET_ESP_OFFLOAD=y
+CONFIG_INET_PSP=y
CONFIG_IO_URING=y
CONFIG_IPV6=y
CONFIG_IPV6_GRE=y
diff --git a/tools/testing/selftests/drivers/net/hw/psp_gro.py b/tools/testing/selftests/drivers/net/hw/psp_gro.py
new file mode 100755
index 000000000000..3a069c944ae1
--- /dev/null
+++ b/tools/testing/selftests/drivers/net/hw/psp_gro.py
@@ -0,0 +1,157 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: GPL-2.0
+
+"""
+PSP HW GRO conformance tests.
+
+This reuses the gro binary in --psp mode:
+The sender crafts encapsulated & SW-encrypted PSP packets with receiver's PSP
+rx-assoc, and the receiver's device decrypts and decapsulates the packets
+before an AF_PACKET tap gets to analyze them.
+
+All GRO conformance tests which could run with PSP are included.
+"""
+
+import socket
+
+from lib.py import ksft_run, ksft_exit
+from lib.py import ksft_variants, KsftNamedVariant
+from lib.py import KsftSkipEx
+from lib.py import NetDrvEpEnv, PSPFamily
+from lib.py import defer
+
+# The helpers live next to their other users, gro_*.py and psp.py. Importing
+# lib.py above puts the selftests root on sys.path, which is what makes these
+# two resolve, so they have to stay after it - pylint wants the opposite.
+# pylint: disable=wrong-import-order,import-error
+from drivers.net.gro_lib import run_test
+from drivers.net.psp_lib import init_psp_dev, require_version
+# pylint: enable=wrong-import-order,import-error
+
+
+# Tests for both IP versions, a subset of gro tests. Missing:
+# - tcp_csum: PSP packets are validated by HW (with the ICV) and marked with
+# CHECKSUM_UNNECESSARY.
+_COMMON = ["data_same", "data_lrg_sml", "data_sml_lrg", "data_lrg_1byte",
+ "data_burst",
+ "ack",
+ "flags_psh", "flags_syn", "flags_rst", "flags_urg", "flags_cwr",
+ "tcp_seq", "tcp_ts", "tcp_opt",
+ "ip_ecn", "ip_tos",
+ "large_max", "large_rem",
+]
+
+# Tests specific to IPv4, a subset of gro tests. Missing:
+# - ip_csum: psp_dev_rcv() recomputes the IP checksum.
+# - ip_frag4: PSP is incompatible with IP fragmentation.
+_V4 = ["ip_ttl", "ip_opt",
+ "ip_id_df1_inc", "ip_id_df1_fixed",
+ "ip_id_df0_inc", "ip_id_df0_fixed",
+ "ip_id_df1_inc_fixed", "ip_id_df1_fixed_inc",
+]
+
+# No IPv6-only tests:
+# - ip_frag6: PSP doesn't support fragmentation
+# - ip_v6ext_same, ip_v6ext_diff: PSP doesn't support IPv6 ext headers.
+
+
+def _psp_variants():
+ for ver in range(4):
+ for proto in ["ipv4", "ipv6"]:
+ for test_name in _COMMON + (_V4 if proto == "ipv4" else []):
+ yield KsftNamedVariant(f"v{ver}_{proto}_{test_name}",
+ ver, proto, test_name)
+
+
+def _ip_variants():
+ """IPv4/IPv6."""
+ for proto in ("ipv4", "ipv6"):
+ yield KsftNamedVariant(proto, proto)
+
+
+def _psp_assoc(cfg, version=0):
+ # This socket receives no traffic, exists solely to own the rx assoc.
+ s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+ defer(s.close)
+ return cfg.pspnl.rx_assoc({"version": version, "dev-id": cfg.psp_dev_id,
+ "sock-fd": s.fileno()})['rx-key']
+
+
+def _setup(cfg, version):
+ """Enables PSP on the device under test."""
+ init_psp_dev(cfg)
+ require_version(cfg, version)
+
+
+def _psp_args(cfg, versions):
+ """Produces PSP associations as gro binary --psp-assoc arguments."""
+ keys = [_psp_assoc(cfg, ver) for ver in versions]
+ return [f"--psp-assoc {ver},{key['spi']:x},{key['key'].hex()}"
+ for ver, key in zip(versions, keys)]
+
+
+def _run(cfg, test_name, protocol, versions):
+ """Sets up, associates and runs one gro test case under PSP + HW GRO."""
+ _setup(cfg, max(versions))
+
+ run_test(cfg, "hw", protocol, test_name,
+ common_args=_psp_args(cfg, versions))
+
+
+@ksft_variants(_psp_variants())
+def test_psp_gro(cfg, version, protocol, test_name):
+ """Runs one gro conformance case with PSP encapsulation."""
+ _run(cfg, test_name, protocol, [version])
+
+
+# PSP-specific GRO tests
+
+@ksft_variants(_ip_variants())
+def test_psp_spi_diff(cfg, protocol):
+ """Frames from two different SPIs must not coalesce."""
+ _run(cfg, "psp_spi_diff", protocol, [0, 0])
+
+
+@ksft_variants(_ip_variants())
+def test_psp_ver_diff(cfg, protocol):
+ """Frames from two different PSP versions must not coalesce."""
+ init_psp_dev(cfg)
+ if len(cfg.psp_info['psp-versions-cap']) < 2:
+ raise KsftSkipEx("Device supports a single PSP version")
+
+ _run(cfg, "psp_ver_diff", protocol, [0, 1])
+
+
+@ksft_variants(_ip_variants())
+def test_psp_mixed(cfg, protocol):
+ """A PSP frame must not coalesce with a clear text one."""
+ _run(cfg, "psp_mixed", protocol, [0])
+
+
+@ksft_variants(_ip_variants())
+def test_psp_after_reconfig(cfg, protocol):
+ """Verifies that decap still works after PSP off + on."""
+ _setup(cfg, 0)
+
+ cap = cfg.psp_info['psp-versions-cap']
+ cfg.pspnl.dev_set({'id': cfg.psp_dev_id, 'psp-versions-ena': []})
+ cfg.pspnl.dev_set({'id': cfg.psp_dev_id, 'psp-versions-ena': cap})
+
+ run_test(cfg, "hw", protocol, "data_same",
+ common_args=_psp_args(cfg, [0]))
+
+
+def main() -> None:
+ """ Ksft boiler plate main """
+
+ with NetDrvEpEnv(__file__, nsim_test=False) as cfg:
+ cfg.pspnl = PSPFamily()
+
+ ksft_run(cases=[test_psp_gro, test_psp_spi_diff, test_psp_ver_diff,
+ test_psp_mixed, test_psp_after_reconfig],
+ args=(cfg, ))
+ ksft_exit()
+
+
+if __name__ == "__main__":
+ main()--
2.44.0