From nobody Sat Jul 25 18:01:21 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 630FA2D2488 for ; Sat, 25 Jul 2026 12:43:14 +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=1784983395; cv=none; b=RhIXjiluGIODgANnpoW7RqYcA9pjtArV4pKkj89WCmxyW2QLOJJV7ufemE1rY5XAKAjTUmDvjPYhxSxAYQfhkZPUxDTW9iP9+b6928IKLIXlwT3BAuKZKQzYYSNmgxaT6cqU3bM7nYCUDgckivaz93pR+vxd6SRKbTWm5LLRpgc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784983395; c=relaxed/simple; bh=g4oMR+jl11rKsLOhhTHRUZTisr4mz0F9TtMDGk80ifw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=geWQepNMd5dwDYvQOnVmQ0FvU3/WexNbnzAjHTen3fISbsiLCwvhLWNTCn1oYG0lJYjN2NLGUUHQs/imN1VLtJWLUXG4f64e2SRL7LRgz1ArGzY9scVUm7Im7Jk2P342jwJWThTFeP86fHClelo4aIiVYacjehszWeKCp3HuIYw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FzY4EEPm; 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="FzY4EEPm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02D301F00A3A; Sat, 25 Jul 2026 12:43:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784983394; bh=Fc7W4YnUp/0T1utT9FO9PAk4Vn0+mzs1xgVbV67hKxk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FzY4EEPmHVw7a+/ohrN0zTP0EB+4ediqMSLsBB7YAkqoBWRJZxzVZ8CJ0F4sgr3Hu Tx9B2PlFWo7Ef7GpuH0WHz4T5gSyTrxscM5bbrcUzgZgkWXcFRYggJBzYjrxfu0fYU yr+n0ouIeYBt+fRIZNLP/G0WcB0CDcfxx4dkyn1N4f/ibRh7cw678pEwGykT0RdM+m 1KxnIMH2FvlODpLulbBGqLFcwxH1lBHFlOA+Fq5NE1ZRp5gORIyOirZmoucj5lQwCu lcqXIMKZTGjNgY44MbwdjIrj3FenMmK+uBZTj9Lbkiacagb+bN0H+OOqo6JUH7mqSk SmDGhXpgKK+Aw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 01/12] selftests: mptcp: sockopt: reseed RNG after fork Date: Sat, 25 Jul 2026 20:42:22 +0800 Message-ID: <7122f016943603cb24c2306e4f436373b86c2299.1784981974.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 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. These codes are from mptcp_inq.c. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index b6e58d936ebe..05afe8dd1381 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; } --=20 2.53.0 From nobody Sat Jul 25 18:01:21 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 A694B2D2488 for ; Sat, 25 Jul 2026 12:43:15 +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=1784983396; cv=none; b=eDaIdN8qvdmsVEjnUXPVMA01zB5q+wNOKKUHXyNBNnWCBSTwjoQXQkKlnGzlaBUvJNonoH2xlIgndh2iqbUqKZ8FH3jcF2/hMS2TP7Ve6emgeplqzcZ0Fm/pIEzo5KNDGtxIkSW9bbah+BkEAIbNt8EinDKPM7CcXP2VVhXrfjU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784983396; c=relaxed/simple; bh=xMUHk4FZgLtsOetEMgyn6DWs+YyfWTqR6prXUcqlcOc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VfhyvGkjuhcytXB7+ozjMZr1ovjUbyfStzER9FiTD1RQhbpnUJFqFG7xMAjMiXHhGL61Mxpl2wsLDnGcscRrSbT4rhIaEcjMi+X3oUARDW5kOcamwvvwpe+ZcjU7Cd9ZAFG2EcZed1aZzGjImlORAoRQxDMHvJhx4235hHPuoS4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fSJCUOTP; 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="fSJCUOTP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85E0C1F00A3D; Sat, 25 Jul 2026 12:43:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784983395; bh=kSWWG0CtN1LB0CeT/fpBO+dsBChKgatlHHHME8t5CBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fSJCUOTPkNFBSP3EvXIBs8n2Pr5Hfg9RCv8rPN6CfTn0skFl3CnAYEZeF8bctTop1 3DYBb6CuY7F+rz1EltSw8aEbLRVezOssvHEb8pAie1GMrXATEg+MGEyOJW3tsPfhhO NBgLbU1oANUMkSIXBK187tkzEOzaetvteyhjwozXFOlYtY0JIO3S63CK1SPvc1bn9c mIB3jXxy7iRyi2spQa9wbIxS7aTXXEsWyPqr9MYkz9hllMU8sDhmZ2QJiF/Sp5QQL5 xARoMsDnAhCSvijpdcNXK5cosYOcVAU95A7d3XqptqgUlyRkF6Jcy+NCe7xjzRLsaZ mQSPEvd+FXF7w== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 02/12] selftests: mptcp: sockopt: use exact length in connect_one_server Date: Sat, 25 Jul 2026 20:42:23 +0800 Message-ID: <3a61c89488070a67017f14031ac74481174c5adb.1784981974.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 05afe8dd1381..9588a25ac6b2 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 Sat Jul 25 18:01:21 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 E1ADA2D2488 for ; Sat, 25 Jul 2026 12:43:16 +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=1784983398; cv=none; b=jPGPktpFNbxK2j9sEOURd+cva4sDbbzYdV1ZXU5MQwbRNAFj2aqYk/eRgPpXd3UWplJWhn5flOfN8XZk/XGu4+kyxTmPTmhVVUzWIDgPTfUdtiF6EjOS1zCJFk/TzOBp2TO9ACmKdi0LdK8mgsB4jjR2yluoWL08zx2MRCZwf7c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784983398; c=relaxed/simple; bh=HbPQf7nkpxWXfcaTydKAJTjP7ZGbeqiNjhqT4WoYnxs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ofku3LHeZYXV6rcFryHHvGpiGh4fhzkOdK3dBZiEOPMQonELnDcLKuTYeaRQME0lUsutq569QMy0yJ2qtsYAedXcTVOB5IVk6utNWerWPZPXOpu0XN/5/0mMy2cL8gzllx2bHTSJCAPLh/8XoW9NEGGXxg3aZnc2cxTy6fjeh/I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YTENbLrs; 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="YTENbLrs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CEDCE1F000E9; Sat, 25 Jul 2026 12:43:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784983396; bh=84NzaoGM2h/OIt9jvjUb6+UAU1prRYzoY4u3b+8BvkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YTENbLrsJCpbr/AYwcgnQQZ7/ToeK6KHLySJ+txLREOAfjGx5Y9+YRVfYpH1rTAOE b8OZyObkcBUfvrJjmSwABS27acXyMCtg6/NPqUg3qX4pjY//hhUSH6tmxLIwYo/kb6 owctJUmvq+Qx16nfBonn6I+KLalBgBWz1DKqfDJEhYHim68jck/Vor9laJS2G1qvhY nY7eE1EwCwqYzXkD5ik4P/5krf/dP/MU59lxuL1NDRdKICBERjRu+YqCxkhNROa6Wg h88/zIzZ7mIJZajvQynfNMPHBGfpnN3CiRQCxOB/ZoLgDfBCPTBcdssHc2yzmYyc4G 0vcdPg5BqSS4w== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 03/12] selftests: mptcp: sockopt: add check_stat_equal helper Date: Sat, 25 Jul 2026 20:42:24 +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 9588a25ac6b2..f124850181e7 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 Sat Jul 25 18:01:21 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 77F0E2D2488 for ; Sat, 25 Jul 2026 12:43:18 +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=1784983399; cv=none; b=i2LMLgPYpSv9T8z0/okBO2cI63b8pDmEA19wpI2dT1+AYgAC08BTmLbLV/liEGuwMA28503dAF9mGel4rC5ccqG+s02eakYhYz5tK4yfeLRbCR92Zm15z9uxECsoPtzEtRKuJQfXWH5WmxeU7Z+inTr/Iz4DglrowTMq+nD/BoM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784983399; c=relaxed/simple; bh=Qh+87Mt0rcDz9zYg5rMzM8XtkLJ6SewLvW4joU9lzP8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mMJFjcIYHL+BQzT4pDAz+qJosi1UmwR0flFk3PmtpR88DWk+SWQTFZNhimehAnptRmFyaxAn3WKcnL7jygs39agQPQ/MW6s4oiV/imC4yn1S992qVtMP6KLU+nTps5JohOayI1mDnojh/jtWS2iM9tyCWRT+Vo4qsrnc0986Bh0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gSBHwfDw; 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="gSBHwfDw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3894A1F00A3A; Sat, 25 Jul 2026 12:43:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784983398; bh=KDQXXwcIdjWQ3Dj4Qi0zZb/cCZUw1uBTIknOz/jMa/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gSBHwfDwOyvzF5VloUAi2aq84FbDGAVoL3fCEI4ifzv2JkIxId1mf2bj7s7hHAIuM /ghe0pT99IRhmPsDpb3Ks/RlJuwAzAxzWXMJBncCN8JHuYvn2/vkEzrzCCc8w2UGe3 Y19dgMX+RdHNzY3Ioz1YViQzzE14X/mx2vYWeVk++x4oyqsU6VBUUFHIDlJncwpLLz JyilcgJtHyAePZ8b5dWjvidDJv6ocWYoZxsbCA1B3tpeXVuw7ctuVhTzF/dRLYHzMD 3iIsVjH21+zdGLVidvi6IkpFtm5ADhL6DDbiFY3FD1HX2VKkB8jHFhNrEzp8VxVsRk sCag75ntTuZ3A== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 04/12] selftests: mptcp: sockopt: use size_t for byte counters Date: Sat, 25 Jul 2026 20:42:25 +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 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 f124850181e7..9e1d84af5268 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 Sat Jul 25 18:01:21 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 9254E2D238F for ; Sat, 25 Jul 2026 12:43:19 +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=1784983400; cv=none; b=NIjxKn06JNzHtXVAoMZXblyA5B9dO+1OO/MayriLwO/LXD21DXxi15+KuRuU997QZARmoxt7YxlaIYoOkmIg67BtnEWZrGi4zBcAHUyj1Mzh1cksiIT2ll4bo5O5NGzRBIovXIMrWgE8mGl3Qeny+0VA4i+BjCN03/wxwpRWTus= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784983400; c=relaxed/simple; bh=26dU1/H3nL+dpsmK+TSFP0UedQ8jE3mvlFwMUZJ5n5s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jHDFLMpdfmuti0u3ZmwnXltLHiW6nP+vHmxKzAjxbFMfI12piJMIf1g+Yo/1wlKp3HVzvt+EBxiUQ5B737Qw88K/gO0j/uwPfPeIn7FWCDzoxYs+CMmCf2zcb3Ek7dqeyguXbgSr2ZIXJHj+ywyNEotYZNaShfxvkPsdT3Z6zXs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Q+4nsd2L; 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="Q+4nsd2L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5F931F000E9; Sat, 25 Jul 2026 12:43:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784983399; bh=q4FVgup+LfyS08a5rb1ybF15EMps4hJeWwfT34m39E8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Q+4nsd2LmG8D5y1W8K7Yb2u2TushzLDo1UtnhFxJyub2yKe+ULjIIoZlE28eHlKNy sf5ZxNSY0CQwmA6kdfDUPHmMKpEPRnU69KqRSJ4cyl2vZsiFSX6wpwgPshcV0I17kG zbJZakxId7ax5h9WgjXcMivyCNwCeM5zUvKkiuYtXHmyUaJP6pDpKALbkcgomj/wIt Vbq1zGCNZJCXMdczV8bgLZzbnPXGI9g51urxTJO9dphF0Q9lKXfHfXVH8QCP/J6GCC TegeOZbLgKn1UXcu6BzzrcmRtilcolQw42H9EhcRUONeicd5uyxzPQSPFusOgkD9f5 wsM07D/WsT2bQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 05/12] selftests: mptcp: sockopt: add is_mptcp_socket Date: Sat, 25 Jul 2026 20:42:26 +0800 Message-ID: <1cabcccda429f38934b83a053c75f4f14340774f.1784981974.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 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 sockets, and skip the 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 | 23 ++++++++++++++++--- 1 file changed, 20 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 9e1d84af5268..51e5e33d1db5 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -557,8 +557,23 @@ 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) =3D=3D = -1) + perror("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 +649,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 +699,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 Sat Jul 25 18:01:21 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 D46352D5A01 for ; Sat, 25 Jul 2026 12:43:21 +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=1784983402; cv=none; b=tWtwg8lkEexi3xYPgy+GAKVwnHp1GVgUKGR172KWd+WA9fKGATEx2VrK67iMqWIhf0czxftACgEXR5Bc3UZDOGqvW7DLk/rLr7ZTOxOY5x6F5452gSmnGmcWorLRdb8vUtbNK8b/IGVZ7vx95CrWT2isQAVF5csw6zooYNUL2QI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784983402; c=relaxed/simple; bh=VybFGPkIe3G7ZiWVKb/NfY9nGGwQkT4Wsi5D1Xb4zqQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CLioC4aUsDESTqtAuFCduHE+5WbQW484VV2kEVFydRoL5a0jQvegSSKp6b6OSFAmCyMIfsOaXyXtkDPxkgqR3VY/PLiUH0BaK6nYaEYIoPuGwMhZdte73sZUVITcwK77pFf8onmEh6ipfLGN2Oqz7b5/VSH0xonYfNLKRyubZyU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oKjxq+e0; 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="oKjxq+e0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EDE651F00A3A; Sat, 25 Jul 2026 12:43:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784983401; bh=M1CUFPfDgnUTu2yKNSk7UKUgFenQmDAIkrs+3Wv+c8s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oKjxq+e0NPtxDMgbjRtlMKZKSyRI/LNBDpcD/tCtZL3xM9CXPN+HgUdgkDJBWeD1l rKsUFXf/Lxhs1xndOBJ3Uhb2vomBTJRQjywqWzEVopkoV9Omva6GdM1rKBWwCvSC+X GAWG31f8XR2ZbDvMbLb5uBQTRAI6ug59XqhE4hdH1Irrc/O4gMeIQFQfKa8hfCQQds 8UPFokvDecONfsr6iUgIMRAeUJZeJdYfI38jNm4wnL4t/wV1UaLaaXKTBr5VzYZ371 JAh9lA5l5BA5AiJW6UwzmCZdxHy6pWVzQS+gSyYoZxD92SEMLLKmNOn4zrMuO0hKmo qK9JpRjW/UO2w== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 06/12] selftests: mptcp: sockopt: add tx/rx protocol options Date: Sat, 25 Jul 2026 20:42:27 +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 | 28 ++++++++++++++++--- 1 file changed, 24 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 51e5e33d1db5..b131a18eca79 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -28,6 +28,8 @@ #include =20 static int pf =3D AF_INET; +static int proto_tx =3D IPPROTO_MPTCP; +static int proto_rx =3D IPPROTO_MPTCP; =20 #ifndef IPPROTO_MPTCP #define IPPROTO_MPTCP 262 @@ -139,6 +141,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 @@ -204,7 +207,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 @@ -262,11 +265,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); @@ -274,6 +288,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; @@ -803,10 +823,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 Sat Jul 25 18:01:21 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 018292D2488 for ; Sat, 25 Jul 2026 12:43:23 +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=1784983404; cv=none; b=PB5WxCT5zlHB696kLH7unJsNvm/ooj87TVmOfTAu/9HFy0EMolunuDs3RBmqq7KdwE0h6ZRUyseG0zfIHFaf3PJ7WkuoAX6V0oNeUW4+1UJVt5oQXO0C7IruHTWNme2g9q2cA1z5Gcucst1XSMz0JUWga5VFjJFdVEsUH9GUTGY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784983404; c=relaxed/simple; bh=sQtoOZ4T2WwFVw7liYUqr/LV9nR91FuBnakBZZd1vjk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jmehOXfWpVGzhcREpvePStyX4L+hr12+n/mNq/BQFUbe8t/LCqTqVFQH3sxYRaWhyLr3hlNzqBM3EZm6q9rkVzMtui6bO2XHjOlVRRcfoiAunkd3Mj328Y+TvEpKS0dgsdo36Yffn8j5D7oQgO7OItC0wxdLJusErYHS+3Oypds= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cnRglrTv; 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="cnRglrTv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 068291F000E9; Sat, 25 Jul 2026 12:43:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784983402; bh=drou8/UgDqSU9nQbrYcMMqC2Wr0yxf7rTbqgUod6/bs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cnRglrTv8YtSnEnXzmgAX56uE2g6hlpuyLbMC6m15Zy3xsGlIkdpEZ9EglQtIo4ln Vc5A0O78BnK1iLZfj0qHBvKI8GE24nvm3CdBKXVLvnNUxMCNqBOObwd02aBiqR7bmV FWUsPkjP5uGTj4LW68sBPjbNWqVFTWmqquryIbEgCy12BOXao2bWcz5+JqGMDMWtmK 9O3MJUTcjso/P0VB8YsEhV1ofs6joMzNKP6KmzAxt5sJcS+pTGzSK6ckZmjfExqBYB KwcUkybusoU8/4CHjwyd/BKd4LSSSnAs3mwgLn0JIEntYhhOjEkapnvv6fjpnUPkXh 8VrKKeSgu2+Sg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 07/12] selftests: mptcp: sockopt: add TCP_INQ test option Date: Sat, 25 Jul 2026 20:42:28 +0800 Message-ID: <3aa51e285b2386b41f6653967382ae2a222e4959.1784981974.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 b131a18eca79..b09e906e7bd2 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -30,6 +30,7 @@ static int pf =3D AF_INET; static int proto_tx =3D IPPROTO_MPTCP; static int proto_rx =3D IPPROTO_MPTCP; +static bool inq; =20 #ifndef IPPROTO_MPTCP #define IPPROTO_MPTCP 262 @@ -142,6 +143,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 @@ -280,7 +282,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); @@ -294,6 +296,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; @@ -739,6 +744,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); @@ -746,6 +759,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 Sat Jul 25 18:01:21 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 AEFFC2DB7AE for ; Sat, 25 Jul 2026 12:43:24 +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=1784983405; cv=none; b=YOxxlISQ+WlaT6lVlJLjjp/wTr+TvbxgIbdLliTxvgxWxF7uvf7cMlmFZGEQzevLCAuciwEEBAk04/qWnw3ZaXfxWWm+PwDiieqzl57ncmOvCoVQOYbjYxlVE5PZgjwbfNgR3+b6dVJvvf53Izo9i8lZPzr0mBk0N5yFumX7nGM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784983405; c=relaxed/simple; bh=7zMTWkq5RzfHB0mXxsR3NbSnvqKwIj7W6DTII9VtNpg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ih+o9KWMR6uSebAnd95UyLsKL90oyN3g9GEw5cDvKmNeKwsWFGV6I2xkPLgD57kcAPKKFto537CRQvcewTMAUv8IeL73ub3L1JSgDY+h3/kw7uo7jUc22FDtBm6a/F+VBAWGYsggbG4oiCG9Ha+1HY0rWz1E2rllX+Q2eVDqXYA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bCEPFgbx; 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="bCEPFgbx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F2A61F00A3A; Sat, 25 Jul 2026 12:43:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784983404; bh=+oI5qCxW0iZli1000ui6NYYNDlSCJHfT2+U3t2I85BQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bCEPFgbxBWKWsIYgxI0Uf/X4lyQiXHoH09U+Bf/RVywF+q3Xz3CYL3A+56y6eayWY RYg/ryJ0Nxw388q57wC8MK8eV16JtShS1YUpVEkTR2vWtfytGLhOMS4uNqoRuEyQH0 pVr5PDE1VqSj7KMJAN/oUs6gannJQFTEPgYaU5BSHg1wOtCjQ7PUj+BTI23oMqBop9 7gLfiroCbhGZJ2VFIhzcLSnehuNGAppOZ60msz6WPzAbb0bZPdUCzSAuQ++wRPxNu/ mxctG64iNezmKchzzVwBefDoKjT3tW9+r6zmdcHeXi9zIATYLkjqe47dZ891Pe27IZ 6ymEMq9JdMngw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 08/12] selftests: mptcp: sockopt: use unix socket instead of pipe Date: Sat, 25 Jul 2026 20:42:29 +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 b09e906e7bd2..d79f3d069112 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 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; @@ -634,9 +634,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 @@ -689,7 +689,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]; @@ -699,7 +699,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)); @@ -765,7 +765,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 @@ -781,13 +781,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; @@ -831,7 +831,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 @@ -850,7 +850,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; } @@ -906,35 +906,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 Sat Jul 25 18:01:21 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 D16892D238F for ; Sat, 25 Jul 2026 12:43:25 +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=1784983407; cv=none; b=cyPdzBXfY4yMahOgHaPRVHK+W+OGK8wPb0QLAKwlfzzpK2gMH/GctAyQRwqeEVlc0CQEBoI+f7DN+ovmrocKbuepy2QOX9rensyILo1Eo7WxRlOlVz5XNNLk9u2sTCjeutd6iWcnYzJmVZ6dN0AW6VsO0uhhwsOsZVmocrT/Sv0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784983407; c=relaxed/simple; bh=lHwUe98UEAQkXCocp2zBez4eR+De00BE1EqjUXVpkNY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dnVrisjVRclgm4pvV3iJ1sxNHIniPPvxucTAtbxiAABbuN3yAYP/Irksne8XGxS2oCSaCvV1XZxJghDu8pnuAhHiAoI0S5r36nmUfj7ZW8RkcADTLWcILIziipkcSnbkdBxlqYhiICM3LZXQTvwIe8aNSoEtYEUjmFXohNCAD4E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XRmUJDLq; 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="XRmUJDLq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D34A61F000E9; Sat, 25 Jul 2026 12:43:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784983405; bh=dvsT4AyOBA1/1nKE55Kd9SPf+h57b0QhDwN0O8muciw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XRmUJDLqjpnJSpLg+LMyX7HGPgwtV10K4LkdMcKxeDBrYayJeSzwVyU8Wj+mAO8ni ijmfyWZmlIvPIfWxmV57whCXagdwTuRyXrueLcI84LDOugvwid5NPWc5p+QJZsjBrr Uy216UgQeUyvoXwPWagEM6laiA+rraXRVrNbl47k/iNkIDzGeP+/4+7uMNhOJpRQ6J pmAayVDHdn76fsCYhLdFdy7i5DXB8u34wiLtKMK8bNwJ0m9n1oLKO8tP8eP/6FgVAg KQf4J5OQK48S/TTc4ua/PEqVqp25+Mqg4QSoyxghx72OTM5uzsMBF9CAOq3rvHqTmM 0GC+R5L+gglTw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 09/12] selftests: mptcp: sockopt: use recvmsg instead of read Date: Sat, 25 Jul 2026 20:42:30 +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 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 d79f3d069112..cee6992445ff 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -689,36 +689,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 Sat Jul 25 18:01:21 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 92A212D238F for ; Sat, 25 Jul 2026 12:43:27 +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=1784983409; cv=none; b=fY+yTMYvn192th10xz3sMzrc0qkklKOvNX8Fql/9hInuPAdwsHTBJ87uJYwuYvNmyCRnmGQ1+gLccor2uUqHCFhF1Wo+XHA317mt4iXkX6/F+vLu00ZcAZNitjgM5p+c/EIcr+0o9WAczGJhz+FWsKSLtcOcQH3QaUM0AEJh7cg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784983409; c=relaxed/simple; bh=O/C9DP3+pk8NIM+Nihg/hJ1uQNgvpWs7TAy+hCDfmcE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Or80hRkXCu5SwU3nXBBIn9deUhUKhqhyvq4oUjrgcNaWsPfpVUX8PGZWP+9ROw7EYgoGXcQeQDs0E6D4IfItFN4Iaez1AjzE6zLwgqwdAMe4aO9MtUmZiTeh01wEwiTAa9BdLicWKvdIkJTFvpJB6CzN/wkhSim8BVHIKBCOAQw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=X1MSho3f; 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="X1MSho3f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 369421F00A3A; Sat, 25 Jul 2026 12:43:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784983407; bh=3qZKKRf9MB7fZUlthsD0GanRklkfuKrhAsLkxlQy/lA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=X1MSho3ftggoF7iAVWtJtkl7TriqhFvkqUxlNgaSGXg4cRTIW+OLuw0gUkJGPaiQY U8zn9E43nuiZQHoJewEi1WFW21yW4uOAcMbsNSl7nMad1q1eA7O94DPLUb+0/Wh9BX tG3kUHO0pdMyJNf1/6pJXD+Bvvu8MjWeC0Nz4UjcmYGrtr3nvv2d6jX8VxgJ3yFjE0 g8u1Se9cT99cBnyVQPvXcnjnXOFKNukfW8sXBfBLTf/Q7484x3TlqlHznTjoGDxWnM /gf5pYn6PJo3G4VhBByqIqlZu3xKpDw0P2pu+L5UTLExDrbG5vuQQvheZTfYP4rzG5 5y0dPZsIzTFrA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 10/12] selftests: mptcp: sockopt: get and verify TCP_INQ Date: Sat, 25 Jul 2026 20:42:31 +0800 Message-ID: <893df8ccc9e07a6e894900d2353287ba6202d2f8.1784981974.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 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 cee6992445ff..f244034f637c 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 @@ -636,10 +637,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"); @@ -677,6 +680,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, @@ -717,9 +721,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; @@ -732,16 +757,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); @@ -759,6 +825,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 Sat Jul 25 18:01:21 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 EACCA2DB7AE for ; Sat, 25 Jul 2026 12:43:28 +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=1784983410; cv=none; b=WUwBsyX6nNLD/kk3Kr/m24NWdvikHxIvZC7VylEZ2uZ9uUyGBNYBzB8k+nqpIub1HRyF5xFeIHscjfR80NWzpl/JS3jmfj6Ij/ejC9oTJM7Pizlp3RXGwqxDNONgqDIKj571P1iavklhX347LixA+8qzQCVLC1PjQSPwkLiThFg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784983410; c=relaxed/simple; bh=dnUuMpVvrcpKDv7K7LZ5eCcYFY+6VKzxOZPKjQ/HkMg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u8MUbi3qP/VOfNvPq5qVtgC6GRe0UnXtUgBf3Viw9dayLLJkFxGtYZvsMNLuuG/ylqowH5awMAvKIChq1lnsoFXEqQNAIDOx0Oukp2NAs6vz5cODWQgSiDUnzfnaJg9cpJAgWqL+tQbxSj1SGvIP+TYSfih6AUPEAcqiE2W4izI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Dyjwm+7a; 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="Dyjwm+7a" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8E911F00A3F; Sat, 25 Jul 2026 12:43:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784983408; bh=+aj5jJv741sWhf0cvQxEXFP3LrsIVzPgEfuBUlS2poQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Dyjwm+7aQ9ttr7BYMDQvy9j8j9BouJTtNqbLa7bIKwCFMQdktfyTw8i1ews6nAope rO3jtCUR4+KAFOmd9aIIvrfhXZwVeblgX1So9i9laRret/Grzlz75OInsRtHBLGadN rQp0HJo/1f7ZkyejEUb3tgpathLVfNmQR4YGF7hqgcx8Of2kbJwqoZmvw2tA/eSeOW +UsFps1oITvWSyeJct3RRXxc36unUXjvyd50QJb3DKra33R+9i2Yqw8L9Qm4y8EVyg f1yklR617OWKI2C+EKLhA3n+BIyacK0aqi2a0cj0ktZYF6HRCJXfWNrgzR0C72gW36 LlJla7E6MKSdg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 11/12] selftests: mptcp: sockopt: add huge data transfer tests Date: Sat, 25 Jul 2026 20:42:32 +0800 Message-ID: <2f7c057fea07890934533413bd5e9fe288522ff3.1784981974.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 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 f244034f637c..d14c7e064c49 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; @@ -610,6 +612,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]; @@ -679,6 +770,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); } @@ -740,6 +835,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; @@ -820,6 +988,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 Sat Jul 25 18:01:21 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 D23512D3733 for ; Sat, 25 Jul 2026 12:43:29 +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=1784983411; cv=none; b=I8acEXavYGrMqUUmz73OiGXFOEDgAUnmD5+TzI8GTxZBxa8H9Lh1RcseIZBKXRRlj6JirJ5qdEAr8by76kQo7H4c29s1r0Z36surz2wo9/AaMqzM1d7k2O2EjO5ASJX8uMelXqWhg8BquWLP+AXPgWjdMI+qT124E3ydXGM9ts0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784983411; c=relaxed/simple; bh=davJKfqwFimkolEUfNpeKWCrS9Rq7pqt3dECx1AXij0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RQKJMIbn14qCCa9kxq5hoRj9soograaC3aki0AuxE4Y/TJlo5yqKBOSUK2LAc2db+27Z8giNfijJm1bcmUPq9+Mea4K9kyccvXGMfqF9rmNgOJvfxegWjErgKKlFSA7nM7hhGV3EvsnPn8I5cRmII329DRVasNoQwJZfvj2F2nc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=D0QmJHxX; 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="D0QmJHxX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0DDC1F000E9; Sat, 25 Jul 2026 12:43:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784983409; bh=ldIVz/66ucoc/dYa9TXv1iVoC+LHiG88H8RV5q/XyRg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=D0QmJHxXZJVrOxs/TQRESH8KE0ptDCogDfH+WA3WqEQAd28JTuP8XMElVcPNu9h0R Hsjy22NMxHEjkTQN7b5Df0wECE9txN2zzwI9KScCbv3Mmf9XYWxZD0qlxA9c5OYsaZ y2uucgzi1+3vulM6pfBdYTvAfMU3yuyWhXDWnxaQsB8EaUsgFqmvBN7oAp7M9rKUXC 1DJk6LtFor5+Re/J99pUBhLf9p0d4QctFTXs1f5n164L0CdIZzZYAIbA7ZDeGksuZu B5tT4na1SOvL3DqmT6rBXjBIhy6/yV7sJQ1HX1hSmwhCF8w6XnE89Yo1DKrT0eJN9f jydpXR99sy79g== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v12 12/12] selftests: mptcp: sockopt: replace mptcp_inq with sockopt Date: Sat, 25 Jul 2026 20:42:33 +0800 Message-ID: <0c01d51609fec392e8e9c2ee19a3c13581aa2f2d.1784981974.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 22ba0da2adb8..fa80e6448728 100644 --- a/tools/testing/selftests/net/mptcp/Makefile +++ b/tools/testing/selftests/net/mptcp/Makefile @@ -22,7 +22,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