From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=67.231.153.30 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794947577; b=j5e3prsYnmbAz8sObe8ThSTFIdkKd0XdyPiqgN48PXt63wa1o4gBXZdwF+tb0XkZpk4T beMRRs2Ft9HuzSd0VdeK5ugddy9HBykSvS7UFBIN5LjpSAEAF//tk5I64idUboEJPMxrL XR9EOp7gxEA6Xh4RJHds5GF2bgPDG7J74JoQsviwm8zV0ex/5iQoRQujgZE66RuqvOQXh QRu17CT7/WrcOdNFDXjVPdMisAULvZr1f+TGoFkBckJUn3brOksPNmbcmWzismaa5OGpk H5g+EQPelerR8mmDR3sXnxXF1gGj83q1n3x9jtKck8LX0z2lOnP55iIe/5q9d/KeFJw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794947577; h=DMARC-Filter:Received:DKIM-Signature:Received:Received:From:To:CC: Subject:Date:Message-ID:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:Content-Type:X-Originating-IP: X-Authority-Analysis:X-Proofpoint-ORIG-GUID: X-Proofpoint-Spam-Details-Enc:X-Proofpoint-Spam-Info: X-Proofpoint-GUID:X-Proofpoint-Virus-Version; bh=HKy76DpLq393gWfgEo3jQZmO7f6m4+eQ2dMug7qRCRo=; b=ur/PwQbAUdvZ91I+bk+t2dhh+1X0TF0MB+duzfowvKgAYkp9PHRVPFgzLWqCO8+x1t1l 7Vc+324ACmoMRGN6iEuUkwTq2pYOxDiYlUsMlzqyEayU0sdNCXIj+AuolUxmWtiaX5O5C 2nSDonyHwQ3air0gyXmjWTycdY2mpOmqnv7w9714BE/SaPyYurI4XXGaKRgp6bPTgb0dG IEcihfCe35hwxniLfzbqAcn62gcVzG0kCtdHU+ylS7ODkjCqd4qYpbeua2Jwd9BDZ/+kD Py21BN5l9ke0JiI+SICZ6ZpuumcEbDc665/2oBaaHGz1e8JRhGkWgGThJomBicFq84A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=meta.com; spf=pass smtp.mailfrom=meta.com; dkim=pass header.d=meta.com header.i=@meta.com header.a=rsa-sha256 header.s=pps82601-s2048-2026-q3 header.b="C9n9P+o/"; arc=none smtp.remote-ip=67.231.153.30 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B08F606A33B; Tue, 17 Nov 2026 20:32:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 3B08F606A33B Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=meta.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=meta.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=meta.com header.i=@meta.com header.a=rsa-sha256 header.s=pps82601-s2048-2026-q3 header.b=C9n9P+o/ Received: from pps.filterd (m0528005.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6AHKOMhp961379; Tue, 17 Nov 2026 12:32:46 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= pps82601-s2048-2026-q3; bh=HKy76DpLq393gWfgEo3jQZmO7f6m4+eQ2dMug 7qRCRo=; b=C9n9P+o/+nK7F9KIKr/kAjyhfoqeuL5TWK6li8P7wmOQ0NJbZsgdD Oj4rgcEbv5CnLDe+4wEY/dbeSLKLPB538E4rtjDHArkUMjUq9cDTvXOQRk/2vhVp FOXkeg8ZZXNV30SemU54TYWsUHrR/mA0QdyOMaA+1cA1nDnI5ohPIrIQtVihhcLn QdmYEiju3+j119lDbL1+cWgzl7CU3bHQi/shbEJTbGyVO41DKNN8apQ2Al9GhpKF +D0hzDzhDnw7NWW8EPZNuzl/BqPxaWW2DzQPO2I34xRQqIId4PnjE1x2B50X9mq9 a+8nqYWFr62cuzY9F13dFsEEoWv4zM/Xw== Received: from maileast.thefacebook.com ([163.114.135.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 4j0wxc01yw-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 17 Nov 2026 12:32:43 -0800 (PST) Received: from localhost (2620:10d:c0a8:1b::8e35) by mail.thefacebook.com (2620:10d:c0a9:6f::237c) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.56; Tue, 17 Nov 2026 20:31:50 +0000 From: Todd Freed To: CC: "David S. Miller" , Andrew Lunn , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Boris Pismenny , Cosmin Ratiu , Daniel Zahka , David Ahern , Dragos Tatulea , Eric Dumazet , Ido Schimmel , Jakub Kicinski , John Fastabend , Leon Romanovsky , , , , Mark Bloch , Paolo Abeni , Raed Salem , Rahul Rameshbabu , Sabrina Dubroca , Saeed Mahameed , Shuah Khan , Simon Horman , Tariq Toukan , Wei Wang , Willem de Bruijn Subject: [PATCH net v6 7/8] selftests: drv-net: psp: test that ipv4 psp packets aren't fragmented Date: Tue, 17 Nov 2026 12:31:36 -0800 Message-ID: <20261117203137.804424-8-toddfreed@meta.com> X-Mailer: git-send-email 2.53.1 In-Reply-To: <20261117203137.804424-1-toddfreed@meta.com> References: <20261117203137.804424-1-toddfreed@meta.com> X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Authority-Analysis: v=2.4 cv=BN0mP1QG c=1 sm=1 tr=0 ts=6afcb9ed cx=c_pps a=MfjaFnPeirRr97d5FC5oHw==:117 a=MfjaFnPeirRr97d5FC5oHw==:17 a=zJRp6_cAMcgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=7x6HtfJdh03M6CCDgxCd:22 a=jCddH8ec0KUNCymVuxII:22 a=VabnemYjAAAA:8 a=ClODYU1lsHz8rMzznhwA:9 a=O8hF6Hzn-FEA:10 a=gKebqoRLp9LExxC7YDUY:22 X-Proofpoint-ORIG-GUID: _RZeFmRS8fMRK_9P20WcSQc66l206NPl X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMTE3MDA4MSBTYWx0ZWRfX5QQB7EXCVCuz TfJlGwm7TC5o+IvvMn4McWj2A2HbggbQyJX7NmBtW+eDiqHcpoM13TmjdloJvoRMd5dn+eZAONj Dat04/cd7C7Mtc+onmDxsUXVSBAumVuRq+kMJy5TwPHIb+PGf0PX9uZYXPNx+fEAWzobcmDtmKp 1fPpdJliM/YkNrMQ1qUq3336CxgU+kDrB6PFwVh65DjF8iYbVCk2Gaau7SXVBL/HVLquswtvBh8 z3L89M3KVnaeUEdTqAOsFMM2EjjJ4KnDc7+RvPiMyTqWLuHHQEUJhzUebyzMeozHfxrjyduo/X/ PAQEhwPQVeQFLx55Cnog8ZpJBjiU/rjVl9xI4p24WU/YDMLi7B4FqW+RowUkTfv1EwGw88FPWXW d4YXiH//0ibKFGaQYRltmkjH7QHAudWtgEHQwXb9XX/24gL50Coot+VyO32ri01Mf/gwWiq9/5W 9LMBp6K+NtFqhZmqNIg== X-Proofpoint-Spam-Info: AW1haW4tMjYxMTE3MDA4MSBTYWx0ZWRfX8rEfJe3hnI6H 8aCAf2XVWUrhxGHby3VeJAa3yrkymmo7WhzgQcmDPzJGJrECj78rh30l4rLK4EEV9uAUditrBcF rR90oMYo1rjxQcubu7CP9bPgiLoCGkg= X-Proofpoint-GUID: _RZeFmRS8fMRK_9P20WcSQc66l206NPl X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.138,FMLib:17.12.100.49 definitions=2026-11-17_04,2026-11-16_01,2025-10-01_01 make the ipv4 packets of a psp tcp socket need fragmenting, and check that they're dropped (IpFragFails) and not transmitted unencrypted. tcp sizes its segments from the route mtu. with IP_PMTUDISC_OMIT, ip fragments them to the device mtu, and doesn't set df. so the test sets a route mtu of twice the larger of the two device mtus (at most 65535) on both ends (the peer's mss limits ours too), keeping the device and source address of the current route, and IP_PMTUDISC_OMIT on the socket. tcp mtu probing (tcp_mtu_probing 2, or 1 once a black hole is detected) can cap the mss at the probing base, so the test turns it off. if the peer isn't on-link, or the socket's mss doesn't need fragmenting, the test is skipped. a software filter on the peer counts, and drops, the ipv4 fragments which reach it from the socket's address, and the test asserts there are none. IpFragFails is per netns, so it only confirms that the packets were dropped. while both route mtus are in place, a new ssh connection to the remote over these addresses can stall: its segments are sized from the route mtu, and sent with df set. so the local route is added last, and removed before the next remote command. no ipv6 test: the stack only fragments ipv6 tcp packets when something like ipvs sets ignore_df on them (see "net: don't fragment decrypted skbs"), which this test doesn't set up. without the fix in "net: don't fragment decrypted skbs", the packets are fragmented, and the fragments go out unencrypted. they reach the peer, IpFragFails doesn't move, and the test fails. Signed-off-by: Todd Freed --- tools/testing/selftests/drivers/net/psp.py | 95 +++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/drivers/net/psp.py b/tools/testing/selftests/drivers/net/psp.py index cae369d8ab63..9c1d4c59b1ac 100755 --- a/tools/testing/selftests/drivers/net/psp.py +++ b/tools/testing/selftests/drivers/net/psp.py @@ -22,10 +22,12 @@ from lib.py import KsftSkipEx, KsftFailEx, CmdExitFailure from lib.py import NetDrvEpEnv, NetDrvContEnv from lib.py import Netlink, NlError, PSPFamily, RtnlFamily from lib.py import NetNSEnter -from lib.py import bkg, rand_port, wait_port_listen +from lib.py import bkg, ctl_file_write, rand_port, wait_port_listen from lib.py import ip, tc TCP_ULP = 31 +IP_MTU_DISCOVER = 10 +IP_PMTUDISC_OMIT = 5 def _get_outq(s): @@ -822,6 +824,97 @@ def data_send_ipv6_exthdr(cfg, opt, val): _close_psp_conn(cfg, s) +def _ipv4_snmp(key): + """ An Ip: counter of this netns, from /proc/net/snmp """ + with open("/proc/net/snmp", encoding="utf-8") as f: + ip_lines = [line.split() for line in f if line.startswith("Ip:")] + return int(ip_lines[1][ip_lines[0].index(key)]) + + +def _ipv4_route_mtu(dst, mtu, host=None): + """ Add a route to @dst with @mtu, keeping the device and source of + the current one, which must be on-link. Returns the defer removing it. + """ + route = ip(f"-4 route get {dst}", json=True, host=host)[0] + if route.get("gateway"): + raise KsftSkipEx(f"{dst} isn't on-link") + try: + ip(f"route add {dst}/32 dev {route['dev']} src {route['prefsrc']} " + f"mtu {mtu}", host=host) + except CmdExitFailure as e: + raise KsftSkipEx(f"can't set the route mtu to {dst}: {e}") from e + return defer(ip, f"route del {dst}/32 dev {route['dev']}", host=host) + + +def data_send_ipv4_frags(cfg): + """ Test that IPv4 packets of a PSP TCP socket aren't fragmented """ + cfg.require_ipver("4") + _init_psp_dev(cfg) + + # Fragments which get out reach the remote. Set up the count before + # connecting, so a skip doesn't leave the responder mid key exchange. + # The socket's source is the one the kernel picks, which may not be + # LOCAL_V4, and the fragments would leave through the route's device + rem = cfg.remote_addr_v["4"] + route = ip(f"-4 route get {rem}", json=True)[0] + if route["dev"] != cfg.ifname: + raise KsftSkipEx(f"{rem} isn't routed through {cfg.ifname}") + loc = route["prefsrc"] + remote_frags = _remote_count(cfg, "ip", + f"src_ip {loc} dst_ip {rem} ip_flags frag") + if not remote_frags: + raise KsftSkipEx("can't count fragments on the remote") + + # TCP sizes its segments from the route MTU. With IP_PMTUDISC_OMIT, IP + # fragments them to the device MTU. Set a route MTU above the device + # MTU on both ends, since the peer's MSS limits ours too. While both + # are in place, a new ssh connection to the remote over these addresses + # can stall, so add the local one last, and remove it first. + mtu = min(2 * max(cfg.dev['mtu'], cfg.remote_dev['mtu']), 65535) + _ipv4_route_mtu(loc, mtu, host=cfg.remote) + local_route = _ipv4_route_mtu(rem, mtu) + + # With MTU probing on, TCP can cap the MSS at the probing base, whatever + # the route MTU + ctl_file_write("/proc/sys/net/ipv4/tcp_mtu_probing", 0) + + s = _make_psp_conn(cfg, 0, "4") + try: + rx_assoc = cfg.pspnl.rx_assoc({"version": 0, + "dev-id": cfg.psp_dev_id, + "sock-fd": s.fileno()}) + tx = _spi_xchg(s, rx_assoc['rx-key']) + cfg.pspnl.tx_assoc({"dev-id": cfg.psp_dev_id, + "version": 0, + "tx-key": tx, + "sock-fd": s.fileno()}) + s.setsockopt(socket.IPPROTO_IP, IP_MTU_DISCOVER, IP_PMTUDISC_OMIT) + mss = s.getsockopt(socket.IPPROTO_TCP, socket.TCP_MAXSEG) + if mss + 40 <= cfg.dev['mtu']: + raise KsftSkipEx(f"mss {mss} needs no fragmenting") + + fails = _ipv4_snmp("FragFails") + # The packets are dropped, so the send may not complete (with a + # jumbo device MTU, the socket buffer can take all of it) + s.settimeout(3) + try: + s.sendall(b'f' * 200000) + except socket.timeout: + pass + fails = _ipv4_snmp("FragFails") - fails + + # Before the next ssh to the remote, see above + local_route.exec() + + # Fragments would go out unencrypted: the packets must be dropped + # instead of fragmented. FragFails is per netns, so it only + # confirms the drop: the remote count is what decides. + ksft_eq(remote_frags(), 0, comment="fragments reached the remote") + ksft_gt(fails, 0, comment="packets dropped instead of fragmented") + finally: + _close_psp_conn(cfg, s) + + def _get_psp_ver_ip_variants(): for ver in range(4): for ipv in ("4", "6"): -- 2.53.1-Meta