From nobody Thu Nov 27 14:02:37 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 867DB34575A for ; Wed, 19 Nov 2025 10:05:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763546745; cv=none; b=Tq5Gxklo+9df3JHxmv/QmakCecPXix56BcPJqIRhgm2CuDy9yNWuJhjDdcYvYEl3vztLM9g0RupeQXX2rGAruu9R0dZ2gCmIMrOobr9pT0lPOjssS/YTEJQsuIawW8nbukP0wxAIV4y8USze0lD0CeePhmYhrsH6VYyl3oOm03Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763546745; c=relaxed/simple; bh=J86OKn5xH0aCyfgFj2LrEaddfYLxe76BkBFI2DuoDYM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cafhs0Ud/EhmYjW6sOCtYTjS7oZKO+a/Ued5N2QzYDDIsMevtCWZaetf9oMjBWo8F4biXq9ukH825mnPNcEIgTcodIo1CtOGC0uf9XyLjqw1ht0CSsQrqfzzvqGdS8MouDaDm0bmXnmJ1jpJEuUJHJcGX1SPcPERfz0hxLWooPY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uUR6k3Ay; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="uUR6k3Ay" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D229C19422; Wed, 19 Nov 2025 10:05:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763546745; bh=J86OKn5xH0aCyfgFj2LrEaddfYLxe76BkBFI2DuoDYM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uUR6k3Ay7p+WEIRPOYjuDnCXft+LfBvqmAy5qMCIYW4satqMId3DxHFBfHX1XWarV p8HkFS+dnaaEKdsDow5UlDryyblEBjn/nZBlb2i47iqvl+7oSiCv3iEccCo796z5Bk 8+PAa77o6HnkxeZiYqdWumK10Yn9J4I/y0udf87pGUry4wAOIsyXPGUCR4+BN2O494 2R/XgssptYyj6S3I/6NDPbJMko/mG7/4SttaBOJHb/t+IgNAGD/fomgPzGxJsdqbTp p4Hg+64pEV00zhMhJseg+0tztGZfaEczQvVawAwJh+m/3psdfwDbpt8lJAt8Y+gXrN XiBT7L4SepUEA== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org, hare@suse.com Cc: Geliang Tang Subject: [RFC mptcp-next v2 7/8] selftests: mptcp: sockopt: skip mptcp getsockopt for tcp tests Date: Wed, 19 Nov 2025 18:05:06 +0800 Message-ID: X-Mailer: git-send-email 2.51.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 Skip mptcp getsockopt checks during tcp tests since MPTCP socket options are not available for them. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index e4752f848f08..59c07eda12cd 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -384,7 +384,7 @@ static void do_getsockopt_mptcp_info(struct so_state *s= , int fd, size_t w) ret =3D getsockopt(fd, SOL_MPTCP, MPTCP_INFO, &i, &olen); =20 if (ret < 0) - die_perror("getsockopt MPTCP_INFO"); + return; =20 s->pkt_stats_avail =3D olen >=3D sizeof(i); =20 @@ -415,7 +415,7 @@ static void do_getsockopt_tcp_info(struct so_state *s, = int fd, size_t r, size_t =20 ret =3D getsockopt(fd, SOL_MPTCP, MPTCP_TCPINFO, &ti, &olen); if (ret < 0) - xerror("getsockopt MPTCP_TCPINFO (tries %d, %m)"); + return; =20 assert(olen <=3D sizeof(ti)); assert(ti.d.size_kernel > 0); @@ -470,7 +470,7 @@ static void do_getsockopt_subflow_addrs(struct so_state= *s, int fd) =20 ret =3D getsockopt(fd, SOL_MPTCP, MPTCP_SUBFLOW_ADDRS, &addrs, &olen); if (ret < 0) - die_perror("getsockopt MPTCP_SUBFLOW_ADDRS"); + return; =20 assert(olen <=3D sizeof(addrs)); assert(addrs.d.size_kernel > 0); @@ -540,13 +540,8 @@ static void do_getsockopt_mptcp_full_info(struct so_st= ate *s, int fd) olen =3D data_size; =20 ret =3D getsockopt(fd, SOL_MPTCP, MPTCP_FULL_INFO, &mfi, &olen); - if (ret < 0) { - if (errno =3D=3D EOPNOTSUPP) { - perror("MPTCP_FULL_INFO test skipped"); - return; - } - xerror("getsockopt MPTCP_FULL_INFO"); - } + if (ret < 0) + return; =20 assert(olen <=3D data_size); assert(mfi.size_tcpinfo_kernel > 0); @@ -650,7 +645,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 (s.mptcpi_rcv_delta) + assert(s.mptcpi_rcv_delta =3D=3D (uint64_t)total); close(fd); } =20 @@ -685,7 +681,8 @@ 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) + if (s.mptcpi_rcv_delta && + 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)); =20 --=20 2.51.0