From nobody Sat Jul 25 07:27:13 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 4FDF8314D06 for ; Mon, 13 Jul 2026 03:25:49 +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=1783913150; cv=none; b=alCQmmJ2iXERWLS7U2LP+EQSLvReJz1f7MWaIZCEiC7G+ZrT+G2wuN5dSGFW7JVxq5YngIoqe4NsLt9jFVGiCsBL9F8IeRPJGL/ymfS27/gG6IzXDJ785HWqRYTYu5mQsVnvz7nGNdfPLfHaBGP10pEzoCI+RGYH0+DIUOHbjqo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783913150; c=relaxed/simple; bh=r/iZBjr9j4falp+c+F8ZiqsszqQHQ2ZM1C1E1ek5gFA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sR5c5qjFu9cmC96cP9fVtWgYVXOgOiQhmlomPHglfQzHNJqSDF9B+7U8xgq4y9I0aw/lz1HFAk+SDyYCInxJY8F+1ou2OY7QK5afxMeyVfu9BDgRVJt8NwSE7hL7VaL+wGVpzkNTtvscCoEla5+dHHxsx+t2aAHYId/qmYnBzz8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=L7ZjblRr; 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="L7ZjblRr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DE6901F00A3A; Mon, 13 Jul 2026 03:25:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783913149; bh=vN9QUt0K3Ohrp+2UiVzxxGuyjGPwnF946W0GNQhwUY8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=L7ZjblRrNslSE9BMwo8kRj08Wr8Til+kGaKbMXxagYG14CvZTZS4ndYrdIcqRW37h BUROaaGPRST7VdYKL7TsVVRY8T/87lctYn5bVr4x1Z25LvqY8GLyUg95Eg58FS4u3X hOe4N9baAsXc5uLxVSFBlwmei1/vNXUAWEXagFgc3lfgFppZ97esOrOtyVJwR/CpeD 7q+MgL0kN1na7/XGfuThwnd9R6XRDwyXwaFJ03P7fIQbTA9q03jcZZw8tnk2ZnB7Ml orfUnZ8kT7GxN/YsJOADu5j26LbZiZJVklC8L3IPWiv5/cibfzatGAm4bZpkLDAl8V +cr4K3VZr9REw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 01/12] selftests: mptcp: sockopt: validate bytes_acked against sent bytes Date: Mon, 13 Jul 2026 11:25: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 mptcpi_bytes_acked tracks the number of bytes sent and acknowledged, so it should be compared with the amount of data written (ret2), not the amount read (ret). This corrects a logical error in the test validation. Fixes: b86418beade1 ("selftests: mptcp: sockopt: fix error messages") Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 6 +++--- 1 file changed, 3 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..d4ad03ed64ef 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -683,11 +683,11 @@ static void process_one_client(int fd, int pipefd) ", 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) + if (s.last_sample.mptcpi_bytes_acked !=3D ret2) xerror("mptcpi_bytes_acked %" PRIu64 ", expect %" PRIu64 ", diff %" PRId64, - s.last_sample.mptcpi_bytes_acked, ret, - s.last_sample.mptcpi_bytes_acked - ret); + s.last_sample.mptcpi_bytes_acked, ret2, + s.last_sample.mptcpi_bytes_acked - ret2); } =20 close(fd); --=20 2.53.0 From nobody Sat Jul 25 07:27:13 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 32BF231691A for ; Mon, 13 Jul 2026 03:25:51 +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=1783913152; cv=none; b=stbIADH5zqhUtlaAe2JwmssewHJ7/TmoJBoXr6fuLVhDCQB7J0x6ecXOzP+ljiGiw7L1jiPx1moRPSoJLU3oSRs5cyXwGPY+JiEDFEOGN5goK8RpvmqquHqyII3EXY8BlDphS72JAB3oFEKJIN2e+bdYqqA6oFTB1My3iu8yifk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783913152; c=relaxed/simple; bh=DAfLqgvxTWKwYHelPPJglYTF4Tpd2Gp8qe70KI+SlIs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NkXMtBohWqsh+RaAlOmPRDSSyTYHwJtGTnR2ppJxfXis9VoFwwx90me3hSS8l95sAyT5tXGKUCyuRWMd3KXObBefoEzCzFauikkEN93Tc8BSqFwehThZs6vLbpLCuzwjRtgE+ZkPCgbMAHun1dWciOdaGEe/vCE2cRUHfAAicPk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ms3GPDEc; 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="ms3GPDEc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9EDC41F000E9; Mon, 13 Jul 2026 03:25:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783913151; bh=FTtbw7o/KO8T79rV33JtAhR7yx6gOyY8IdmiNn2GcvQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ms3GPDEc3b7+EzW+5/JPELnYoS5Rj7TSUEBv/2yftJkV9cA+Ka5qpkr0HGRPfOgs9 92Qex5tBksAk5tLSItd6fDY/6+BdBLv4m1zx2EaXFFbhOvrRxfu1GeFgx5ZsY9IwI5 rvuDU1XgdS/tCdomS9gZbN3R1ttKLStduMlkJMcaXE7XzicKjvn2DwUvUDHqOeF0V4 G2wFkMoAwtyvBxI/CLQcrmrea86Ib91MXASwXbFbW2OybUZ9TaFTmsanylCwVvbga1 0lubLW6V5FuNVwa4yEh79RAVY70eORmbNWo6uJPzivmv6NefmS0ByIGsf1ALqLBkFA tVcNzozcpomfQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 02/12] selftests: mptcp: sockopt: use r/w for byte counts Date: Mon, 13 Jul 2026 11:25:26 +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 ret/ret2/ret3 with r (received) and w (sent) for readability. This prepares for future updates where r will be modified via '+=3D'. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 43 ++++++++++--------- 1 file changed, 23 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 d4ad03ed64ef..941af179867e 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -638,7 +638,7 @@ static void connect_one_server(int fd, int pipefd) =20 static void process_one_client(int fd, int pipefd) { - ssize_t ret, ret2, ret3; + ssize_t ret, r, w; struct so_state s; char buf[4096]; =20 @@ -651,43 +651,46 @@ 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 %lu", ret); + r +=3D ret; =20 - do_getsockopts(&s, fd, ret, ret2); - if (s.mptcpi_rcv_delta !=3D (uint64_t)ret + 1) + do_getsockopts(&s, fd, r, w); + if (s.mptcpi_rcv_delta !=3D (uint64_t)r + 1) /* +1 for FIN */ xerror("mptcpi_rcv_delta %" PRIu64 ", expect %" PRIu64 ", diff %" PRId64, - s.mptcpi_rcv_delta, ret + 1, s.mptcpi_rcv_delta - (ret + 1)); + s.mptcpi_rcv_delta, r + 1, s.mptcpi_rcv_delta - (r + 1)); =20 /* be nice when running on top of older kernel */ if (s.pkt_stats_avail) { - if (s.last_sample.mptcpi_bytes_sent !=3D ret2) + if (s.last_sample.mptcpi_bytes_sent !=3D w) 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) + s.last_sample.mptcpi_bytes_sent, w, + s.last_sample.mptcpi_bytes_sent - w); + if (s.last_sample.mptcpi_bytes_received !=3D r) 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 ret2) + s.last_sample.mptcpi_bytes_received, r, + s.last_sample.mptcpi_bytes_received - r); + if (s.last_sample.mptcpi_bytes_acked !=3D w) xerror("mptcpi_bytes_acked %" PRIu64 ", expect %" PRIu64 ", diff %" PRId64, - s.last_sample.mptcpi_bytes_acked, ret2, - s.last_sample.mptcpi_bytes_acked - ret2); + s.last_sample.mptcpi_bytes_acked, w, + s.last_sample.mptcpi_bytes_acked - w); } =20 close(fd); --=20 2.53.0 From nobody Sat Jul 25 07:27:13 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 A67A73164D8 for ; Mon, 13 Jul 2026 03:25: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=1783913154; cv=none; b=cYijLfMhrURWnC33wFgW6xiO093DsQ1RzpfuN6kb0ktOf2uld2fC08vQaDY/5RnQQXiPAkkg/+MEekTs7f9vnqRqILm1H6y+9LHfnJhIujIHRJXtvX+j2jFAo8WuKnjY7lfR6Is4XhEUrz47KV0G+BvXSxFqh4aXihjzaZeLmTY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783913154; c=relaxed/simple; bh=gdqdyDMEC0LwQ7Xn9XWFtOSJ+xl8tX/6YkHMSO7zZuw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Nslkk5lb7MKPJ3vZFSRJvA13cxkvCJNuUGnbrf/CtayQjx8TUol9oZp9TOGzrlWezPdHtnlIfp/ZtVK+GBBpY0q0pQsvo3pvWV3OFCE1aqzh679lqMbb3vaqzw4PDbEa9PhTDb8tR+KDua1hdER7oQJb+OGGZOxgH9gZmkpQvY8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=L6xCotKw; 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="L6xCotKw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC7141F00A3A; Mon, 13 Jul 2026 03:25:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783913153; bh=EVNQEdWaEc+19+FWypIlzPbWRFSj8sLzCR08vuaHHDQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=L6xCotKwpLWq7Qg4PtRg/gqGAsYVFHFDbGxL0Dt3PXxU4LtOM/cmw2gi4uYTIu4Ch Qq16IwfBhjbbkbqua89SQO+tXkx3NHNL9SCPe9bFQY3B7j1XfZMRUkg+T+XAzsfrOQ SjPSPxi+Hmwokp4qEn921pL0+parGJEx19WKB484zk8LmRD42n4merrH7+veCNYjGF JyQERteXRN63BpsTFaTseigGeOUMvbH1oEe+nbYc0QnmmaF9r5yJ8R6k2UytICLUDV 5ZJoMswGuo3D7A3OdDLKHHTlJBlxLFLKxekD8n8knrHkrVTUC2XjfGoloAZrDt7mss IOpEGpEefds6w== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 03/12] selftests: mptcp: sockopt: replace /dev/urandom with getrandom Date: Mon, 13 Jul 2026 11:25:27 +0800 Message-ID: <2897025f4df37c36a355d8bad2fa4a356247a76a.1783913010.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 /dev/urandom with getrandom() for initializing the RNG. This simplifies the code and avoids potential failures from opening device files while maintaining cryptographic quality randomness. These codes are from mptcp_inq.c. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 20 +++++++------------ 1 file changed, 7 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 941af179867e..9442ed5239f1 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 @@ -824,21 +825,14 @@ static int rcheck(int wstatus, const char *what) =20 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; - - /* can't fail */ - ret =3D read(fd, &foo, sizeof(foo)); - assert(ret =3D=3D sizeof(foo)); - - close(fd); - srand(foo); - } else { - srand(time(NULL)); + if (getrandom(&foo, sizeof(foo), 0) =3D=3D -1) { + perror("getrandom"); + exit(1); } + + srand(foo); } =20 int main(int argc, char *argv[]) --=20 2.53.0 From nobody Sat Jul 25 07:27:13 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 93671314B9A for ; Mon, 13 Jul 2026 03:25:55 +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=1783913156; cv=none; b=CZhXojQK+/5v353x4RGaoUdxfDLLS94l8QDWXWzu2M0SMbETLTjnoWhR0WHF9IYr0m2aPg+f0+BqwTQIsJSceiP3tn/fZzI3Eu+awZmr4MqvF7D7JXr7L4UrEMbf/vD8sOLpoCqRSaBj6Z3H1LJ5eEcm+IKDSDu8NMEDc0OkLas= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783913156; c=relaxed/simple; bh=uLZWDFpgUmEb3Q9tFYiKlW2M6/MEJLDpsrb162F+xhs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NpIFPzFDdNVh7rzx5aCfcl5mGsqEuSfyF4Ft0XSW9o3Ut9Rzmg3iPX13a1kC5K7xL448ZpP0T/QcB7NpbXE+jOG7+AiUzbd2Y0FU/hWuA+5XxSLAjBHS299HlP4CtFp1PoU9O7sc9QWLQnDZ2DrifKW9SdYr0OKO1/XMc0sVgPM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=R2hXZ903; 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="R2hXZ903" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E5E31F000E9; Mon, 13 Jul 2026 03:25:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783913155; bh=FRlD9u3xqfH6T9iE1IaEdI6IpP3KHKBxM4iClCQMrVY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=R2hXZ903YgjPkJObQY5yxiEJKJp1N7UvayB/2zwMupWlOh7QOZYC0P1JKcC6VH/1F PFiWzNbiiuMIPEA3gNmc9RFgPaEG9HHbV8Os7LnABAb33SogQl1nGgiZMPMrS0GSoS rS9WKRtnJ7ww2UTciW5jIB4wflhpTEeyO54Mqw/UyR2/T1nLZH4rZaWzRCkDzoHm3K z45ReehOKBy+iEEj59ANS/iqQ89RTUElCHydIs8l09Gn/gDSGUeY2Q54d5GiYBO+MH 30Po0hYvpMd+k1edWhAbGzvHZxQbhyM2J6ENiD7WoH0UY2t8ZRFF2vJU4iX0tb6tNl EUhXEcdKOl6+Q== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 04/12] selftests: mptcp: sockopt: reseed RNG after fork Date: Mon, 13 Jul 2026 11:25:28 +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. 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 9442ed5239f1..8781dfd50ba0 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -129,6 +129,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); @@ -803,6 +805,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 07:27:13 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 DA7973148D9 for ; Mon, 13 Jul 2026 03:25:56 +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=1783913158; cv=none; b=TDMuIjAUk1L0ZIqKXutfwreeugkigB+sb0oHJXMOV5IzBFUhiaSH3aygtrBPSQ0Qze9yKC13MtahdM5ex/1U3v6Qp2+kzWv6W5r5aUaRvC57Ss/KvsS+9B20w990K04rV1m+lP2m881ESn4AKV6KodXc0ot8y0w1+5wCIoRlvxk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783913158; c=relaxed/simple; bh=4awVUK1Xkm+H+Ktpf52m8XoxGTGoEL7QvelIxCmsQIE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IxB9nkCuYixN2BBj102ufb6a2/0iediaPDoBdz7mDxx7xMoQ+JFBPQmLWmWV7RAdZdjdPKYh1GlLxUPUvFXivqwckDfubmnrTsvUUt2bUyLZap7z6cNPAgkXnBwsukyhFWsnjBnA07u5a7r42Mq4jF1GpHrfQ6CE4PoCIdhu/mE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CusQXfi+; 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="CusQXfi+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DFEF61F00A3A; Mon, 13 Jul 2026 03:25:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783913156; bh=J1MDITCjlc0JLil0q013vmYlB/pgNsTdi5ySY2xWSK0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CusQXfi+WIAmDHbsZWPjWJw20dU/mGle65RmVmjKG+bdZxtaXGev3Fus5eXi4BCnW RtVnHX1kxG6u840G0gIj3Fk9bvuUtS65qSMvJXUE1FeExhENE5P6q9xy4ondZb7SEt udi5EBxNlk9BcFfK1s2rfK038z1EgYKkMi7i74P29D71jGY9FjVn6jOI9LbSQIwEPf iCSXHH0umjJ4KE3ujbOBw34FGBZqogAbcimnsV0TS7BTQhytH94M8+nMO1zUU04SzV BcMDOGYcjdExrPO4cUQOih77obhG65R+9hJ2uXCcO/6DQBPxetgmBL9rvYcM90288u L1cgySww9dOvA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 05/12] selftests: mptcp: sockopt: add tx/rx protocol options Date: Mon, 13 Jul 2026 11:25:29 +0800 Message-ID: <90ef5682b66ef639ee2bb1041724410a6d1e581c.1783913010.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 -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. Enhance compatibility with TCP tests by skipping MPTCP getsockopt checks during TCP tests since MPTCP socket options are not available. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 37 ++++++++++++++++--- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 8781dfd50ba0..5e0392fdf0e4 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -29,6 +29,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 @@ -140,6 +142,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 @@ -205,7 +208,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 @@ -263,11 +266,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); @@ -275,6 +289,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; @@ -560,6 +580,9 @@ static void do_getsockopt_mptcp_full_info(struct so_sta= te *s, int fd) =20 static void do_getsockopts(struct so_state *s, int fd, size_t r, size_t w) { + if (proto_tx !=3D IPPROTO_MPTCP || proto_rx !=3D IPPROTO_MPTCP) + return; + do_getsockopt_mptcp_info(s, fd, w); =20 do_getsockopt_tcp_info(s, fd, r, w); @@ -635,7 +658,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 (proto_tx =3D=3D IPPROTO_MPTCP && proto_rx =3D=3D IPPROTO_MPTCP) + assert(s.mptcpi_rcv_delta =3D=3D (uint64_t)total); close(fd); } =20 @@ -673,7 +697,8 @@ static void process_one_client(int fd, int pipefd) r +=3D ret; =20 do_getsockopts(&s, fd, r, w); - if (s.mptcpi_rcv_delta !=3D (uint64_t)r + 1) /* +1 for FIN */ + if (proto_tx =3D=3D IPPROTO_MPTCP && proto_rx =3D=3D IPPROTO_MPTCP && + s.mptcpi_rcv_delta !=3D (uint64_t)r + 1) /* +1 for FIN */ xerror("mptcpi_rcv_delta %" PRIu64 ", expect %" PRIu64 ", diff %" PRId64, s.mptcpi_rcv_delta, r + 1, s.mptcpi_rcv_delta - (r + 1)); =20 @@ -783,10 +808,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 07:27:13 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 8BE2E314B9A for ; Mon, 13 Jul 2026 03:25:58 +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=1783913159; cv=none; b=Qw1v1RK72rOWBv8CK/pTC9UyEnJl8YkEZyFPdBMjXPQBiB13j+wP1dSxOj/Noon+Zpl2KxNF8Fe0+jIF5dQ63+VJ+C0HlfvkVRNzM0c+7sXeKa+GRov8ZWuSCXFZN+qAzQGIC9W39//BwQ/b3b/qazBQns7IH4o0WO3isPmfH6c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783913159; c=relaxed/simple; bh=wvYxkoXBtG/Jbq8dqCH8wGG+eUglq4YD5pIsApsCOu4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=phKwZwW+Mz+L+MVHRprwRv7dIjH1ARu8RLP7hk61un0q++ubMjcJ7+uGlkU6coUVudsCUyvIDR3oEz6oA0qO7qf6CB8eQci/cCkLGIsM6N2QfCOSST3FdX1Szdh/poz/G+ur2lJP0TzYvYADLzmKzZUbxcOvyHbGOHpLm98IsYs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dDy+7MAj; 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="dDy+7MAj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51EE61F000E9; Mon, 13 Jul 2026 03:25:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783913158; bh=sWARq10Hm6eLkwVkMLWENcKfZGI8n5t7L0+/2yCXwjE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dDy+7MAjkMn6X9xJ88wIqUGnO+FfTYB81UuPebM0Fd+fdC+PQQXBOG7Aq1/fOCVV7 NDUQzvGMYbEEkG8YjkYqXw5ikfUHyT+FheJNgxbJeTVb4YAN8MTXj5/T5UuTBnQfPr ZeW84TxruGN93ddzWz+sQWC2XBoim+yczA8N6Cgb0+ZC5BV6HGUrfbKdSgX0CFUDdd y45XVtYZw6uNtnP5FJrZcNsaaTb0ytpiIStAmyDeWg+XqTUIYD3m4ASg+kmcjdQRBt PrHFn6JGPPTKUOWGN5yFRhih8Bj15ODL0yeRZMYlYsTf2iBhb4u/eroNSWfrYL239E XODlr3w/j1FWQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 06/12] selftests: mptcp: sockopt: add TCP_INQ test option Date: Mon, 13 Jul 2026 11:25: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 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 5e0392fdf0e4..5c9a63ed6703 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -31,6 +31,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 @@ -143,6 +144,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 @@ -281,7 +283,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); @@ -295,6 +297,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; @@ -724,6 +729,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); @@ -731,6 +744,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 07:27:13 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 D4686314B9A for ; Mon, 13 Jul 2026 03:25:59 +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=1783913160; cv=none; b=JvEPP3CDzCg5d/oKOdtMPZA5scffE39vJTxArFJbFwzBkp4EdZKFr6GZqYx7OgEelhz7ye8O0DcoVIR55iDPy+HuiaM7GNDqvhFl9MW5uDT5mUPk2lXbtNh2wJPZmMrMHM8YTpilmSwPbYHmlfFmwSBNFEP5DuEozxviSMUeRAk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783913160; c=relaxed/simple; bh=5rAYe1P//CzlRtIgjwmBEjpHiExJ3Aq48A6bDKb/VrQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UPNEdqA6TUoLQUUfYj5KQMq/uRtj1Pp7i4nOTj+w2Oe32IUiyO3kD0r09efelm7jwmT7a/CryC/nM1C68j2qAaJNnSdYIftGqaOl+3k/oifibDBc7zDcdml+FfQu/4LLnD7/Ff7DV3x07skbIhPhBjPwf7g0V9EBull4E/wh0TY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kYjWHXcq; 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="kYjWHXcq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B9A3B1F00A3A; Mon, 13 Jul 2026 03:25:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783913159; bh=E7pYQsF7wRGzdyZoF4JYNXE7YsNbstPbbewyB5z2iUA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kYjWHXcqhUaYPD652weprCOhd+5UhmprwKBq6Hyfja5RXGR1E1+MhTudIHxOsHqFE YwvT4pHrpxZ+JYbD1Hl8If3YyOrXhoMgBIKk7+4JlGlQBXQjLR1clmxsdGyyNFgKAu MlcTLyTy+onzXPDBTXEIGjhz9ypR8ttcHAXw4Ag1z/0/5nlMFmVtiCKMss2go4N2BQ 2pSObj0rkunBxmALBgxHuS4oM72duURf50wsPKpamk4WJZG8sxlEnArmGebbD8RBOq 9Wv8pdCsC+tGN5co/vzKufqVevUVefFfgPFmDO3A2H5k4X4ySci8NptvKAHxRuhvjZ TuQTOyh6Cwxgw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 07/12] selftests: mptcp: sockopt: use unix socket instead of pipe Date: Mon, 13 Jul 2026 11:25:31 +0800 Message-ID: <064cf238b25b454f129c9f72fbb78b11b3ab3e08.1783913010.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 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 5c9a63ed6703..c7605ce5b9e1 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -598,7 +598,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; @@ -623,9 +623,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 @@ -668,7 +668,7 @@ static void connect_one_server(int fd, int pipefd) close(fd); } =20 -static void process_one_client(int fd, int pipefd) +static void process_one_client(int fd, int unixfd) { ssize_t ret, r, w; struct so_state s; @@ -677,7 +677,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)); @@ -750,7 +750,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 @@ -766,13 +766,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; @@ -816,7 +816,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 @@ -835,7 +835,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; } @@ -884,35 +884,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 07:27:13 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 2B0B5314A60 for ; Mon, 13 Jul 2026 03:26:01 +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=1783913162; cv=none; b=muJCUFtTXyW+Vcjvsz03+gd6dzQedEsguK8Nhe1jotfjv6D202mxvsfJ9kZrRhqlmXGpk3Q/oCIM5o3SKcUcM/nyQsga20m5U8dDrcc0NAbO+/qfWPSjcKp7MAxKImylY47sqz6SpfEsGcB2kxSu1XbGkP8T5WBFPStNbRusFS4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783913162; c=relaxed/simple; bh=1VfAFgKbH3/Em9MBox/+sypeIvwiCtg9G3Cdl/kDSJE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mBZXSwJS3PZaR5dV3rgpEFZa8UwWvr2Ygmw73+XvtXxC4sBQEUC6vzpziyaJu5GaGPrjLrxV9Yw2SbS/voGw4fhdzWBfraO48DIaIkJl81/XFGql80eAWJfRQkhm3Uk4ACgP0Ubl03J0C7Yy2+dV3Rg5jh2MnhHiDoxjOlFvLL0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=S5lrp65r; 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="S5lrp65r" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1822D1F000E9; Mon, 13 Jul 2026 03:25:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783913161; bh=yZHv4R7YE/DBCm+C8WkqLRRdsNTz/0MTVT3TiWForTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=S5lrp65rVqnQ9LLbUpXKkQVnrcKnP95NMEJq4ss+v/Q1UAq/StNSGynn+lQFSY5I+ lRZ7SCeGANPQxEMQ77YaOPkpATfglwKFf7XdHws5aKaebuoaZ8+1J3lbhg4nXliZGI iq+o7LdpmLzvFcc/F+7nokKrEV6nf6AsF+iEjrg4HtRRJSXnmOjE1KorqxeYTTgWBN mryikUxT2ufBQvTZ4i/DeHQ4YOQgmSOxCzuGnvN7eWIjZ/y6756SYEc7NCRhqRHjV1 baplHuvBS04F6VJ88ELjYHCzX2sm/AzkPbwSRyzGXOSTbsbC2QBqHZ7t1S2lBpMv5y iZ5UaN88wMC4g== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 08/12] selftests: mptcp: sockopt: use recvmsg instead of read Date: Mon, 13 Jul 2026 11:25:32 +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 c7605ce5b9e1..9a8b60512f0b 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -668,11 +668,41 @@ static void connect_one_server(int fd, int unixfd) close(fd); } =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) { ssize_t ret, r, w; struct so_state s; - char buf[4096]; + struct inq_msg m; + + inq_msg_init(&m, 1); =20 memset(&s, 0, sizeof(s)); do_getsockopts(&s, fd, 0, 0); @@ -680,23 +710,31 @@ static void process_one_client(int fd, int unixfd) 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 %lu", ret); r +=3D ret; --=20 2.53.0 From nobody Sat Jul 25 07:27:13 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 C755831715A for ; Mon, 13 Jul 2026 03:26:02 +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=1783913163; cv=none; b=iTfYziBIbmEkRGTjYzgwTTBKZLtmbIePp8hOxy6TPyMHE0XN0Wl5sv4zoLYLQojMN3hiAK/Epds6ba84CxI7EEhcqKvHm2K11R1HL/+/cF7VmKc8ZMCKF/gEdnmiZVUOffQbwqnPGLJ+lpMEb5fCn9MtLYV6h5HzWtiirxtUda0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783913163; c=relaxed/simple; bh=QoqKXbemCwi8A0CaldJ1rRxMaa9Qma2R4YQoUQOtCYQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cWdyHZDK8G39mRZEke30pYYfzSAEnRCqVESiTuVJJabkYJ7N7z9VUSFg2M3mWCAfa0gikD7yynd3sP/S78o9U39kQrOoXcYEeQ9fXO7DbrTwrDO/QZHGHYi2mKaOqKESs7AUNKBw7nafbwj11RQZBad38AtXjq+4NDCsrxIKF/8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PoDV720o; 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="PoDV720o" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FABE1F00A3A; Mon, 13 Jul 2026 03:26:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783913162; bh=9uDDnXc6/OcJkBmk8OyibhGoPv0GFXCaNHt108Mw8wc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PoDV720o5ONuPjfmHkr6a9MEdgGw9ctonYSW0eijdb9qCqFS/8/MRx2vSxgOfk3n1 hLor5Qf6bZQ8qM7MsyiUv+CN35tVbY+dEoyn9fWPRy8DOha74reeKL+z0jeeyGFPQZ zwpFtR4R4GCGKXmH18Ssf+6xvl46383IECzvSn8OANCkQppqF4GjZLCk9P7j5g+yJv x1kFUapBQWDC9cMKqnALheeRMqIXclcnen1c5qFbHvaah3TuaJNnJi6slAHnWanfjG IROJ9HivEYw+0w8PIBZN/8C/BKCdLSne1trLpXcw6GwNKZoWLkBsTWFcjrm82zRkac rsf+FSl+ld92w== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 09/12] selftests: mptcp: sockopt: read exact payload length Date: Mon, 13 Jul 2026 11:25:33 +0800 Message-ID: <079fd762433db0f6559df88a9725e300f06349ab.1783913010.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. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_sockopt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 9a8b60512f0b..2540516fccee 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -638,7 +638,7 @@ static void connect_one_server(int fd, int unixfd) =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) { --=20 2.53.0 From nobody Sat Jul 25 07:27:13 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 B82A0314A86 for ; Mon, 13 Jul 2026 03:26:04 +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=1783913165; cv=none; b=K9WoZjt0J71ZX6dxEBufPvzb2PZKS/pU84QgKUVmmUKjauVuPtbO6gevkjI91oeiS6TukgwwOhNPM1ZLyjjs/S48u8bouodTaOmvSgol2+U0dBD2WR05Wfn7wtFJTcdPo4lYTSPBmO4HGNs4V9k31yOdGjKeQ8U6j9gFkR6h4LM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783913165; c=relaxed/simple; bh=gTWr4jPMb35j1q02i8QXgX+hyGCCjDLi2DRdAxF5ELA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KsZhLRLq7eCwvIkYb70sceADYsJNXzU8LVrgT7x42C2GiCw/arRewqkrkYMyoJniWW7c42b2YtHL5WyLrfg/GgOVAdv6hdOGmXzi662oQAS11aAsvlF0rOmx5wJOgFapfnHjcRvOErPrcEfzS9bTuazGLG5jJyPWYfjOK1RFl5w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=L/vt+FOb; 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="L/vt+FOb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 613E91F000E9; Mon, 13 Jul 2026 03:26:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783913164; bh=eDAPUFlDWN0uYTqvgKRFNx5Kw1crICTqnOJwgfZE7qk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=L/vt+FObdB6X1fUtewsAjoODXeXCI4H+4yOsWFFncdQkKXIZ8/vG4PjwfwfxTLdia Xvf2ZIiC0kR2pCwpYpqO7Oj3M9D8B/kmzbjsWeS55UcgzovmsRzezpr3Pd+d2Rj9aC UOf9oXA/nMdE1Pf7ZVLRCT3JTW1D6x35g+IWs7A6HDKO7vIYuhNdBPAZr0wtqfoOqz LJyVoX6YghOVdWq5PXwypBh+bKJCAtbxaaQdH3a4zLicpu1s1NDIHt8iFQwn44L/vO LJWQP3NNbn8Xi5skmA1FyrHS45soiIFHDelrP4v3eA66bCOe+a4HcL4SIJ3Ya1+4JS GmRlngE5kNR9w== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 10/12] selftests: mptcp: sockopt: get and verify TCP_INQ Date: Mon, 13 Jul 2026 11:25:34 +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 2540516fccee..eed6e2b548be 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -21,6 +21,7 @@ #include #include #include +#include =20 #include #include @@ -625,10 +626,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"); @@ -666,6 +669,7 @@ static void connect_one_server(int fd, int unixfd) if (proto_tx =3D=3D IPPROTO_MPTCP && proto_rx =3D=3D IPPROTO_MPTCP) assert(s.mptcpi_rcv_delta =3D=3D (uint64_t)total); close(fd); + close(unixfd); } =20 struct inq_msg { @@ -696,10 +700,31 @@ static void inq_msg_reset(struct inq_msg *m, size_t i= ov_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: %u", + 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; ssize_t ret, r, w; struct so_state s; + size_t expect_len; struct inq_msg m; =20 inq_msg_init(&m, 1); @@ -710,16 +735,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); @@ -737,6 +803,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 %lu", 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 07:27:13 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 9B631314A60 for ; Mon, 13 Jul 2026 03:26:06 +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=1783913167; cv=none; b=GsWxQbgXzTqo5uHIW/Tvj0Zp+s39HMCScf0aUcZHvm589zSd895Y1yEv/hS+MvFIHBxnooKkMUOGBtHaeoOOWgxgUrLKRMfw+x/r76R5T/dOe9I/vIdKQwreXUMGOHfDKkp7FM5a6JWEhxs7FJpxtG6HYta82CLA54XXDJ7NbBc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783913167; c=relaxed/simple; bh=4B5pbeEuh6aWzWKWYCy2LnX0LkPW3tvS52XnhKQ+928=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VCnmmLxy4FHbTHQ5obW+flV9WrwQHAj27cBiSKAkpwUz5Y4/F+8KDQvREOo1EpqndUTpt4/SB61Ob1nZ8VEIUh/l71WRkgbfDDwJgrKNrn8a5SPORwDkfP3vvnoYWa4HA0+EJqpG9NNTV5vzwR+AW4Lmvn8+HNTTFG4EjaoSbgM= 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+pH0rAF; 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+pH0rAF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1AF9F1F00A3A; Mon, 13 Jul 2026 03:26:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783913166; bh=aHaMmJ+mTw5PTnnQ/VAGNJ2QPPRlL3fyrEgBW9O0jU4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=P+pH0rAFgcIFMF4mnPPeHMcEOi1eyi70Ss0D4iSpyvJoAjmWlwVhAz6c4tyqZnYhs 8FEVo7iO8rs0IeLDH8kLgRlqN4+eMhpDPd9oCmy4dtjX2gbQf4R+uULJV/M9G1OzGj YTV7xaB7bsfe13snkJket6KuIBpKgQkubXtDZnJjOcYBw9Vu/WQ/aJzY2km9eNx9gt 7iKJ9+/KCflgwGtjXRvIw9eyoUtpR5QRwhCel0JNnlNSYIc40yPvQ6opoLv1e07FxR 4NOKRJCL1zF9CLNUJePr9UovFYroFU4Vqmq7Z60la9AlN6zxg/c1M7OZwWlbnjWENZ mBZIIaX//V4sg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 11/12] selftests: mptcp: sockopt: add huge data transfer tests Date: Mon, 13 Jul 2026 11:25:35 +0800 Message-ID: <7438a373fb2145612cd6605c684b5f1028678411.1783913010.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. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 162 ++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index eed6e2b548be..61547d70576b 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -27,6 +27,7 @@ #include =20 #include +#include #include =20 static int pf =3D AF_INET; @@ -599,6 +600,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 len) +{ + char buf[4096], buf2[4]; + size_t 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, 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); + 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]; @@ -668,6 +758,10 @@ static void connect_one_server(int fd, int unixfd) =20 if (proto_tx =3D=3D IPPROTO_MPTCP && proto_rx =3D=3D IPPROTO_MPTCP) assert(s.mptcpi_rcv_delta =3D=3D (uint64_t)total); + + if (inq) + server_huge_transfer(fd, unixfd, len); + close(fd); close(unixfd); } @@ -719,6 +813,71 @@ 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) +{ + 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 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); + + 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; @@ -798,6 +957,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 07:27:13 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 47D41314A60 for ; Mon, 13 Jul 2026 03:26:08 +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=1783913169; cv=none; b=rxyWOiuSuFyeGOka3VBId4rGh4EPQWpkS5gdBoQZCypOUBui6vPh+wgwh+TGePAagNrymUpMQDGfN0pK7ZdzttGH+D2JBiWoDWn0XttnEki96ee9HhtY+rQTawzeay4NpmRJlRshj5CIwnSqkjTUgM2oJ4tVnpeI3f3VQreDV7g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783913169; c=relaxed/simple; bh=2bwW6ciRIH3COpsPHrszcvWHu356hB6/G9ZwJy+7FNo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h3T2rlMvVa8uMWVZqIttp8xm+MR10TrOUqX+YsL/0RnkR1NkxjhE1FuFpv0tV3mkcDjuRl4Mg/6LFTMwaYrI6cEjFYwDnpA4rC8oy9IhBzN2B74uIZzyxK097/EdCh4/oBbGYNTDdQWjPEvtqVMmsa8urZ1WWl+prnpYIgZScGE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Bt0snNAv; 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="Bt0snNAv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E87E1F000E9; Mon, 13 Jul 2026 03:26:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783913168; bh=WsSuguUvTthLy/VyB8nBwxFIykuODS47uLsaIaG/41w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Bt0snNAvfHbYp6XIqjrbryr7/M8Vvd2OwambNDbbfhZu+N04VmqQ4Ap3VOu6mzTGg RO63lPI83Qipub/ko8GiQnQ8+IvOLzC4bS6K44qnQef0Dj46cwEUWjI/aLRx/H3Bst N+J6F3gy+CJjRLQ1wzmj6XYSIGhrN2GpyFq4j+dTYq9oEb7YlXwmPG/ddeV4FzAqSe 53rN5qUZkAx07l+6qgOEEXvcNj8PpTwGsHIADcOIiF/7M3BLbH4yadgEiHKsrCdl6A K7K17gCJcmc7kklYJuAMvVglHy6dpCRsYJNt+kBs7VHBKASd8QL71JCvIHBflL/JIn uAN/jlkUm2TFQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v9 12/12] selftests: mptcp: sockopt: replace mptcp_inq with sockopt Date: Mon, 13 Jul 2026 11:25:36 +0800 Message-ID: <2e0c487371172409cb19814521d9bb0cc2a18f75.1783913010.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 9e47ecfe58e2..d5fab4d26de7 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