From nobody Mon Aug 24 11:16:27 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC32A2DB795 for ; Thu, 30 Jul 2026 03:15:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381335; cv=none; b=TLPLDywTPrxwbni8Re9ztoitigkyLln5WMJIFGwUCPJ4PJmRZB3mup6wXn8hlOxvwKu7NGFoSM95IDPW7riURYMRZMwmVIcNFtTgp7YAmX7TzstF/COs7U8lUnt18BtVsSCHSgqB2A1f8Vt2i0TAiGVmaCUkmg9E6RMA6VXSL8Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381335; c=relaxed/simple; bh=uvfZ6kDhqO0L3HnNSmvXqrG4OhMUiWk1+eIM4AP+02U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dzpMeUBbCoH7LewbtNG31zxitc+YcRWTuxgTnLqeEgDSHrvxoL54l2qIHlLsnucmakiDBge6sKaeb2FjqgJXhPxpJpsSh71Q3nvCIjiDeR9eOXP5kgIwspZKq3BorDscb0/x86CJlnB8IjkZnm2mooOqgD7sRisLqnX8yDvzX+Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kmgunpA3; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kmgunpA3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 506EA1F00A3A; Thu, 30 Jul 2026 03:15:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785381333; bh=2J/s/eXSR8JDR/0lG9znHs/mhbbm0LpOf8PbPcED0/M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kmgunpA36F/9F73yfUF9cty9196FzbseLhxGXIzOWZ1mXGicDrD2Jh7me4HAbNHVp Q6EpirRRdilhzy09WC/WRgZRtOqg6+NoUtNaMar+Nt+uAEp2vOULNQgtWayv8rb8Wm s9lqXoXSAzpx+kD5BLXb1odMq7mmPXSwcvus2L8prS8zMbZVkwz3w3nt4Q3xjX04UB +dJ+a1qFYC1JzkaxiJ7+q/OyvD7uNGhwNMR528aqWHi25QQ23yW+21J4VKBpan4q3Z tcxngnma8t2HE4QsM4n6WFyD2P9ZtKI/kr6RzenHsL5nGegk/VsjSdNCAX3GLvTd13 2O9rVYo6VR6Cw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 01/12] selftests: mptcp: sockopt: reseed RNG after fork Date: Thu, 30 Jul 2026 11:15:12 +0800 Message-ID: X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang xfork() does not reseed the RNG in the child, so server and client processes use the same rand() sequence. Restore the per-fork reseed from mptcp_inq.c by calling init_rng() in the child, ensuring independent random values for buffer contents and transfer sizes. init_rng() is now called from each forked child (server, client) so that rand() sequences don't diverge from a single parent seed. But the fallback path did 'srand(time(NULL))' - and time(NULL) has 1-second resolution, so the two children spawned back-to-back in main() almost always land in the same second and end up with the same seed, defeating the per-child re-seed. Mix in getpid() (per-process unique, kernel-guaranteed) with time(NULL) (cross-second entropy) so the fallback produces an independent seed for each child even when /dev/urandom is unavailable. Also hoist the 'foo' local to function scope and collapse the two srand() callsites into a single one at the end, so both branches consistently write the seed into 'foo' first. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index b6e58d936ebe..6c3d896d4a1b 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -128,6 +128,8 @@ struct so_state { #define MIN(a, b) ((a) < (b) ? (a) : (b)) #endif =20 +static void init_rng(void); + static void __noreturn die_perror(const char *msg) { perror(msg); @@ -799,6 +801,8 @@ static pid_t xfork(void) =20 if (p < 0) die_perror("fork"); + else if (p =3D=3D 0) + init_rng(); =20 return p; } @@ -822,9 +826,9 @@ static int rcheck(int wstatus, const char *what) static void init_rng(void) { int fd =3D open("/dev/urandom", O_RDONLY); + unsigned int foo; =20 if (fd >=3D 0) { - unsigned int foo; ssize_t ret; =20 /* can't fail */ @@ -832,10 +836,10 @@ static void init_rng(void) assert(ret =3D=3D sizeof(foo)); =20 close(fd); - srand(foo); } else { - srand(time(NULL)); + foo =3D getpid() ^ time(NULL); } + srand(foo); } =20 int main(int argc, char *argv[]) --=20 2.53.0 From nobody Mon Aug 24 11:16:27 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 34C63380FEB for ; Thu, 30 Jul 2026 03:15:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381337; cv=none; b=JJ5wDE46Zwbb5MYD9LTrm6rYyGIQmgKKfwaXak4Y7hvFtRUGWWnIk8469T6MuPn7VHaZOKE6qEcWkVMmSAgGp6ITrYJKPFwLsDf6sfDTN2RtZx9TYVFaku9Av/w7FWMxIUdyMvyQTp3QVqzDOjucFQQj3KyPTspi1wR0vofq1MM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381337; c=relaxed/simple; bh=+7WgKNSlrugYDiZ5+80t0H5Hlr3KXOlbLNCsPwqHfYI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Oz5hq+5Nh9AVBlUDu3GYuxl2S/YoLvOpIZTDKVZ8/dmphsZz5eV68hQ++tlySVOSp/hldCBCKduiAyewUbFgmjBJioP4mpnFwujNxxb6Uua6LdWynA0W6TF+54a1dsk1enWFMaIzyW0RlDhC15eW1U/CLLTrosuDDrL8PlWHAXc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TRfjLvIj; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TRfjLvIj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D83D1F000E9; Thu, 30 Jul 2026 03:15:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785381335; bh=xLhJCXWMpWarH0jIkywBa5ypIEKygvKthsKGETUyyZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TRfjLvIjqflGTtcnD+ZnvNlolyE2CsnKFnpH9HGITuhcW/+eck2lll2lrrqfiYK/9 l7iWtco1ooIrxGbZAweJ34KnNhKt67owCFTAeGg3BCzkqzvLjDbhmTT37BNZl/Fdzu BlOaeQfl5LED4pZc3SJLg8omvvWkV+82xcllJr4cIz6irv2ztNM/2Ra/WjMnn92lVS 9WtYT8J69VJe2+E0fGz5HvxT5x8odDl2Ny0q05EGt1r2Jk0+7f5qVoNA0SNfCMmYLT Lcz5Vi94LnQCIK+bcCzfK8Dr3pPLvenwN4A4QY4q9WIxiHQH0gB/ZcEDTDR44cbVyA 5+vkYnQ1w0TVA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 02/12] selftests: mptcp: sockopt: use exact length in connect_one_server Date: Thu, 30 Jul 2026 11:15:13 +0800 Message-ID: <6ec4570fb7b73f92905ef38beb414a4a7709e0a4.1785380422.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Use the exact remaining length ('len - total') when reading the echoed data from the socket, instead of the full buffer size. This silences a false positive -Wstringop-overflow warning from GCC, as the compiler can now prove that the destination buffer is large enough for the specified read size. connect_one_server() passes per-chunk 'ret' to do_getsockopts() instead of cumulative 'total', causing mismatches when the echo is fragmented. Fix by passing 'total' to match the semantics used in process_one_client(). Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 6c3d896d4a1b..469384823dc6 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -609,7 +609,7 @@ static void connect_one_server(int fd, int pipefd) =20 total =3D 0; do { - ret =3D read(fd, buf2 + total, sizeof(buf2) - total); + ret =3D read(fd, buf2 + total, len - total); if (ret < 0) die_perror("read"); if (ret =3D=3D 0) { @@ -629,7 +629,7 @@ static void connect_one_server(int fd, int pipefd) if (s.tcpi_rcv_delta) assert(s.tcpi_rcv_delta <=3D total); =20 - do_getsockopts(&s, fd, ret, ret); + do_getsockopts(&s, fd, total, total); =20 if (eof) total +=3D 1; /* sequence advances due to FIN */ --=20 2.53.0 From nobody Mon Aug 24 11:16:27 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6741B2DB795 for ; Thu, 30 Jul 2026 03:15:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381338; cv=none; b=KBmSPGpTJ2WUSc5ehFXB07xCtveVMwdveajM3NCQvZEEUFKxVrQuiR8vWoWtf1fS9GvwXgbec9769iWsJSQcLWG5b/8lsoRTT8fxUCZ7McSysni5adQP6SrGS5HlI2LZrOmg5HPYb9N8fhxCHHoUbIpxO8tadOZmUCZU4qnYU0w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381338; c=relaxed/simple; bh=ueP1imoXOc+NytGOTzyA5tXXy2JV/JYY7hOAPA0sARk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kEwpwNiDkLctW/qXeQ3yVtvF3yt6YvLyel2LCvuMm1f+jpk1qnCtEryaBw8EmLrDM5mFHCqdfKWDn+f0+MyV1kGCyy67F/drQoRbPaAbTp4xl8WDzdEkXbaXQyss7d3VEJvOgYPYG0PIBAGKWFAWFbhewHNLQPBtjUQBcmnHSZw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=P/guzOHS; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="P/guzOHS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4196C1F00A3A; Thu, 30 Jul 2026 03:15:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785381337; bh=W1NabytxOtzXfAt74Uq1mHRW7TcBXBLpkjn3gvvJPUY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=P/guzOHSRawASk4rTniEIs8GUaptHZFLY+oTOe/dJa52hPjLqfEFaGfRAmxbtRjZW ++TNi4io9Yod0fcnYiL9P7AaYP0Z9V+TIfKJKlTzu9gPlP5vfrxLMKqc8Gr5/J9th3 7sm9Xu892dOz3IKYvZqlWlk3WoycZev1PFX0a8z0Hy4nRjrOmMHht+uF1F9j5H3rYm G40RlVYZrLf8zBHNuj0AImMDN91iaG9Ufmzpz+LFc/Qks86rml7BEFxP7nYuS5Kqkd 7qLANFecpnSs1IbkxTdfNAHCCTXyfnVjezBzMGVU11iSy33NSYvlPUgGAXxm5rXLGq qrPt+jAihJKEw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 03/12] selftests: mptcp: sockopt: add check_stat_equal helper Date: Thu, 30 Jul 2026 11:15:14 +0800 Message-ID: X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Add check_stat_equal() helper to reduce repetitive error reporting code when validating MPTCP statistics values in process_one_client(). Also fix bytes_acked validation: compare it against the amount of data written (ret2) instead of the amount read (ret), as bytes_acked tracks sent and acknowledged data. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 469384823dc6..a68fbe13b096 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -638,6 +638,16 @@ static void connect_one_server(int fd, int pipefd) close(fd); } =20 +static void check_stat_equal(const char *name, uint64_t actual, + uint64_t expected) +{ + if (actual =3D=3D expected) + return; + + xerror("%s %" PRIu64 ", expect %" PRIu64 ", diff %" PRId64, + name, actual, expected, (int64_t)(actual - expected)); +} + static void process_one_client(int fd, int pipefd) { ssize_t ret, ret2, ret3; @@ -669,27 +679,20 @@ static void process_one_client(int fd, int pipefd) xerror("expected EOF, got %lu", ret3); =20 do_getsockopts(&s, fd, ret, ret2); - if (s.mptcpi_rcv_delta !=3D (uint64_t)ret + 1) - xerror("mptcpi_rcv_delta %" PRIu64 ", expect %" PRIu64 ", diff %" PRId64, - s.mptcpi_rcv_delta, ret + 1, s.mptcpi_rcv_delta - (ret + 1)); + check_stat_equal("mptcpi_rcv_delta", s.mptcpi_rcv_delta, + (uint64_t)ret + 1); /* +1 for FIN */ =20 /* be nice when running on top of older kernel */ if (s.pkt_stats_avail) { - if (s.last_sample.mptcpi_bytes_sent !=3D ret2) - xerror("mptcpi_bytes_sent %" PRIu64 ", expect %" PRIu64 - ", diff %" PRId64, - s.last_sample.mptcpi_bytes_sent, ret2, - s.last_sample.mptcpi_bytes_sent - ret2); - if (s.last_sample.mptcpi_bytes_received !=3D ret) - xerror("mptcpi_bytes_received %" PRIu64 ", expect %" PRIu64 - ", diff %" PRId64, - s.last_sample.mptcpi_bytes_received, ret, - s.last_sample.mptcpi_bytes_received - ret); - if (s.last_sample.mptcpi_bytes_acked !=3D ret) - xerror("mptcpi_bytes_acked %" PRIu64 ", expect %" PRIu64 - ", diff %" PRId64, - s.last_sample.mptcpi_bytes_acked, ret, - s.last_sample.mptcpi_bytes_acked - ret); + check_stat_equal("mptcpi_bytes_sent", + s.last_sample.mptcpi_bytes_sent, + (uint64_t)ret2); + check_stat_equal("mptcpi_bytes_received", + s.last_sample.mptcpi_bytes_received, + (uint64_t)ret); + check_stat_equal("mptcpi_bytes_acked", + s.last_sample.mptcpi_bytes_acked, + (uint64_t)ret2); } =20 close(fd); --=20 2.53.0 From nobody Mon Aug 24 11:16:27 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7627133D6EA for ; Thu, 30 Jul 2026 03:15:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381340; cv=none; b=MwRGyIXvE/n5tKZt/8WpwTTIuMuR4u7Lf7UdlwZvXSxdF3HD4QARgxjU/1AgBX185NKly69yF2abKGAysrKHFsUTiflbXmo1sCkPjE3jHGaOBm8o1GLAW4BXDArzw9t89HCLM3W30Z/AsTZlGBK+B5qtlIyDOGJQpmHacnBN/Bc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381340; c=relaxed/simple; bh=54RU6yRc9qeD0tcfjyoka7QKsx1+RquwweBEULIY+Yk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A1VpSTzeeebnvQJfZWuRXuyTtO/J0T7rWw1ypuBSJQQKRSBzueNaLSsEkYfkHWhBqv3NP2yWh6TOEY56JOAFhzEG+Hzt2WX/i/rK77HmpFog7Zd0006jgj73Z4o4xiItg26M0X9hYGWCUDSPAOguG8mAPhBaEB4ABkQBt5gq/rY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dSigmhqr; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dSigmhqr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23B6F1F000E9; Thu, 30 Jul 2026 03:15:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785381339; bh=QC6FRY0ncAnlonmIKXjv3a9HL6OULQy+CqRKZpH/AIY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dSigmhqrYvaDfNMxsEHN36jcx3kZyzWNJzbJRIXP7ysbkvb6f+vBDENYbHwuPxtIN ++3fSnn7s6Y1Y2v+1HheR2v28JNOm9MCKXt8Th5H1KhTQGobj2TH4pmj6HyIuXnidB zWR8da2J/8sivA+uT/mdoD/HnN6hB2594YTwTB0zJ6qft1teq3oY9MFZYYad8IbFaD hOqTX2z2u2Jd5CuMeY/8K1QE0/gxuRHWmvYPxj+K2O1SDg29fL7QTH9RObgSI3ojHI aBmRXzLudWotlo8CaFQOUjwhwjg9cDQlK3YDuPtV4fLRSSR6GYXyi+1nu6vF55WMkl V++TLAiURdvAg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 04/12] selftests: mptcp: sockopt: use size_t for byte counters Date: Thu, 30 Jul 2026 11:15:15 +0800 Message-ID: <1834a49a3960a167bb29e4506eb741e1764b3c38.1785380422.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Rename ret/ret2/ret3 to ret (ssize_t, for syscall return values) and r/w (size_t, for byte counters) for better readability. The byte counters were previously stored in ssize_t but never hold negative values; size_t is the natural type and matches the parameter types of do_getsockopts(s, fd, size_t r, size_t w). This also prepares for future updates where r will be modified via '+=3D'. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index a68fbe13b096..3a7fcef5aa54 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -650,9 +650,10 @@ static void check_stat_equal(const char *name, uint64_= t actual, =20 static void process_one_client(int fd, int pipefd) { - ssize_t ret, ret2, ret3; struct so_state s; char buf[4096]; + ssize_t ret; + size_t r, w; =20 memset(&s, 0, sizeof(s)); do_getsockopts(&s, fd, 0, 0); @@ -663,36 +664,39 @@ static void process_one_client(int fd, int pipefd) ret =3D read(fd, buf, sizeof(buf)); if (ret < 0) die_perror("read"); + r =3D ret; =20 - assert(s.mptcpi_rcv_delta <=3D (uint64_t)ret); + assert(s.mptcpi_rcv_delta <=3D (uint64_t)r); =20 if (s.tcpi_rcv_delta) - assert(s.tcpi_rcv_delta =3D=3D (uint64_t)ret); + assert(s.tcpi_rcv_delta =3D=3D (uint64_t)r); =20 - ret2 =3D write(fd, buf, ret); - if (ret2 < 0) + ret =3D write(fd, buf, r); + if (ret < 0) die_perror("write"); + w =3D ret; =20 /* wait for hangup */ - ret3 =3D read(fd, buf, 1); - if (ret3 !=3D 0) - xerror("expected EOF, got %lu", ret3); + ret =3D read(fd, buf, 1); + if (ret !=3D 0) + xerror("expected EOF, got %zd", ret); + r +=3D ret; =20 - do_getsockopts(&s, fd, ret, ret2); + do_getsockopts(&s, fd, r, w); check_stat_equal("mptcpi_rcv_delta", s.mptcpi_rcv_delta, - (uint64_t)ret + 1); /* +1 for FIN */ + (uint64_t)r + 1); /* +1 for FIN */ =20 /* be nice when running on top of older kernel */ if (s.pkt_stats_avail) { check_stat_equal("mptcpi_bytes_sent", s.last_sample.mptcpi_bytes_sent, - (uint64_t)ret2); + (uint64_t)w); check_stat_equal("mptcpi_bytes_received", s.last_sample.mptcpi_bytes_received, - (uint64_t)ret); + (uint64_t)r); check_stat_equal("mptcpi_bytes_acked", s.last_sample.mptcpi_bytes_acked, - (uint64_t)ret2); + (uint64_t)w); } =20 close(fd); --=20 2.53.0 From nobody Mon Aug 24 11:16:27 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A5978382283 for ; Thu, 30 Jul 2026 03:15:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381342; cv=none; b=B1pfgM+tgeidZefWNOYiTfhoz16sEy0CkYO1YFvdguq0lL2VXiWihCWIsGZnytYijuyXuE8GOyIJo7feiCqiRRyjTMrFkt0kkYxTfR18WtP+ekDoqRgGslpnNMoQPLHhGmWCEBeSwpAD/JB4innkONYywVJxgJyDYG0hEfXwP04= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381342; c=relaxed/simple; bh=0O3up8mLcO2UONzf1P6RLZTfJcycWsJz27kewHaFEWc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Cl7L9ecwirx8G57Jxh2e7+UgvW6pughMXlZEd0i5KlbUvG+Klb23VUHR5ouJgt5la0iFR/OdSqEn5QT/Q2524dQUltVUxciyv0nc9MhXOEH9PvImlasxbQUJIpKxynAHcGdR2Ggg4Ug+ED055xzloXkGXGzEr+VcKtKOS6u63TM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RWWQxoIa; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RWWQxoIa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40BFF1F00A3A; Thu, 30 Jul 2026 03:15:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785381341; bh=B2EyKeoCM+zSdeD7Y5VHNb0MoiRh9rntgcTDNxCnN0s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RWWQxoIatNQDS7RBdjOe2Ec792bJd95l5ijofgmKlzj9nB8oxyOnulDm26E+EVGgl 4+NJRYELBPdWYbWS5YHObIjjVm2z1zsTDQ650Yc0GpHV/C6xrGaIVLgzzjMd0Kbhhw fWAqO0IQeYiHOI5wRUCHU4NhAdIoefL16kqY6PKPChPRvLbPAu0yZ241auQU4rgd2S ojLhtBsX+FX0XwoSlcu87qeCQM8Ec3v480IVk8Z4R/iZGzpd1oXbTmiNldWYesrVrZ JUcKKKrdlxnSpsntokAU1YFjHRY/knwcTshnP4FOuVhF+xsidvLw4zcDuZtQaX/bem b2Zsr2u55KtcQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 05/12] selftests: mptcp: sockopt: add is_mptcp_socket helper Date: Thu, 30 Jul 2026 11:15:16 +0800 Message-ID: X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Add a small is_mptcp_socket() helper that issues getsockopt(TCP_IS_MPTCP) and returns whether the fd belongs to an MPTCP socket. Use it to gate the MPTCP-specific assertions: skip do_getsockopts() entirely for plain TCP or fallback MPTCP sockets, and skip mptcpi_rcv_delta checks in connect_one_server()/process_one_client() when the socket is not an MPTCP socket. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 3a7fcef5aa54..822cbf3de3e6 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -35,6 +35,9 @@ static int pf =3D AF_INET; #ifndef SOL_MPTCP #define SOL_MPTCP 284 #endif +#ifndef TCP_IS_MPTCP +#define TCP_IS_MPTCP 76 +#endif =20 #ifndef MPTCP_INFO struct mptcp_info { @@ -557,8 +560,28 @@ static void do_getsockopt_mptcp_full_info(struct so_st= ate *s, int fd) assert(!memcmp(&sfinfo->addrs, &s->addrs, sizeof(struct mptcp_subflow_add= rs))); } =20 +static int is_mptcp_socket(int fd) +{ + int is_mptcp =3D 0; + socklen_t optlen; + + optlen =3D sizeof(is_mptcp); + if (getsockopt(fd, IPPROTO_TCP, TCP_IS_MPTCP, &is_mptcp, &optlen) < 0) { + if (errno =3D=3D ENOPROTOOPT) { + perror("TCP_IS_MPTCP test skipped"); + return 0; + } + xerror("getsockopt TCP_IS_MPTCP"); + } + + return is_mptcp; +} + static void do_getsockopts(struct so_state *s, int fd, size_t r, size_t w) { + if (!is_mptcp_socket(fd)) + return; + do_getsockopt_mptcp_info(s, fd, w); =20 do_getsockopt_tcp_info(s, fd, r, w); @@ -634,7 +657,8 @@ static void connect_one_server(int fd, int pipefd) if (eof) total +=3D 1; /* sequence advances due to FIN */ =20 - assert(s.mptcpi_rcv_delta =3D=3D (uint64_t)total); + if (is_mptcp_socket(fd)) + assert(s.mptcpi_rcv_delta =3D=3D (uint64_t)total); close(fd); } =20 @@ -683,8 +707,9 @@ static void process_one_client(int fd, int pipefd) r +=3D ret; =20 do_getsockopts(&s, fd, r, w); - check_stat_equal("mptcpi_rcv_delta", s.mptcpi_rcv_delta, - (uint64_t)r + 1); /* +1 for FIN */ + if (is_mptcp_socket(fd)) + check_stat_equal("mptcpi_rcv_delta", s.mptcpi_rcv_delta, + (uint64_t)r + 1); /* +1 for FIN */ =20 /* be nice when running on top of older kernel */ if (s.pkt_stats_avail) { --=20 2.53.0 From nobody Mon Aug 24 11:16:27 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 88A03375F76 for ; Thu, 30 Jul 2026 03:15:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381344; cv=none; b=mbz2OGkC76D0y4hg9o8nLgdYUww0YkeYlxYZjay21gk0/gDuxZOtJmxAq8+fSXYIbVb8u5ctG6EpSo7MBytTR+5THMxNMutc3CBLChTV5QWep2WhRGSnvvtnSmRXqBfOsl39MjTMidi1Pp5DwrnH5extU2wwY6dKQYCSBjfY6uA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381344; c=relaxed/simple; bh=lX5IAzH4D3yOGeZfPGEDFwQQZgmbCK4WNinciTS0oec=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AMflL/mbDnoAgD6RU9wMcRPiMzpnBY+r6l4SUIT9Ab7X/6Kce2rP8qanqtACPhcNr2cUElDf8/O9wb/t77QXGTU1PQLaEPm8K2EogRD2oLmbGRgxmIhxsgS5bcdl6mNLXaUJPLMVQSi/dDeWMNwkjMZE6KBVufgVVD0VwKOyPA4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Cdtxxhem; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Cdtxxhem" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 021401F000E9; Thu, 30 Jul 2026 03:15:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785381343; bh=U9xNtVIOgKFkiRYQulvkcTUlMLDFZ41mjwpuO/T2Qrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Cdtxxhem4rtwRUKCI7VviIwKa2sLEE+ZGB79eh+1p3TOscbC8WUPbJSyTwYQndAq2 TnMvYy6GFpOTbCKAS2Nhxk5TixC/SqlX842m9rzE+sN3JT5F9FUC7i1PAL2/bbzTL2 pKhGI9vSFMxyCV9zruF3CZ+u98o8gqS1Ws0lJZrrzZgmnX77A96in4QSMWN6dHhNsL kXI58ZCQWAGBmfAVkqR/9dToOJCauPDtB38h+HpnR0g6vSmsYaczZINQM842dioaHL HW3M/HfveARXPtNGA5eFJFxq+keG+MbN57pdDoMHL5AXMNvXx9FIG+e6rRChZE10Aa gyywzyiHz4ZUQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 06/12] selftests: mptcp: sockopt: add tx/rx protocol options Date: Thu, 30 Jul 2026 11:15:17 +0800 Message-ID: X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Add -t and -r options to specify tx/rx protocols (TCP/MPTCP). This increases testing flexibility by allowing explicit protocol selection for both transmission and reception paths. These codes are from mptcp_inq.c. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 822cbf3de3e6..a62f6adda8a0 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -39,6 +39,9 @@ static int pf =3D AF_INET; #define TCP_IS_MPTCP 76 #endif =20 +static int proto_tx =3D IPPROTO_MPTCP; +static int proto_rx =3D IPPROTO_MPTCP; + #ifndef MPTCP_INFO struct mptcp_info { __u8 mptcpi_subflows; @@ -142,6 +145,7 @@ static void __noreturn die_perror(const char *msg) static void die_usage(int r) { fprintf(stderr, "Usage: mptcp_sockopt [-6]\n"); + fprintf(stderr, " [-t tcp|mptcp] [-r tcp|mptcp]\n"); exit(r); } =20 @@ -207,7 +211,7 @@ static int sock_listen_mptcp(const char * const listena= ddr, hints.ai_family =3D pf; =20 for (a =3D addr; a; a =3D a->ai_next) { - sock =3D socket(a->ai_family, a->ai_socktype, IPPROTO_MPTCP); + sock =3D socket(a->ai_family, a->ai_socktype, proto_rx); if (sock < 0) continue; =20 @@ -265,11 +269,22 @@ static int sock_connect_mptcp(const char * const remo= teaddr, return sock; } =20 +static int protostr_to_num(const char *s) +{ + if (strcasecmp(s, "tcp") =3D=3D 0) + return IPPROTO_TCP; + if (strcasecmp(s, "mptcp") =3D=3D 0) + return IPPROTO_MPTCP; + + die_usage(1); + return 0; +} + static void parse_opts(int argc, char **argv) { int c; =20 - while ((c =3D getopt(argc, argv, "h6")) !=3D -1) { + while ((c =3D getopt(argc, argv, "h6t:r:")) !=3D -1) { switch (c) { case 'h': die_usage(0); @@ -277,6 +292,12 @@ static void parse_opts(int argc, char **argv) case '6': pf =3D AF_INET6; break; + case 't': + proto_tx =3D protostr_to_num(optarg); + break; + case 'r': + proto_rx =3D protostr_to_num(optarg); + break; default: die_usage(1); break; @@ -811,10 +832,10 @@ static int client(int pipefd) =20 switch (pf) { case AF_INET: - fd =3D sock_connect_mptcp("127.0.0.1", "15432", IPPROTO_MPTCP); + fd =3D sock_connect_mptcp("127.0.0.1", "15432", proto_tx); break; case AF_INET6: - fd =3D sock_connect_mptcp("::1", "15432", IPPROTO_MPTCP); + fd =3D sock_connect_mptcp("::1", "15432", proto_tx); break; default: xerror("Unknown pf %d\n", pf); --=20 2.53.0 From nobody Mon Aug 24 11:16:27 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39B71433AD for ; Thu, 30 Jul 2026 03:15:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381346; cv=none; b=UmKEMNeJPBlriwC54JPiwqm2XKRN7GFDpNfHW+4EfRUnsbH4cVSOVhMrwK4CzPgPbkkbUkMqQ/BHP+EiQpViPIs2zvVP5FRmOY4Yk5r4feSQ8/HWJQMJ7n4Ca9lAwPP4JPrepQ0pvZ5KCf0blLqLvFqc1KhlaNLalNzfANkbRjM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381346; c=relaxed/simple; bh=l66pbU692FuSzzWC0WrJ03dwOJtl5PZ9WKJy2lLrW7o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GTRBsB0v+qWaKTSZIdWuWIZM8N4snrORliD/OhDts3UK4O8A+Bo1caS6VJcMLwd9xtvVOIK5BAuJzk+BJYiq18FhuolDY5aIps+RwDjxCmCxtsOE0GvtzF5V+pCihLELQmgw7qJPJCYxRqOnrP3y1pOFwgyZ6iOI837E+ZyAt64= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WqbXEzdW; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WqbXEzdW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF72E1F00A3A; Thu, 30 Jul 2026 03:15:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785381345; bh=3vlaHJNBP+9OCFKKDTnYCw0TF5EssrgRxSxuh//Uj4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WqbXEzdWWvijiHWNS5uWRLKgcBkv8F1i9+7m2sWqKDsz/4BaDljrQkF9w8D1GhGvQ St4N7yUstbrBGZDhZv4BRGf6dYOamOGKRQ5mK8tmT04CLtgCqJxB+A+cl3oQ4TFBdW QCGWReMxK/1WnFVALRsFSV/dyXPjLphwMNHXEzTv2lY60jnPAHuAl9NgbvTZ33c5F8 2C3LHItp5kFwkw2zn0w/xFXm8Bjzce0fcRo8aYViMnsWub4wO2q1pp2Fty5ICazKy2 LaQZSpBXGTk6h42Qp0U+WeCd+76j1cIfBB2w+FNFDmXKt07GoCAPASGZ/l+mQPjBqH dzCQUjTUMZgtw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 07/12] selftests: mptcp: sockopt: add TCP_INQ test option Date: Thu, 30 Jul 2026 11:15:18 +0800 Message-ID: <57fb42747dd0e739b3307b084af3e9551b957997.1785380422.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Add -i option to enable TCP_INQ testing. This prepares for consolidating TCP_INQ tests into a single binary by adding the necessary command-line interface. Add helper functions to conditionally set TCP_INQ sockopt on accepted sockets when running in inq mode. This ensures proper testing of TCP_CM_INQ functionality by enabling the required socket option on the incoming server connection. These codes are from mptcp_inq.c. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index a62f6adda8a0..1d98b8d2b4a6 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -41,6 +41,7 @@ static int pf =3D AF_INET; =20 static int proto_tx =3D IPPROTO_MPTCP; static int proto_rx =3D IPPROTO_MPTCP; +static bool inq; =20 #ifndef MPTCP_INFO struct mptcp_info { @@ -146,6 +147,7 @@ static void die_usage(int r) { fprintf(stderr, "Usage: mptcp_sockopt [-6]\n"); fprintf(stderr, " [-t tcp|mptcp] [-r tcp|mptcp]\n"); + fprintf(stderr, " [-i]\n"); exit(r); } =20 @@ -284,7 +286,7 @@ static void parse_opts(int argc, char **argv) { int c; =20 - while ((c =3D getopt(argc, argv, "h6t:r:")) !=3D -1) { + while ((c =3D getopt(argc, argv, "h6t:r:i")) !=3D -1) { switch (c) { case 'h': die_usage(0); @@ -298,6 +300,9 @@ static void parse_opts(int argc, char **argv) case 'r': proto_rx =3D protostr_to_num(optarg); break; + case 'i': + inq =3D true; + break; default: die_usage(1); break; @@ -748,6 +753,14 @@ static void process_one_client(int fd, int pipefd) close(fd); } =20 +static void do_setsockopt_inq(int fd) +{ + int on =3D 1; + + if (setsockopt(fd, IPPROTO_TCP, TCP_INQ, &on, sizeof(on))) + die_perror("setsockopt(TCP_INQ)"); +} + static int xaccept(int s) { int fd =3D accept(s, NULL, 0); @@ -755,6 +768,9 @@ static int xaccept(int s) if (fd < 0) die_perror("accept"); =20 + if (inq) + do_setsockopt_inq(fd); + return fd; } =20 --=20 2.53.0 From nobody Mon Aug 24 11:16:27 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 82D3A29405 for ; Thu, 30 Jul 2026 03:15:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381348; cv=none; b=JhUK157jIeWZYHsNX+GuIxdFHUVutxkDSWBdNvMdtAdnbMPar+JKY+MTyNGbJXHaR2iJ0qz17mDFZ/fZoK4AE4OkMZuAO20LnzdNzfTx0R/Xzk0az2C2qRIoTtTk7uLgT56G5HWthqRhWDy74fXdA01lP9IPt5LrYkUELgx47xE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381348; c=relaxed/simple; bh=NfT3QskjHJdRXyO5b6yD4mlEV8Y3YuzIfE3tDHtLDlk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Bdg+k02GCI2C6IisaqPe65qJnMNckgM6wdgdn4E/1cho7ptxsvacSmfoMKLeZ1l6NsCpNAwMnRSGzkIiZu/8EwLWLbtt5slWsPLUKRZzRCXNr+ExyrcHgb4jQmpf8nGMVI33NRx9D7ZOkEwx8Emih392exFPL5srhGYduAf7Rzc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iiZzcgyb; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iiZzcgyb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 336E11F000E9; Thu, 30 Jul 2026 03:15:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785381347; bh=MmCVn9gEnu49A79yU4KfxoLAJsjaWD1hoCzJwSi9MYg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iiZzcgyby9+31V81YZxUlnYxNdG8WmhuC6jDb3jiWZ61Yv4i1EbDS1zz0pKNwMvDw ceSE+4Xuy66jE/1ptDxOycLotBk+UvhL5jcXgPQBzi//HvJ/4M/o27xXQxLH+MZQ3H an8+NsshIULj81PKmNhCPt62cCoyjPz3GP4MRmLQW0EqIidSs6W2lIEsaVzTxdEEBK SM1yLT3tmydcQrP7CywDoo4ENDeiNFZ5osv0yY75MXJwN+hEtTNtHgcCDuZ2cfI6mh k58/08wzvwtM3OaOLasoZwkURaaEEf9dqW1aaN8FbiMf+jFw/fG7ILmQYzwQDVms5Z clKOH9GzIxBBA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 08/12] selftests: mptcp: sockopt: use unix socket instead of pipe Date: Thu, 30 Jul 2026 11:15:19 +0800 Message-ID: X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Replace the pipe() with socketpair(AF_UNIX, SOCK_STREAM) for inter-process communication. This prepares for upcoming patches that will require bidirectional communication and reliable EOF behavior, which a pipe does not fully support. Use SOCK_STREAM over SOCK_DGRAM (used in the original mptcp_inq.c) to reliably detect peer closure via EOF, avoiding indefinite hangs. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 1d98b8d2b4a6..e404aecc7115 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -618,7 +618,7 @@ static void do_getsockopts(struct so_state *s, int fd, = size_t r, size_t w) do_getsockopt_mptcp_full_info(s, fd); } =20 -static void connect_one_server(int fd, int pipefd) +static void connect_one_server(int fd, int unixfd) { char buf[4096], buf2[4096]; size_t len, i, total; @@ -643,9 +643,9 @@ static void connect_one_server(int fd, int pipefd) do_getsockopts(&s, fd, 0, 0); =20 /* un-block server */ - ret =3D read(pipefd, buf2, 4); + ret =3D read(unixfd, buf2, 4); assert(ret =3D=3D 4); - close(pipefd); + close(unixfd); =20 assert(strncmp(buf2, "xmit", 4) =3D=3D 0); =20 @@ -698,7 +698,7 @@ static void check_stat_equal(const char *name, uint64_t= actual, name, actual, expected, (int64_t)(actual - expected)); } =20 -static void process_one_client(int fd, int pipefd) +static void process_one_client(int fd, int unixfd) { struct so_state s; char buf[4096]; @@ -708,7 +708,7 @@ static void process_one_client(int fd, int pipefd) memset(&s, 0, sizeof(s)); do_getsockopts(&s, fd, 0, 0); =20 - ret =3D write(pipefd, "xmit", 4); + ret =3D write(unixfd, "xmit", 4); assert(ret =3D=3D 4); =20 ret =3D read(fd, buf, sizeof(buf)); @@ -774,7 +774,7 @@ static int xaccept(int s) return fd; } =20 -static int server(int pipefd) +static int server(int unixfd) { int fd =3D -1, r; =20 @@ -790,13 +790,13 @@ static int server(int pipefd) break; } =20 - r =3D write(pipefd, "conn", 4); + r =3D write(unixfd, "conn", 4); assert(r =3D=3D 4); =20 alarm(15); r =3D xaccept(fd); =20 - process_one_client(r, pipefd); + process_one_client(r, unixfd); =20 close(fd); return 0; @@ -840,7 +840,7 @@ static void test_ip_tos_sockopt(int fd) xerror("expect socklen_t =3D=3D -1"); } =20 -static int client(int pipefd) +static int client(int unixfd) { int fd =3D -1; =20 @@ -859,7 +859,7 @@ static int client(int pipefd) =20 test_ip_tos_sockopt(fd); =20 - connect_one_server(fd, pipefd); + connect_one_server(fd, unixfd); =20 return 0; } @@ -915,35 +915,35 @@ int main(int argc, char *argv[]) { int e1, e2, wstatus; pid_t s, c, ret; - int pipefds[2]; + int unixfds[2]; =20 parse_opts(argc, argv); =20 init_rng(); =20 - e1 =3D pipe(pipefds); + e1 =3D socketpair(AF_UNIX, SOCK_STREAM, 0, unixfds); if (e1 < 0) - die_perror("pipe"); + die_perror("socketpair"); =20 s =3D xfork(); if (s =3D=3D 0) { - close(pipefds[0]); - ret =3D server(pipefds[1]); - close(pipefds[1]); + close(unixfds[0]); + ret =3D server(unixfds[1]); + close(unixfds[1]); return ret; } =20 - close(pipefds[1]); + close(unixfds[1]); =20 /* wait until server bound a socket */ - e1 =3D read(pipefds[0], &e1, 4); + e1 =3D read(unixfds[0], &e1, 4); assert(e1 =3D=3D 4); =20 c =3D xfork(); if (c =3D=3D 0) - return client(pipefds[0]); + return client(unixfds[0]); =20 - close(pipefds[0]); + close(unixfds[0]); =20 ret =3D waitpid(s, &wstatus, 0); if (ret =3D=3D -1) --=20 2.53.0 From nobody Mon Aug 24 11:16:27 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D0F1D375F76 for ; Thu, 30 Jul 2026 03:15:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381349; cv=none; b=X2a2vC0gA93gRiPt5uQ6ZqQai7dk9N55vJMnqPnbWnn4D7Eno2Q8nilZM1GPahgikkUR76hGm1S6Nk+fktSWf6nsZCnNRbG/DRah+TJWCI22jAUPFIU0UroHWSYqfuCciSSNlyCLU80/A/WWFbZuNoJdSTuzAfJj/BryUZmzGAE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381349; c=relaxed/simple; bh=Rtdz+pIuG8tLG64Ix1wmg3JNI21fkwDXRQ3e/6WPBZQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kfqn1jVaXvXSVmFRms5TNK6gXqB6prp/Bn9u4UTqAu/mkNNs7GfZWUcO/WebNPQxGLTkxhjUlmRCa+5u+wF8Pu5kpn/gXbIsXeXUijRQ744AREX45jF3oYSKWabyUUBoRyGEg6yVf9u75ftJ4Vhqn+bIu75G/hE7xO9zrfuxA8k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CxO7ok46; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CxO7ok46" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D0E121F00A3A; Thu, 30 Jul 2026 03:15:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785381348; bh=zDuT2ioUuy13SG+74rWKZTH70mpMi1Quq/oIg+C7M9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CxO7ok46ka+e/Gp2vu+Fn/XpSmqHF/FoOZmMWGbL+tIiTONn1/ptBGSz+lgEWZk3J FHsPWugrdPtEgiRJz9dmmCr/+vPXRCZlKO73K09SvH3XXKiw7j8lVWO1fiq8bYI5QR AWbit1VJ5B3zN4pKCN8VSnWZzDHPNmb2pj7bUsjIeZPV65zJqG3v85T4ZnAyNbxkRj MEJ5ETjt6wTpO90VQmdsh/iWFuEelcSHxi6RdUj74YBpAVOQwCjngq34yWZYv8zuUC 8H0iTNq5V/RkjIqSR4e73XD7t2Ds8cUWlLciZbvElnkHc2GOjt4XYntP9uMWLAWgN3 +hEG89MOouK1Q== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 09/12] selftests: mptcp: sockopt: use recvmsg instead of read Date: Thu, 30 Jul 2026 11:15:20 +0800 Message-ID: <9e7fcfd11333a4faa521fed797c3328f92f4bcd9.1785380422.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Replace read() with recvmsg() in process_one_client() to enable control message (CMSG) handling. The original read(fd, buf, sizeof(buf)) is split into two recvmsg() calls: the first reads exactly one byte, and the second reads the remaining bytes. This allows the code to access CMSG data for each received segment, facilitating the upcoming TCP_INQ validation. Introduce inq_msg_init() and inq_msg_reset() helpers to manage the struct inq_msg control buffer and iovec, enabling reuse of the same msghdr across multiple recvmsg() calls with different payload buffers. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 48 +++++++++++++++++-- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index e404aecc7115..080f9d9e34d5 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -698,36 +698,74 @@ static void check_stat_equal(const char *name, uint64= _t actual, name, actual, expected, (int64_t)(actual - expected)); } =20 +struct inq_msg { + char buf[4096]; + union { + struct cmsghdr cmsg; + char msg_buf[4096]; + } control; + struct iovec iov; + struct msghdr hdr; +}; + +static void inq_msg_init(struct inq_msg *m, size_t iov_len) +{ + memset(m, 0, sizeof(*m)); + m->iov.iov_base =3D m->buf; + m->iov.iov_len =3D iov_len; + m->hdr.msg_iov =3D &m->iov; + m->hdr.msg_iovlen =3D 1; + m->hdr.msg_control =3D m->control.msg_buf; + m->hdr.msg_controllen =3D sizeof(m->control.msg_buf); +} + +static void inq_msg_reset(struct inq_msg *m, size_t iov_len, void *base) +{ + m->iov.iov_base =3D base; + m->iov.iov_len =3D iov_len; + m->hdr.msg_controllen =3D sizeof(m->control.msg_buf); +} + static void process_one_client(int fd, int unixfd) { struct so_state s; - char buf[4096]; + struct inq_msg m; ssize_t ret; size_t r, w; =20 + inq_msg_init(&m, 1); + memset(&s, 0, sizeof(s)); do_getsockopts(&s, fd, 0, 0); =20 ret =3D write(unixfd, "xmit", 4); assert(ret =3D=3D 4); =20 - ret =3D read(fd, buf, sizeof(buf)); + /* read one byte */ + ret =3D recvmsg(fd, &m.hdr, 0); if (ret < 0) - die_perror("read"); + die_perror("recvmsg"); r =3D ret; =20 + inq_msg_reset(&m, sizeof(m.buf) - 1, m.buf + 1); + ret =3D recvmsg(fd, &m.hdr, 0); + if (ret < 0) + die_perror("recvmsg"); + r +=3D ret; + assert(s.mptcpi_rcv_delta <=3D (uint64_t)r); =20 if (s.tcpi_rcv_delta) assert(s.tcpi_rcv_delta =3D=3D (uint64_t)r); =20 - ret =3D write(fd, buf, r); + ret =3D write(fd, m.buf, r); if (ret < 0) die_perror("write"); w =3D ret; =20 /* wait for hangup */ - ret =3D read(fd, buf, 1); + inq_msg_reset(&m, 1, m.buf); + ret =3D recvmsg(fd, &m.hdr, 0); if (ret !=3D 0) xerror("expected EOF, got %zd", ret); r +=3D ret; --=20 2.53.0 From nobody Mon Aug 24 11:16:27 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA743375F76 for ; Thu, 30 Jul 2026 03:15:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381352; cv=none; b=R52pI5Kt2UZyTGDmI+9AECVXR/UUvlvDTIoGNDQoCYe8MVPmGcaXX7gDfPtKxmVVBpVkuYflkFvsydmIyS85vtWeKCZFqWtIg1SrQPo7tDOEUPu6ozSa4TldUyTYASKNtOrkBoZdxXH+F+22rQh+OGmNCtXOC7Yk39qHJIy3bmU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381352; c=relaxed/simple; bh=8mNP/jy+y4p97ppOYt8PP33shmw/WdAgMDhL4n2i+PU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YXvEtO/NKciF5wuhQCgTU310erFioIDCZnD6JW7b83yQblMX2iS9rTFDQ5Epmd6SkEhOVBUq4MXcg2FaftGAAHc97gxOqQVYMXc7W/dOQ2H9MUuN6cK6Yw0GDGwOEuek/4mHUpCltKBVCjsuD2Z00sgj4Ufarrr89MD66wkpIYA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cS+6Rui8; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cS+6Rui8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4DC9B1F000E9; Thu, 30 Jul 2026 03:15:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785381350; bh=SO7GZlPj9VEPLD5buZzNgLQwuUMpvkKwE7Vd3kWqT0M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cS+6Rui8PTtdPEXp9uRh5o/ZwJpoXtongRSMTlI0JcDFdU+iCHZY99ZyULW0w6HAg fcB2lEgPyPg/y5Qc6k96tUGwStFKXvXA00fl2xMyk7iRzd3Iost2svzV/LjtBQ5brM WlJH4B76HqOQtiytQb/1hSlp5etqULSVJEISxkH5cJSLT+TUVI/XYmdITknyKeLKlx fapfsFnsIsXuhwY84Yy+w7bEtL7DK0aQI6kQzFjwdm/Er2L37JkcNWcKgyWGikrT/P DAZzXEC5Si6Ojq37kqk1iBO3y6O9Y6U/DggdPK/R7i6LLQAA0ZvVfzO8yL20ZVV4cJ 9UPX28fDAm9cA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 10/12] selftests: mptcp: sockopt: get and verify TCP_INQ Date: Thu, 30 Jul 2026 11:15:21 +0800 Message-ID: X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Implement FIONREAD ioctl checks to validate available data size, ensuring synchronization between write and read operations with non-blocking waits. Pass the payload length ('len') from the client to the server via the unixfd control channel. This allows the server to know the exact amount of data to expect, enabling precise FIONREAD loop and later TCP_CM_INQ validation. Add get_tcp_inq() helper to extract and verify TCP_CM_INQ values from received control messages. Integrate it into the echo test to validate in-queue byte counts at key stages, ensuring correct TCP_INQ behavior with MPTCP. Code adapted from mptcp_inq.c. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 72 ++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 080f9d9e34d5..a8b56f9eda13 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -20,6 +20,7 @@ #include #include #include +#include =20 #include #include @@ -645,10 +646,12 @@ static void connect_one_server(int fd, int unixfd) /* un-block server */ ret =3D read(unixfd, buf2, 4); assert(ret =3D=3D 4); - close(unixfd); =20 assert(strncmp(buf2, "xmit", 4) =3D=3D 0); =20 + ret =3D write(unixfd, &len, sizeof(len)); + assert(ret =3D=3D (ssize_t)sizeof(len)); + ret =3D write(fd, buf, len); if (ret < 0) die_perror("write"); @@ -686,6 +689,7 @@ static void connect_one_server(int fd, int unixfd) if (is_mptcp_socket(fd)) assert(s.mptcpi_rcv_delta =3D=3D (uint64_t)total); close(fd); + close(unixfd); } =20 static void check_stat_equal(const char *name, uint64_t actual, @@ -726,9 +730,30 @@ static void inq_msg_reset(struct inq_msg *m, size_t io= v_len, void *base) m->hdr.msg_controllen =3D sizeof(m->control.msg_buf); } =20 +static void get_tcp_inq(struct msghdr *msgh, unsigned int *inqv) +{ + struct cmsghdr *cmsg; + + for (cmsg =3D CMSG_FIRSTHDR(msgh); cmsg; + cmsg =3D CMSG_NXTHDR(msgh, cmsg)) { + if (cmsg->cmsg_level =3D=3D IPPROTO_TCP && + cmsg->cmsg_type =3D=3D TCP_CM_INQ) { + if (cmsg->cmsg_len < CMSG_LEN(sizeof(*inqv))) + xerror("TCP_CM_INQ cmsg_len too small: %zu", + cmsg->cmsg_len); + memcpy(inqv, CMSG_DATA(cmsg), sizeof(*inqv)); + return; + } + } + + xerror("could not find TCP_CM_INQ cmsg type"); +} + static void process_one_client(int fd, int unixfd) { + unsigned int tcp_inq; struct so_state s; + size_t expect_len; struct inq_msg m; ssize_t ret; size_t r, w; @@ -741,16 +766,57 @@ static void process_one_client(int fd, int unixfd) ret =3D write(unixfd, "xmit", 4); assert(ret =3D=3D 4); =20 + ret =3D read(unixfd, &expect_len, sizeof(expect_len)); + assert(ret =3D=3D (ssize_t)sizeof(expect_len)); + + if (expect_len > sizeof(m.buf)) + xerror("expect len %zu exceeds buffer size", expect_len); + + for (;;) { + struct timespec req; + unsigned int queued; + + ret =3D ioctl(fd, FIONREAD, &queued); + if (ret < 0) + die_perror("FIONREAD"); + if (queued > expect_len) + xerror("FIONREAD returned %u, but only %zu expected\n", + queued, expect_len); + if (queued =3D=3D expect_len) + break; + + req.tv_sec =3D 0; + req.tv_nsec =3D 1000 * 1000ul; + nanosleep(&req, NULL); + } + /* read one byte */ ret =3D recvmsg(fd, &m.hdr, 0); if (ret < 0) die_perror("recvmsg"); + if (inq) { + if (m.hdr.msg_controllen =3D=3D 0) + xerror("msg_controllen is 0"); + + get_tcp_inq(&m.hdr, &tcp_inq); + + /* expect cmsg to return expected - 1 */ + assert((size_t)tcp_inq =3D=3D (expect_len - 1)); + } r =3D ret; =20 inq_msg_reset(&m, sizeof(m.buf) - 1, m.buf + 1); ret =3D recvmsg(fd, &m.hdr, 0); if (ret < 0) die_perror("recvmsg"); + if (inq) { + /* should have gotten exact remainder of all pending data */ + assert(ret =3D=3D (ssize_t)tcp_inq); + + /* should be 0, all drained */ + get_tcp_inq(&m.hdr, &tcp_inq); + assert(tcp_inq =3D=3D 0); + } r +=3D ret; =20 assert(s.mptcpi_rcv_delta <=3D (uint64_t)r); @@ -768,6 +834,10 @@ static void process_one_client(int fd, int unixfd) ret =3D recvmsg(fd, &m.hdr, 0); if (ret !=3D 0) xerror("expected EOF, got %zd", ret); + if (inq) { + get_tcp_inq(&m.hdr, &tcp_inq); + assert(tcp_inq =3D=3D 1); + } r +=3D ret; =20 do_getsockopts(&s, fd, r, w); --=20 2.53.0 From nobody Mon Aug 24 11:16:27 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6B23B433AD for ; Thu, 30 Jul 2026 03:15:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381353; cv=none; b=d2mQc56m0ohM9neO44fgi1z+iBcAQu/b7nSYhl6XLEcp9wbDWL1TwQ4AYbiw0fQeJzyYWJrk5X//C/xbxov6XYVjRz0wJpPPq6lODUnWE4dHLNgRezsi8eamuKjiOf2LJoWyzEeyCWvsEdfU5ttLbqzq9a+fF3Ie4v0HIoWad+o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381353; c=relaxed/simple; bh=0HfHs55p0mg/8N5KhBbnCFHQlSJphsu+Xql37p2YwB8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=njevZmvTSFnUWBdpbFC8YBRB23SiSjG57H2NdBCQmhXZZaKhSJWRM3V8lv8J6bJwGglLa81YwgNsKPrCnkMsEJNy7Hxr51mnWvlvprzMx3DBX/cP1/53+cM3MapRaQd5RT8x8HV7LhRBM8xcjIUj5eLKhjl4lA8YLzA47PNCIh8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hI9QtMTh; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hI9QtMTh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 415251F00A3A; Thu, 30 Jul 2026 03:15:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785381352; bh=7zc9ErYJYSGH7bVBWiQVyY8os1E83McpoPIdU2Uj6OY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hI9QtMThXTkodqeXBHHPgpEpk3hAT8K3Z96VAJ9tpAoqg/kTxSQcErt38t/IdBn7M 2oTVdtQVIqYBWPq1BBnMs0HVJhF/ya88xmqSwqpfVu7MQIFbLLQP0efbKA+d+3lKHV 0hhfRKtU1SYHmMsdZ8crjlkndWVDauwhjb3d/czJ4YsO6PvEDZtYb4LPU5rdWiVXQq ss6XTQ5ZyF42lRYnKdbDbtUiS2y4O89dC6Pxm0UPHV0Z+NvRzkykeJWJr76VuOvPLm J3HrW/fCAIHjShJPbhY6MkwOfAvmrJTO2de2KNmVn7TPtmdcd1vGu6Qsxht0jEuFKD 4BJJUEPqLn7zA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 11/12] selftests: mptcp: sockopt: add huge data transfer tests Date: Thu, 30 Jul 2026 11:15:22 +0800 Message-ID: X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Introduce huge data transfer tests (1-17 MB) to validate MPTCP socket options under high-volume conditions, including proper EOF handling, preparing for TCP_INQ support in subsequent patches. Add wait_for_ack() helper to synchronize test steps by waiting until the send queue is drained (all data ACKed). Used in server_huge_transfer() to ensure reliable TCP_INQ validation. These codes are from mptcp_inq.c, but here they have been placed into two separate functions. And in client_huge_transfer(), do a blocking read for EOF on unixfd instead of sleeping, and poll with POLLRDHUP to wait for FIN arrival before reading the final byte, preventing flaky EOF detection. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 171 ++++++++++++++++++ 1 file changed, 171 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index a8b56f9eda13..cbc594ff7792 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -16,6 +16,7 @@ #include #include #include +#include =20 #include #include @@ -26,6 +27,7 @@ #include =20 #include +#include #include =20 static int pf =3D AF_INET; @@ -619,6 +621,95 @@ static void do_getsockopts(struct so_state *s, int fd,= size_t r, size_t w) do_getsockopt_mptcp_full_info(s, fd); } =20 +/* wait up to timeout milliseconds */ +static void wait_for_ack(int fd, int timeout, size_t total) +{ + int i; + + for (i =3D 0; i < timeout; i++) { + int nsd, ret, queued =3D -1; + struct timespec req; + + ret =3D ioctl(fd, TIOCOUTQ, &queued); + if (ret < 0) + die_perror("TIOCOUTQ"); + + ret =3D ioctl(fd, SIOCOUTQNSD, &nsd); + if (ret < 0) + die_perror("SIOCOUTQNSD"); + + if ((size_t)queued > total) + xerror("TIOCOUTQ %u, but only %zu expected\n", + queued, total); + assert(nsd <=3D queued); + + if (queued =3D=3D 0) + return; + + /* wait for peer to ack rx of all data */ + req.tv_sec =3D 0; + req.tv_nsec =3D 1 * 1000 * 1000ul; /* 1ms */ + nanosleep(&req, NULL); + } + + xerror("still tx data queued after %u ms\n", timeout); +} + +static void server_huge_transfer(int fd, int unixfd, size_t echo) +{ + char buf[4096], buf2[4]; + size_t len, i, total; + size_t sent; + ssize_t ret; + + for (i =3D 0; i < sizeof(buf) - 1; i++) { + buf[i] =3D rand() % 26; + buf[i] +=3D 'A'; + } + + buf[i] =3D '\n'; + + ret =3D read(unixfd, buf2, 4); + assert(ret =3D=3D 4); + assert(strncmp(buf2, "huge", 4) =3D=3D 0); + + total =3D rand() % (16 * 1024 * 1024); + total +=3D (1 * 1024 * 1024); + sent =3D total; + + ret =3D write(unixfd, &total, sizeof(total)); + assert(ret =3D=3D (ssize_t)sizeof(total)); + + wait_for_ack(fd, 5000, echo); + + while (total > 0) { + if (total > sizeof(buf)) + len =3D sizeof(buf); + else + len =3D total; + + ret =3D write(fd, buf, len); + if (ret < 0) + die_perror("write"); + total -=3D ret; + + /* we don't have to care about buf content, only + * number of total bytes sent + */ + } + + ret =3D read(unixfd, buf2, 4); + assert(ret =3D=3D 4); + assert(strncmp(buf2, "shut", 4) =3D=3D 0); + + wait_for_ack(fd, 5000, sent); + + ret =3D write(fd, buf, 1); + assert(ret =3D=3D 1); + ret =3D write(unixfd, "closed", 6); + assert(ret =3D=3D 6); +} + static void connect_one_server(int fd, int unixfd) { char buf[4096], buf2[4096]; @@ -688,6 +779,10 @@ static void connect_one_server(int fd, int unixfd) =20 if (is_mptcp_socket(fd)) assert(s.mptcpi_rcv_delta =3D=3D (uint64_t)total); + + if (inq) + server_huge_transfer(fd, unixfd, total); + close(fd); close(unixfd); } @@ -749,6 +844,79 @@ static void get_tcp_inq(struct msghdr *msgh, unsigned = int *inqv) xerror("could not find TCP_CM_INQ cmsg type"); } =20 +static size_t client_huge_transfer(int fd, int unixfd) +{ + struct pollfd pfd =3D { .fd =3D fd, .events =3D POLLRDHUP }; + unsigned int tcp_inq; + size_t expect_len; + ssize_t ret, tot; + struct inq_msg m; + char tmp[16]; + + inq_msg_init(&m, 1); + + /* request a large swath of data. */ + ret =3D write(unixfd, "huge", 4); + assert(ret =3D=3D 4); + + ret =3D read(unixfd, &expect_len, sizeof(expect_len)); + assert(ret =3D=3D (ssize_t)sizeof(expect_len)); + + /* peer should send us a few mb of data */ + if (expect_len <=3D sizeof(m.buf)) + xerror("expect len %zu too small\n", expect_len); + + tot =3D 0; + do { + inq_msg_reset(&m, sizeof(m.buf), m.buf); + ret =3D recvmsg(fd, &m.hdr, 0); + if (ret < 0) + die_perror("recvmsg"); + if (ret =3D=3D 0) + xerror("unexpected EOF in huge recv"); + + tot +=3D ret; + + get_tcp_inq(&m.hdr, &tcp_inq); + + if (tcp_inq > expect_len - tot) + xerror("inq %d, remaining %zu total_len %d\n", + tcp_inq, expect_len - tot, (int)expect_len); + + assert(tcp_inq <=3D expect_len - tot); + } while ((size_t)tot < expect_len); + + ret =3D write(unixfd, "shut", 4); + assert(ret =3D=3D 4); + + /* wait for "closed"; server did final write on fd */ + ret =3D read(unixfd, tmp, sizeof(tmp)); + assert(ret =3D=3D 6); + assert(strncmp(tmp, "closed", 6) =3D=3D 0); + + /* block on EOF: server close(fd) precedes close(unixfd) */ + ret =3D read(unixfd, tmp, sizeof(tmp)); + assert(ret =3D=3D 0); + + /* Wait for the TCP FIN to actually arrive. */ + ret =3D poll(&pfd, 1, 5000); + assert(ret =3D=3D 1); + assert(pfd.revents & POLLRDHUP); + + inq_msg_reset(&m, 1, m.buf); + ret =3D recvmsg(fd, &m.hdr, 0); + if (ret < 0) + die_perror("recvmsg"); + assert(ret =3D=3D 1); + + get_tcp_inq(&m.hdr, &tcp_inq); + + /* tcp_inq should be 1 due to received fin. */ + assert(tcp_inq =3D=3D 1); + + return tot + 1; +} + static void process_one_client(int fd, int unixfd) { unsigned int tcp_inq; @@ -829,6 +997,9 @@ static void process_one_client(int fd, int unixfd) die_perror("write"); w =3D ret; =20 + if (inq) + r +=3D client_huge_transfer(fd, unixfd); + /* wait for hangup */ inq_msg_reset(&m, 1, m.buf); ret =3D recvmsg(fd, &m.hdr, 0); --=20 2.53.0 From nobody Mon Aug 24 11:16:27 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 224AE433AD for ; Thu, 30 Jul 2026 03:15:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381355; cv=none; b=oungyauh8SY5AqR5IJPlKHsQ4l8PsfptE3gSkrVwc+jRQMNtRohvdfhk9LD04WuUZMf/0VvC4kHgOYqTg8YVToRKHMM+aBUbnbxnO936T2cPS2DHX5XOjd8cQ7wAKnCRmpka7Ry7O+U596b0wHtg+WavPuI6qZVFZBcLwneMGb8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785381355; c=relaxed/simple; bh=NlieOVfvb3imrKa6BRjaGzOpiRbAB7l8xBR+Gj/yWos=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MB4zJgNTHnrjCejxDAr3NP9V4xjMYYJeDDrNQ1SntcqqJ1Q70UX/zyWFS20G2g1ElJX/WKVBqPCMTIaf9OP7h9POvNdsn35gPGzi71soNmPsUrxbR5V8EFeDjS/4S+FIlnimrU5hJbryYJO3Re+y1pA9cDYPi7gt6/A/0d08nsU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mwoELG2q; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mwoELG2q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AEFCA1F000E9; Thu, 30 Jul 2026 03:15:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785381353; bh=VdWOSiRpbRANmt8b+z2W+atfSwMNar1wCGda/3N69SI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mwoELG2qVrZ1iZ6ZPIuiRIR1+SaFQyeis3ZALqReZOQCF8hibmeq7l+BR1QT3NnRs qIvtdqDCyftGgPAlsxB0kNtKWrMaiNbQLeT9Rohljb9MxGSj0wm4G4rmxFjttg2vXU R6EAXJJRri6TaDF55+wSoNd8KTl8o/Z/a0xKt95L5CIzlj6mbTqzKOFwW9b6w1M+T/ SQPnx+L2LOXAIwy0CZEHN4/pnVKRwFk+bspEuWSAw2GWSpT3Wni+SrLlMx/LcHKPxO iLycwrE6aqTalhhJ71yFpbjDa9RA4tiFf593Pas8tEcR0oCMcToG/KrouUfm0bPnXd HjfaJm6guThgA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 12/12] selftests: mptcp: sockopt: replace mptcp_inq with sockopt Date: Thu, 30 Jul 2026 11:15:23 +0800 Message-ID: <7a39eae0eec6488964a61c4ad87eab2a63914502.1785380422.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Update mptcp_sockopt.sh to use mptcp_sockopt binary instead of mptcp_inq. This consolidates TCP_INQ testing into a single test binary while maintaining equivalent test coverage. Delete mptcp_inq binary and references since its functionality has been fully integrated into mptcp_sockopt. This simplifies the test suite structure and reduces maintenance overhead. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/.gitignore | 1 - tools/testing/selftests/net/mptcp/Makefile | 1 - tools/testing/selftests/net/mptcp/mptcp_inq.c | 614 ------------------ .../selftests/net/mptcp/mptcp_sockopt.sh | 8 +- 4 files changed, 4 insertions(+), 620 deletions(-) delete mode 100644 tools/testing/selftests/net/mptcp/mptcp_inq.c diff --git a/tools/testing/selftests/net/mptcp/.gitignore b/tools/testing/s= elftests/net/mptcp/.gitignore index 833279fb34e2..c62e91ce385d 100644 --- a/tools/testing/selftests/net/mptcp/.gitignore +++ b/tools/testing/selftests/net/mptcp/.gitignore @@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only mptcp_connect mptcp_diag -mptcp_inq mptcp_sockopt pm_nl_ctl *.pcap diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/sel= ftests/net/mptcp/Makefile index 7b308447a58b..d594630568b9 100644 --- a/tools/testing/selftests/net/mptcp/Makefile +++ b/tools/testing/selftests/net/mptcp/Makefile @@ -23,7 +23,6 @@ TEST_PROGS :=3D \ TEST_GEN_FILES :=3D \ mptcp_connect \ mptcp_diag \ - mptcp_inq \ mptcp_sockopt \ pm_nl_ctl \ # end of TEST_GEN_FILES diff --git a/tools/testing/selftests/net/mptcp/mptcp_inq.c b/tools/testing/= selftests/net/mptcp/mptcp_inq.c deleted file mode 100644 index 5716998da192..000000000000 --- a/tools/testing/selftests/net/mptcp/mptcp_inq.c +++ /dev/null @@ -1,614 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 - -#define _GNU_SOURCE - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include - -#ifndef IPPROTO_MPTCP -#define IPPROTO_MPTCP 262 -#endif -#ifndef SOL_MPTCP -#define SOL_MPTCP 284 -#endif - -static int pf =3D AF_INET; -static int proto_tx =3D IPPROTO_MPTCP; -static int proto_rx =3D IPPROTO_MPTCP; - -static void __noreturn die_perror(const char *msg) -{ - perror(msg); - exit(1); -} - -static void die_usage(int r) -{ - fprintf(stderr, "Usage: mptcp_inq [-6] [ -t tcp|mptcp ] [ -r tcp|mptcp]\n= "); - exit(r); -} - -static void __noreturn xerror(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - fputc('\n', stderr); - exit(1); -} - -static const char *getxinfo_strerr(int err) -{ - if (err =3D=3D EAI_SYSTEM) - return strerror(errno); - - return gai_strerror(err); -} - -static void xgetaddrinfo(const char *node, const char *service, - struct addrinfo *hints, - struct addrinfo **res) -{ - int err; - -again: - err =3D getaddrinfo(node, service, hints, res); - if (err) { - const char *errstr; - - if (err =3D=3D EAI_SOCKTYPE) { - hints->ai_protocol =3D IPPROTO_TCP; - goto again; - } - - errstr =3D getxinfo_strerr(err); - - fprintf(stderr, "Fatal: getaddrinfo(%s:%s): %s\n", - node ? node : "", service ? service : "", errstr); - exit(1); - } -} - -static int sock_listen_mptcp(const char * const listenaddr, - const char * const port) -{ - int sock =3D -1; - struct addrinfo hints =3D { - .ai_protocol =3D IPPROTO_MPTCP, - .ai_socktype =3D SOCK_STREAM, - .ai_flags =3D AI_PASSIVE | AI_NUMERICHOST - }; - - hints.ai_family =3D pf; - - struct addrinfo *a, *addr; - int one =3D 1; - - xgetaddrinfo(listenaddr, port, &hints, &addr); - hints.ai_family =3D pf; - - for (a =3D addr; a; a =3D a->ai_next) { - sock =3D socket(a->ai_family, a->ai_socktype, proto_rx); - if (sock < 0) - continue; - - if (-1 =3D=3D setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &one, - sizeof(one))) - perror("setsockopt"); - - if (bind(sock, a->ai_addr, a->ai_addrlen) =3D=3D 0) - break; /* success */ - - perror("bind"); - close(sock); - sock =3D -1; - } - - freeaddrinfo(addr); - - if (sock < 0) - xerror("could not create listen socket"); - - if (listen(sock, 20)) - die_perror("listen"); - - return sock; -} - -static int sock_connect_mptcp(const char * const remoteaddr, - const char * const port, int proto) -{ - struct addrinfo hints =3D { - .ai_protocol =3D IPPROTO_MPTCP, - .ai_socktype =3D SOCK_STREAM, - }; - struct addrinfo *a, *addr; - int sock =3D -1; - - hints.ai_family =3D pf; - - xgetaddrinfo(remoteaddr, port, &hints, &addr); - for (a =3D addr; a; a =3D a->ai_next) { - sock =3D socket(a->ai_family, a->ai_socktype, proto); - if (sock < 0) - continue; - - if (connect(sock, a->ai_addr, a->ai_addrlen) =3D=3D 0) - break; /* success */ - - die_perror("connect"); - } - - if (sock < 0) - xerror("could not create connect socket"); - - freeaddrinfo(addr); - return sock; -} - -static int protostr_to_num(const char *s) -{ - if (strcasecmp(s, "tcp") =3D=3D 0) - return IPPROTO_TCP; - if (strcasecmp(s, "mptcp") =3D=3D 0) - return IPPROTO_MPTCP; - - die_usage(1); - return 0; -} - -static void parse_opts(int argc, char **argv) -{ - int c; - - while ((c =3D getopt(argc, argv, "h6t:r:")) !=3D -1) { - switch (c) { - case 'h': - die_usage(0); - break; - case '6': - pf =3D AF_INET6; - break; - case 't': - proto_tx =3D protostr_to_num(optarg); - break; - case 'r': - proto_rx =3D protostr_to_num(optarg); - break; - default: - die_usage(1); - break; - } - } -} - -/* wait up to timeout milliseconds */ -static void wait_for_ack(int fd, int timeout, size_t total) -{ - int i; - - for (i =3D 0; i < timeout; i++) { - int nsd, ret, queued =3D -1; - struct timespec req; - - ret =3D ioctl(fd, TIOCOUTQ, &queued); - if (ret < 0) - die_perror("TIOCOUTQ"); - - ret =3D ioctl(fd, SIOCOUTQNSD, &nsd); - if (ret < 0) - die_perror("SIOCOUTQNSD"); - - if ((size_t)queued > total) - xerror("TIOCOUTQ %u, but only %zu expected\n", queued, total); - assert(nsd <=3D queued); - - if (queued =3D=3D 0) - return; - - /* wait for peer to ack rx of all data */ - req.tv_sec =3D 0; - req.tv_nsec =3D 1 * 1000 * 1000ul; /* 1ms */ - nanosleep(&req, NULL); - } - - xerror("still tx data queued after %u ms\n", timeout); -} - -static void connect_one_server(int fd, int unixfd) -{ - size_t len, i, total, sent; - char buf[4096], buf2[4096]; - ssize_t ret; - - len =3D rand() % (sizeof(buf) - 1); - - if (len < 128) - len =3D 128; - - for (i =3D 0; i < len ; i++) { - buf[i] =3D rand() % 26; - buf[i] +=3D 'A'; - } - - buf[i] =3D '\n'; - - /* un-block server */ - ret =3D read(unixfd, buf2, 4); - assert(ret =3D=3D 4); - - assert(strncmp(buf2, "xmit", 4) =3D=3D 0); - - ret =3D write(unixfd, &len, sizeof(len)); - assert(ret =3D=3D (ssize_t)sizeof(len)); - - ret =3D write(fd, buf, len); - if (ret < 0) - die_perror("write"); - - if (ret !=3D (ssize_t)len) - xerror("short write"); - - ret =3D read(unixfd, buf2, 4); - assert(strncmp(buf2, "huge", 4) =3D=3D 0); - - total =3D rand() % (16 * 1024 * 1024); - total +=3D (1 * 1024 * 1024); - sent =3D total; - - ret =3D write(unixfd, &total, sizeof(total)); - assert(ret =3D=3D (ssize_t)sizeof(total)); - - wait_for_ack(fd, 5000, len); - - while (total > 0) { - if (total > sizeof(buf)) - len =3D sizeof(buf); - else - len =3D total; - - ret =3D write(fd, buf, len); - if (ret < 0) - die_perror("write"); - total -=3D ret; - - /* we don't have to care about buf content, only - * number of total bytes sent - */ - } - - ret =3D read(unixfd, buf2, 4); - assert(ret =3D=3D 4); - assert(strncmp(buf2, "shut", 4) =3D=3D 0); - - wait_for_ack(fd, 5000, sent); - - ret =3D write(fd, buf, 1); - assert(ret =3D=3D 1); - close(fd); - ret =3D write(unixfd, "closed", 6); - assert(ret =3D=3D 6); - - close(unixfd); -} - -static void get_tcp_inq(struct msghdr *msgh, unsigned int *inqv) -{ - struct cmsghdr *cmsg; - - for (cmsg =3D CMSG_FIRSTHDR(msgh); cmsg ; cmsg =3D CMSG_NXTHDR(msgh, cmsg= )) { - if (cmsg->cmsg_level =3D=3D IPPROTO_TCP && cmsg->cmsg_type =3D=3D TCP_CM= _INQ) { - memcpy(inqv, CMSG_DATA(cmsg), sizeof(*inqv)); - return; - } - } - - xerror("could not find TCP_CM_INQ cmsg type"); -} - -static void process_one_client(int fd, int unixfd) -{ - unsigned int tcp_inq; - size_t expect_len; - char msg_buf[4096]; - char buf[4096]; - char tmp[16]; - struct iovec iov =3D { - .iov_base =3D buf, - .iov_len =3D 1, - }; - struct msghdr msg =3D { - .msg_iov =3D &iov, - .msg_iovlen =3D 1, - .msg_control =3D msg_buf, - .msg_controllen =3D sizeof(msg_buf), - }; - ssize_t ret, tot; - - ret =3D write(unixfd, "xmit", 4); - assert(ret =3D=3D 4); - - ret =3D read(unixfd, &expect_len, sizeof(expect_len)); - assert(ret =3D=3D (ssize_t)sizeof(expect_len)); - - if (expect_len > sizeof(buf)) - xerror("expect len %zu exceeds buffer size", expect_len); - - for (;;) { - struct timespec req; - unsigned int queued; - - ret =3D ioctl(fd, FIONREAD, &queued); - if (ret < 0) - die_perror("FIONREAD"); - if (queued > expect_len) - xerror("FIONREAD returned %u, but only %zu expected\n", - queued, expect_len); - if (queued =3D=3D expect_len) - break; - - req.tv_sec =3D 0; - req.tv_nsec =3D 1000 * 1000ul; - nanosleep(&req, NULL); - } - - /* read one byte, expect cmsg to return expected - 1 */ - ret =3D recvmsg(fd, &msg, 0); - if (ret < 0) - die_perror("recvmsg"); - - if (msg.msg_controllen =3D=3D 0) - xerror("msg_controllen is 0"); - - get_tcp_inq(&msg, &tcp_inq); - - assert((size_t)tcp_inq =3D=3D (expect_len - 1)); - - iov.iov_len =3D sizeof(buf); - ret =3D recvmsg(fd, &msg, 0); - if (ret < 0) - die_perror("recvmsg"); - - /* should have gotten exact remainder of all pending data */ - assert(ret =3D=3D (ssize_t)tcp_inq); - - /* should be 0, all drained */ - get_tcp_inq(&msg, &tcp_inq); - assert(tcp_inq =3D=3D 0); - - /* request a large swath of data. */ - ret =3D write(unixfd, "huge", 4); - assert(ret =3D=3D 4); - - ret =3D read(unixfd, &expect_len, sizeof(expect_len)); - assert(ret =3D=3D (ssize_t)sizeof(expect_len)); - - /* peer should send us a few mb of data */ - if (expect_len <=3D sizeof(buf)) - xerror("expect len %zu too small\n", expect_len); - - tot =3D 0; - do { - iov.iov_len =3D sizeof(buf); - ret =3D recvmsg(fd, &msg, 0); - if (ret < 0) - die_perror("recvmsg"); - - tot +=3D ret; - - get_tcp_inq(&msg, &tcp_inq); - - if (tcp_inq > expect_len - tot) - xerror("inq %d, remaining %d total_len %d\n", - tcp_inq, expect_len - tot, (int)expect_len); - - assert(tcp_inq <=3D expect_len - tot); - } while ((size_t)tot < expect_len); - - ret =3D write(unixfd, "shut", 4); - assert(ret =3D=3D 4); - - /* wait for hangup. Should have received one more byte of data. */ - ret =3D read(unixfd, tmp, sizeof(tmp)); - assert(ret =3D=3D 6); - assert(strncmp(tmp, "closed", 6) =3D=3D 0); - - sleep(1); - - iov.iov_len =3D 1; - ret =3D recvmsg(fd, &msg, 0); - if (ret < 0) - die_perror("recvmsg"); - assert(ret =3D=3D 1); - - get_tcp_inq(&msg, &tcp_inq); - - /* tcp_inq should be 1 due to received fin. */ - assert(tcp_inq =3D=3D 1); - - iov.iov_len =3D 1; - ret =3D recvmsg(fd, &msg, 0); - if (ret < 0) - die_perror("recvmsg"); - - /* expect EOF */ - assert(ret =3D=3D 0); - get_tcp_inq(&msg, &tcp_inq); - assert(tcp_inq =3D=3D 1); - - close(fd); -} - -static int xaccept(int s) -{ - int fd =3D accept(s, NULL, 0); - - if (fd < 0) - die_perror("accept"); - - return fd; -} - -static int server(int unixfd) -{ - int fd =3D -1, r, on =3D 1; - - switch (pf) { - case AF_INET: - fd =3D sock_listen_mptcp("127.0.0.1", "15432"); - break; - case AF_INET6: - fd =3D sock_listen_mptcp("::1", "15432"); - break; - default: - xerror("Unknown pf %d\n", pf); - break; - } - - r =3D write(unixfd, "conn", 4); - assert(r =3D=3D 4); - - alarm(15); - r =3D xaccept(fd); - - if (-1 =3D=3D setsockopt(r, IPPROTO_TCP, TCP_INQ, &on, sizeof(on))) - die_perror("setsockopt"); - - process_one_client(r, unixfd); - - close(fd); - return 0; -} - -static int client(int unixfd) -{ - int fd =3D -1; - - alarm(15); - - switch (pf) { - case AF_INET: - fd =3D sock_connect_mptcp("127.0.0.1", "15432", proto_tx); - break; - case AF_INET6: - fd =3D sock_connect_mptcp("::1", "15432", proto_tx); - break; - default: - xerror("Unknown pf %d\n", pf); - } - - connect_one_server(fd, unixfd); - - return 0; -} - -static void init_rng(void) -{ - unsigned int foo; - - if (getrandom(&foo, sizeof(foo), 0) =3D=3D -1) { - perror("getrandom"); - exit(1); - } - - srand(foo); -} - -static pid_t xfork(void) -{ - pid_t p =3D fork(); - - if (p < 0) - die_perror("fork"); - else if (p =3D=3D 0) - init_rng(); - - return p; -} - -static int rcheck(int wstatus, const char *what) -{ - if (WIFEXITED(wstatus)) { - if (WEXITSTATUS(wstatus) =3D=3D 0) - return 0; - fprintf(stderr, "%s exited, status=3D%d\n", what, WEXITSTATUS(wstatus)); - return WEXITSTATUS(wstatus); - } else if (WIFSIGNALED(wstatus)) { - xerror("%s killed by signal %d\n", what, WTERMSIG(wstatus)); - } else if (WIFSTOPPED(wstatus)) { - xerror("%s stopped by signal %d\n", what, WSTOPSIG(wstatus)); - } - - return 111; -} - -int main(int argc, char *argv[]) -{ - int e1, e2, wstatus; - pid_t s, c, ret; - int unixfds[2]; - - parse_opts(argc, argv); - - e1 =3D socketpair(AF_UNIX, SOCK_DGRAM, 0, unixfds); - if (e1 < 0) - die_perror("pipe"); - - s =3D xfork(); - if (s =3D=3D 0) { - close(unixfds[0]); - ret =3D server(unixfds[1]); - close(unixfds[1]); - return ret; - } - - close(unixfds[1]); - - /* wait until server bound a socket */ - e1 =3D read(unixfds[0], &e1, 4); - assert(e1 =3D=3D 4); - - c =3D xfork(); - if (c =3D=3D 0) - return client(unixfds[0]); - - close(unixfds[0]); - - ret =3D waitpid(s, &wstatus, 0); - if (ret =3D=3D -1) - die_perror("waitpid"); - e1 =3D rcheck(wstatus, "server"); - ret =3D waitpid(c, &wstatus, 0); - if (ret =3D=3D -1) - die_perror("waitpid"); - e2 =3D rcheck(wstatus, "client"); - - return e1 ? e1 : e2; -} diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index e850a87429b6..a39265555438 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -308,7 +308,7 @@ run_tests() do_tcpinq_test() { print_title "TCP_INQ cmsg/ioctl $*" - ip netns exec "$ns_sbox" ./mptcp_inq "$@" + ip netns exec "$ns_sbox" ./mptcp_sockopt "$@" local lret=3D$? if [ $lret -ne 0 ];then ret=3D$lret @@ -334,19 +334,19 @@ do_tcpinq_tests() =20 local args for args in "-t tcp" "-r tcp"; do - do_tcpinq_test $args + do_tcpinq_test $args -i lret=3D$? if [ $lret -ne 0 ] ; then return $lret fi - do_tcpinq_test -6 $args + do_tcpinq_test -6 $args -i lret=3D$? if [ $lret -ne 0 ] ; then return $lret fi done =20 - do_tcpinq_test -r tcp -t tcp + do_tcpinq_test -r tcp -t tcp -i =20 return $? } --=20 2.53.0