From nobody Sun Mar 22 09:32:58 2026 Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1FEBC3BD238 for ; Wed, 11 Mar 2026 07:56:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773215811; cv=none; b=gLwHr8b6MC1r1iHPngjqLsZHSW47Ar3k6XYaKeWwn8OR3lLFs1iFYroikcUOOeUYeDolzp6TgfB8RKhqNpfecMAw+OAibbedQ/qtdq3udvuF+SJwGtU7BW8oxNTBYglwg4EJMlkAV/65y7z0nDKzaF18nOnNRjvGQIN3Li99egA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773215811; c=relaxed/simple; bh=kX5kLQG5J1Hlmj0ExCOTkwchnPLs0mj06XQzcCCourE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CNM4M+F+EOiJfGQEuxN4xD0gMdS8eJmrZzmnpRjo1nkBaCnEv5DJ3IqVZhjkeHYx5cMi0rwa77d65dCdrk0J7AuEqGSKYDUafEQq+qGn52BSjMvWoU1O0uGzllIzfpaxqPhQbghJgM3jzP/al4J2CpGPYrssUn80HBglPAhGUfw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PZBHLDL3; arc=none smtp.client-ip=209.85.167.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PZBHLDL3" Received: by mail-oi1-f173.google.com with SMTP id 5614622812f47-4671cbce32bso597851b6e.3 for ; Wed, 11 Mar 2026 00:56:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773215801; x=1773820601; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Aqy84kuwqTRqlBZVM3vX2nv7L0enzcNB2UtOtxRx+lU=; b=PZBHLDL39zcZG6HXPIcAxfLZmW/1UBXziWefHTsZB0zSjmJpFQ/8jlQw55QEaGmEOk WHyrLakg4VHmAm/y8pIKlmIwugrrnvmIWT3+6BGJZtoC+ouu5gVllfQCyS72QKXw8/2a YE0n67s6gihcRahMXSXNVmChmPlauGN3d4rkF+pTirates39ekmIRdP8QsOgRPVRSukA +BeNnPYMGvq9fcM+9vG4VsQ9bXP/IZQDS5svDDiLoEg+7EHoo+DRmWGPXbENGMCSJtA/ EGt+V4GJAVYly5HVCKqU5WuWL494GdMkUBFQGXxsqP+HTh88dNnZqwPYnH7hULJqlG30 2ErA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773215801; x=1773820601; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Aqy84kuwqTRqlBZVM3vX2nv7L0enzcNB2UtOtxRx+lU=; b=Z9AEsJrJnqDwSpgCm7v+MM09K0EkX7CYjmfD6GNFBTDmpMwMJBVPsv3C7x171qakZs NXLVdcjHNQGrsDA1E0yT8ZnpPvJ+MnodXnbRpDMX8jm0snglUzOVE989Dsaapg5WAZpF RVKHQ0O4wf1xPztDqxKgpy8MFKvP3B8smMbabHrErlzo4tp6l9kWVHBC0iLVIHSsUK3T tS2TxTga0EZC/PaMFQWbW3FZADjzZ8IbSN6UjOfQhMnqUYNdsxxrvp1XzSKSByuEaYXN lMs0Nb3wqxYm8G2vqd+IQfrzR4ivB/HIj4lpCD9iGHZViFIfsNZbTYrgxY9QhOuf4/ei P1qw== X-Forwarded-Encrypted: i=1; AJvYcCWDC5KI3T2aNYKvuNWmgRUVNU5/kHnFPe+Uu6JOdbO6hdFdXQ3vVSkA4epcmj9fNd4JjBK18S+8o2R8x2k=@vger.kernel.org X-Gm-Message-State: AOJu0YzxCY2Kz0+bpw6zJjIc3yJlQKTXoRCj4B00n8bN7bBAW7HMad67 YY/XjCqJGdncdWko9awZrYEGlmKOUcRkl9sivx21hBxwtaEp4fTuqxV9 X-Gm-Gg: ATEYQzyR7O9S1/tHzQhFnrybEeB8PYYB4W8phypFZmAoHWyUMW0yPMBVeLgwzqqmGVE Q7bbOSmDFW1j2VXM170TNqtXpWrElS7yEDdUK5qoluhsyq6j7I9oXLm+A9RyXSBPLcquSbz/1IR w4OJg8pVCi4DdpgjNLUc4MEIvnidfGc2SWFaQP8eMebkjvRgSnC+DLntkS3vFsx2QlWqr/H7nWu ZJaVEncAP7MgiDeY74LakGbdB5nfbCGvR5fMDM+XcX73V9JgF9kxhzLswypECvJ5HJM7/8DScq7 Yg0125Jp7JS1BzLQ8RkJaciKmcwiCH/N6dPUiEMKgt+ILbRxg7tJ02sUJkoXEr69hy+ij035u+L MTsfbawiZ4kTgKW+tu5ayH5R/Ipb5zUnF+CFjnM4Xhqk8/DmkJ7pOMqGflMNFbeCIY0JuAvlLOq eM3kYIgLqlWSjvBt0wHDyk2TU9mPo3yR1ytrK+oKDky0/wfKXkK0M3KF2H/ukSFvXwbQYfHEWG5 YMF7WGKRgM+Enh1NESFvw6pY3AF1E4yxvCptq9GvJ2UkWud X-Received: by 2002:a05:6808:f8a:b0:450:4782:2b0e with SMTP id 5614622812f47-4673346f783mr849508b6e.15.1773215800832; Wed, 11 Mar 2026 00:56:40 -0700 (PDT) Received: from localhost.localdomain (108-212-132-20.lightspeed.irvnca.sbcglobal.net. [108.212.132.20]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4177e6ae0e3sm1568938fac.16.2026.03.11.00.56.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 00:56:40 -0700 (PDT) From: Wesley Atwell To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, ncardwell@google.com, dsahern@kernel.org, matttbe@kernel.org, martineau@kernel.org, netdev@vger.kernel.org, mptcp@lists.linux.dev Cc: kuniyu@google.com, horms@kernel.org, geliang@kernel.org, corbet@lwn.net, skhan@linuxfoundation.org, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, 0x7f454c46@gmail.com, linux-doc@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, atwellwea@gmail.com Subject: [PATCH net 7/7] selftests: tcp_ao: cover legacy and extended TCP_REPAIR_WINDOW layouts Date: Wed, 11 Mar 2026 01:56:00 -0600 Message-Id: <20260311075600.948413-8-atwellwea@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260311075600.948413-1-atwellwea@gmail.com> References: <20260311075600.948413-1-atwellwea@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Extend the repair helpers and selftests so the ABI contract is pinned down in-tree. The TCP-AO restore coverage now exercises both the exact and legacy TCP_REPAIR_WINDOW layouts, verifies that intermediate lengths are rejected, and keeps the packetdrill coverage for the advertised-window receive-memory regressions in the same net selftest series. Signed-off-by: Wesley Atwell --- .../net/packetdrill/tcp_rcv_toobig.pkt | 35 +++++++ .../packetdrill/tcp_rcv_toobig_default.pkt | 97 +++++++++++++++++++ .../testing/selftests/net/tcp_ao/lib/aolib.h | 56 +++++++++-- .../testing/selftests/net/tcp_ao/lib/repair.c | 18 ++-- .../selftests/net/tcp_ao/self-connect.c | 61 ++++++++++-- 5 files changed, 244 insertions(+), 23 deletions(-) create mode 100644 tools/testing/selftests/net/packetdrill/tcp_rcv_toobig.= pkt create mode 100644 tools/testing/selftests/net/packetdrill/tcp_rcv_toobig_= default.pkt diff --git a/tools/testing/selftests/net/packetdrill/tcp_rcv_toobig.pkt b/t= ools/testing/selftests/net/packetdrill/tcp_rcv_toobig.pkt new file mode 100644 index 000000000000..723c739ddc32 --- /dev/null +++ b/tools/testing/selftests/net/packetdrill/tcp_rcv_toobig.pkt @@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0 + +--mss=3D1000 + +`./defaults.sh` + + 0 `nstat -n` + +// Establish a connection. + +0 socket(..., SOCK_STREAM, IPPROTO_TCP) =3D 3 + +0 setsockopt(3, SOL_SOCKET, SO_REUSEADDR, [1], 4) =3D 0 + +0 setsockopt(3, SOL_SOCKET, SO_RCVBUF, [20000], 4) =3D 0 + +0 bind(3, ..., ...) =3D 0 + +0 listen(3, 1) =3D 0 + + +0 < S 0:0(0) win 32792 + +0 > S. 0:0(0) ack 1 win 18980 + +.1 < . 1:1(0) ack 1 win 257 + + +0 accept(3, ..., ...) =3D 4 + + +0 < P. 1:20001(20000) ack 1 win 257 + +.04 > . 1:1(0) ack 20001 win 18000 + + +0 setsockopt(4, SOL_SOCKET, SO_RCVBUF, [12000], 4) =3D 0 + +0 < P. 20001:80001(60000) ack 1 win 257 + +0 > . 1:1(0) ack 20001 win 18000 + + +0 read(4, ..., 20000) =3D 20000 + +// A too big packet is accepted if the receive queue is empty, but the +// stronger admission path must not zero the receive buffer while doing so. + +0 < P. 20001:80001(60000) ack 1 win 257 + +0 > . 1:1(0) ack 80001 win 0 + +0 %{ assert SK_MEMINFO_RCVBUF > 0, SK_MEMINFO_RCVBUF }% diff --git a/tools/testing/selftests/net/packetdrill/tcp_rcv_toobig_default= .pkt b/tools/testing/selftests/net/packetdrill/tcp_rcv_toobig_default.pkt new file mode 100644 index 000000000000..b2e4950e0b83 --- /dev/null +++ b/tools/testing/selftests/net/packetdrill/tcp_rcv_toobig_default.pkt @@ -0,0 +1,97 @@ +// SPDX-License-Identifier: GPL-2.0 + +--mss=3D1000 + +`./defaults.sh +sysctl -q net.ipv4.tcp_moderate_rcvbuf=3D0` + +// Establish a connection on the default receive buffer. Leave a large skb= in +// the queue, then deliver another one which still fits the remaining rwnd. +// We should grow sk_rcvbuf to honor the already-advertised window instead= of +// dropping the packet. + +0 socket(..., SOCK_STREAM, IPPROTO_TCP) =3D 3 + +0 setsockopt(3, SOL_SOCKET, SO_REUSEADDR, [1], 4) =3D 0 + +0 bind(3, ..., ...) =3D 0 + +0 listen(3, 1) =3D 0 + + +0 < S 0:0(0) win 65535 + +0 > S. 0:0(0) ack 1 <...> + +.1 < . 1:1(0) ack 1 win 257 + + +0 accept(3, ..., ...) =3D 4 + +// Exchange enough data to get past the completely fresh-socket case while +// still keeping the receive buffer at its 128kB default. + +0 < P. 1:65001(65000) ack 1 win 257 + * > . 1:1(0) ack 65001 + +0 read(4, ..., 65000) =3D 65000 + + +0 < P. 65001:130001(65000) ack 1 win 257 + * > . 1:1(0) ack 130001 + +0 read(4, ..., 65000) =3D 65000 + + +0 < P. 130001:195001(65000) ack 1 win 257 + * > . 1:1(0) ack 195001 + +0 read(4, ..., 65000) =3D 65000 + + +0 < P. 195001:260001(65000) ack 1 win 257 + * > . 1:1(0) ack 260001 + +0 read(4, ..., 65000) =3D 65000 + + +0 < P. 260001:325001(65000) ack 1 win 257 + * > . 1:1(0) ack 325001 + +0 read(4, ..., 65000) =3D 65000 + + +0 < P. 325001:390001(65000) ack 1 win 257 + * > . 1:1(0) ack 390001 + +0 read(4, ..., 65000) =3D 65000 + + +0 < P. 390001:455001(65000) ack 1 win 257 + * > . 1:1(0) ack 455001 + +0 read(4, ..., 65000) =3D 65000 + + +0 < P. 455001:520001(65000) ack 1 win 257 + * > . 1:1(0) ack 520001 + +0 read(4, ..., 65000) =3D 65000 + + +0 < P. 520001:585001(65000) ack 1 win 257 + * > . 1:1(0) ack 585001 + +0 read(4, ..., 65000) =3D 65000 + + +0 < P. 585001:650001(65000) ack 1 win 257 + * > . 1:1(0) ack 650001 + +0 read(4, ..., 65000) =3D 65000 + + +0 < P. 650001:715001(65000) ack 1 win 257 + * > . 1:1(0) ack 715001 + +0 read(4, ..., 65000) =3D 65000 + + +0 < P. 715001:780001(65000) ack 1 win 257 + * > . 1:1(0) ack 780001 + +0 read(4, ..., 65000) =3D 65000 + + +0 < P. 780001:845001(65000) ack 1 win 257 + * > . 1:1(0) ack 845001 + +0 read(4, ..., 65000) =3D 65000 + + +0 < P. 845001:910001(65000) ack 1 win 257 + * > . 1:1(0) ack 910001 + +0 read(4, ..., 65000) =3D 65000 + + +0 < P. 910001:975001(65000) ack 1 win 257 + * > . 1:1(0) ack 975001 + +0 read(4, ..., 65000) =3D 65000 + + +0 < P. 975001:1040001(65000) ack 1 win 257 + * > . 1:1(0) ack 1040001 + +0 read(4, ..., 65000) =3D 65000 + +// Leave about 60kB queued, then accept another large skb which still fits +// the rwnd we already exposed to the peer. The regression is the drop; the +// exact sk_rcvbuf growth path is an implementation detail. + +0 < P. 1040001:1102001(62000) ack 1 win 257 + * > . 1:1(0) ack 1102001 + + +0 < P. 1102001:1167001(65000) ack 1 win 257 + * > . 1:1(0) ack 1167001 + +0 read(4, ..., 127000) =3D 127000 diff --git a/tools/testing/selftests/net/tcp_ao/lib/aolib.h b/tools/testing= /selftests/net/tcp_ao/lib/aolib.h index ebb2899c12fe..ff259795a4a0 100644 --- a/tools/testing/selftests/net/tcp_ao/lib/aolib.h +++ b/tools/testing/selftests/net/tcp_ao/lib/aolib.h @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -671,17 +672,42 @@ struct tcp_sock_state { int timestamp; }; =20 -extern void __test_sock_checkpoint(int sk, struct tcp_sock_state *state, - void *addr, size_t addr_size); +/* Legacy userspace stops before the snapshot field and therefore exercises + * the kernel's unknown-snapshot fallback path. + */ +static inline socklen_t test_tcp_repair_window_legacy_size(void) +{ + return offsetof(struct tcp_repair_window, rcv_wnd_scaling_ratio); +} + +static inline socklen_t test_tcp_repair_window_exact_size(void) +{ + return sizeof(struct tcp_repair_window); +} + +void __test_sock_checkpoint_opt(int sk, struct tcp_sock_state *state, + socklen_t trw_len, + void *addr, size_t addr_size); static inline void test_sock_checkpoint(int sk, struct tcp_sock_state *sta= te, sockaddr_af *saddr) { - __test_sock_checkpoint(sk, state, saddr, sizeof(*saddr)); + __test_sock_checkpoint_opt(sk, state, test_tcp_repair_window_exact_size(), + saddr, sizeof(*saddr)); +} + +static inline void test_sock_checkpoint_legacy(int sk, + struct tcp_sock_state *state, + sockaddr_af *saddr) +{ + __test_sock_checkpoint_opt(sk, state, test_tcp_repair_window_legacy_size(= ), + saddr, sizeof(*saddr)); } extern void test_ao_checkpoint(int sk, struct tcp_ao_repair *state); -extern void __test_sock_restore(int sk, const char *device, - struct tcp_sock_state *state, - void *saddr, void *daddr, size_t addr_size); +void __test_sock_restore_opt(int sk, const char *device, + struct tcp_sock_state *state, + socklen_t trw_len, + void *saddr, void *daddr, + size_t addr_size); static inline void test_sock_restore(int sk, struct tcp_sock_state *state, sockaddr_af *saddr, const union tcp_addr daddr, @@ -690,7 +716,23 @@ static inline void test_sock_restore(int sk, struct tc= p_sock_state *state, sockaddr_af addr; =20 tcp_addr_to_sockaddr_in(&addr, &daddr, htons(dport)); - __test_sock_restore(sk, veth_name, state, saddr, &addr, sizeof(addr)); + __test_sock_restore_opt(sk, veth_name, state, + test_tcp_repair_window_exact_size(), + saddr, &addr, sizeof(addr)); +} + +static inline void test_sock_restore_legacy(int sk, + struct tcp_sock_state *state, + sockaddr_af *saddr, + const union tcp_addr daddr, + unsigned int dport) +{ + sockaddr_af addr; + + tcp_addr_to_sockaddr_in(&addr, &daddr, htons(dport)); + __test_sock_restore_opt(sk, veth_name, state, + test_tcp_repair_window_legacy_size(), + saddr, &addr, sizeof(addr)); } extern void test_ao_restore(int sk, struct tcp_ao_repair *state); extern void test_sock_state_free(struct tcp_sock_state *state); diff --git a/tools/testing/selftests/net/tcp_ao/lib/repair.c b/tools/testin= g/selftests/net/tcp_ao/lib/repair.c index 9893b3ba69f5..befbd0f72db5 100644 --- a/tools/testing/selftests/net/tcp_ao/lib/repair.c +++ b/tools/testing/selftests/net/tcp_ao/lib/repair.c @@ -66,8 +66,9 @@ static void test_sock_checkpoint_queue(int sk, int queue,= int qlen, test_error("recv(%d): %d", qlen, ret); } =20 -void __test_sock_checkpoint(int sk, struct tcp_sock_state *state, - void *addr, size_t addr_size) +void __test_sock_checkpoint_opt(int sk, struct tcp_sock_state *state, + socklen_t trw_len, + void *addr, size_t addr_size) { socklen_t len =3D sizeof(state->info); int ret; @@ -82,9 +83,9 @@ void __test_sock_checkpoint(int sk, struct tcp_sock_state= *state, if (getsockname(sk, addr, &len) || len !=3D addr_size) test_error("getsockname(): %d", (int)len); =20 - len =3D sizeof(state->trw); + len =3D trw_len; ret =3D getsockopt(sk, SOL_TCP, TCP_REPAIR_WINDOW, &state->trw, &len); - if (ret || len !=3D sizeof(state->trw)) + if (ret || len !=3D trw_len) test_error("getsockopt(TCP_REPAIR_WINDOW): %d", (int)len); =20 if (ioctl(sk, SIOCOUTQ, &state->outq_len)) @@ -160,9 +161,10 @@ static void test_sock_restore_queue(int sk, int queue,= void *buf, int len) } while (len > 0); } =20 -void __test_sock_restore(int sk, const char *device, - struct tcp_sock_state *state, - void *saddr, void *daddr, size_t addr_size) +void __test_sock_restore_opt(int sk, const char *device, + struct tcp_sock_state *state, + socklen_t trw_len, + void *saddr, void *daddr, size_t addr_size) { struct tcp_repair_opt opts[4]; unsigned int opt_nr =3D 0; @@ -215,7 +217,7 @@ void __test_sock_restore(int sk, const char *device, } test_sock_restore_queue(sk, TCP_RECV_QUEUE, state->in.buf, state->inq_len= ); test_sock_restore_queue(sk, TCP_SEND_QUEUE, state->out.buf, state->outq_l= en); - if (setsockopt(sk, SOL_TCP, TCP_REPAIR_WINDOW, &state->trw, sizeof(state-= >trw))) + if (setsockopt(sk, SOL_TCP, TCP_REPAIR_WINDOW, &state->trw, trw_len)) test_error("setsockopt(TCP_REPAIR_WINDOW)"); } =20 diff --git a/tools/testing/selftests/net/tcp_ao/self-connect.c b/tools/test= ing/selftests/net/tcp_ao/self-connect.c index 2c73bea698a6..a7edd72ab28d 100644 --- a/tools/testing/selftests/net/tcp_ao/self-connect.c +++ b/tools/testing/selftests/net/tcp_ao/self-connect.c @@ -4,6 +4,7 @@ #include "aolib.h" =20 static union tcp_addr local_addr; +static bool checked_repair_window_lens; =20 static void __setup_lo_intf(const char *lo_intf, const char *addr_str, uint8_t prefix) @@ -30,8 +31,40 @@ static void setup_lo_intf(const char *lo_intf) #endif } =20 +/* The repair ABI accepts exactly the legacy and extended layouts. */ +static void test_repair_window_len_contract(int sk) +{ + struct tcp_repair_window trw =3D {}; + socklen_t len =3D test_tcp_repair_window_exact_size(); + socklen_t bad_len =3D test_tcp_repair_window_legacy_size() + 1; + int ret; + + if (checked_repair_window_lens) + return; + + checked_repair_window_lens =3D true; + + ret =3D getsockopt(sk, SOL_TCP, TCP_REPAIR_WINDOW, &trw, &len); + if (ret || len !=3D test_tcp_repair_window_exact_size()) + test_error("getsockopt(TCP_REPAIR_WINDOW): %d", (int)len); + + len =3D bad_len; + ret =3D getsockopt(sk, SOL_TCP, TCP_REPAIR_WINDOW, &trw, &len); + if (ret =3D=3D 0 || errno !=3D EINVAL) + test_fail("repair-window get rejects invalid len"); + else + test_ok("repair-window get rejects invalid len"); + + ret =3D setsockopt(sk, SOL_TCP, TCP_REPAIR_WINDOW, &trw, bad_len); + if (ret =3D=3D 0 || errno !=3D EINVAL) + test_fail("repair-window set rejects invalid len"); + else + test_ok("repair-window set rejects invalid len"); +} + static void tcp_self_connect(const char *tst, unsigned int port, - bool different_keyids, bool check_restore) + bool different_keyids, bool check_restore, + bool legacy_repair_window) { struct tcp_counters before, after; uint64_t before_aogood, after_aogood; @@ -109,7 +142,11 @@ static void tcp_self_connect(const char *tst, unsigned= int port, } =20 test_enable_repair(sk); - test_sock_checkpoint(sk, &img, &addr); + test_repair_window_len_contract(sk); + if (legacy_repair_window) + test_sock_checkpoint_legacy(sk, &img, &addr); + else + test_sock_checkpoint(sk, &img, &addr); #ifdef IPV6_TEST addr.sin6_port =3D htons(port + 1); #else @@ -123,7 +160,11 @@ static void tcp_self_connect(const char *tst, unsigned= int port, test_error("socket()"); =20 test_enable_repair(sk); - __test_sock_restore(sk, "lo", &img, &addr, &addr, sizeof(addr)); + __test_sock_restore_opt(sk, "lo", &img, + legacy_repair_window ? + test_tcp_repair_window_legacy_size() : + test_tcp_repair_window_exact_size(), + &addr, &addr, sizeof(addr)); if (different_keyids) { if (test_add_repaired_key(sk, DEFAULT_TEST_PASSWORD, 0, local_addr, -1, 7, 5)) @@ -165,20 +206,24 @@ static void *client_fn(void *arg) =20 setup_lo_intf("lo"); =20 - tcp_self_connect("self-connect(same keyids)", port++, false, false); + tcp_self_connect("self-connect(same keyids)", port++, false, false, false= ); =20 /* expecting rnext to change based on the first segment RNext !=3D Curren= t */ trace_ao_event_expect(TCP_AO_RNEXT_REQUEST, local_addr, local_addr, port, port, 0, -1, -1, -1, -1, -1, 7, 5, -1); - tcp_self_connect("self-connect(different keyids)", port++, true, false); - tcp_self_connect("self-connect(restore)", port, false, true); + tcp_self_connect("self-connect(different keyids)", port++, true, false, f= alse); + tcp_self_connect("self-connect(restore)", port, false, true, false); + port +=3D 2; /* restore test restores over different port */ + tcp_self_connect("self-connect(restore, legacy repair window)", + port, false, true, true); port +=3D 2; /* restore test restores over different port */ trace_ao_event_expect(TCP_AO_RNEXT_REQUEST, local_addr, local_addr, port, port, 0, -1, -1, -1, -1, -1, 7, 5, -1); /* intentionally on restore they are added to the socket in different ord= er */ trace_ao_event_expect(TCP_AO_RNEXT_REQUEST, local_addr, local_addr, port + 1, port + 1, 0, -1, -1, -1, -1, -1, 5, 7, -1); - tcp_self_connect("self-connect(restore, different keyids)", port, true, t= rue); + tcp_self_connect("self-connect(restore, different keyids)", + port, true, true, false); port +=3D 2; /* restore test restores over different port */ =20 return NULL; @@ -186,6 +231,6 @@ static void *client_fn(void *arg) =20 int main(int argc, char *argv[]) { - test_init(5, client_fn, NULL); + test_init(8, client_fn, NULL); return 0; } --=20 2.34.1