From nobody Wed Sep 17 19:40:15 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 5BCC328B7F0 for ; Thu, 10 Jul 2025 08:16:36 +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=1752135398; cv=none; b=e3swKOhyLWlV70URfBREqAcKF9GaR++3ar0N9cY6HTGHtVCvoP10uAgy/mDzsUQCuZf5N2NJVq34ZmUK7jD+EG6KZzZr782Uo+cIqE4Obm6kqKYSskq9HaR/OqGU7NJ77YHp2QKb2Iat9h0omGza0/E5IEZ6g/+gHjGU7JcJnT8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752135398; c=relaxed/simple; bh=CGslljLzAvM/HLym40XR1WPdzZKX5/7eNIIC+UalimE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=braH2+JckkSOqD///Kp8W2VK/2FedEu/6fzqhlRy+12ay2n46XoF7N1fZGHTdBsKYt0BpNbdkBoyGcfHxwYItPmaTvdsqgubqoA7+6HQnsOiOrcOl9CVeGM92DisXM/U528fJCuyC2ovvwMXLtzJT1d0QHMf2RB6WQ6XDdPtErg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HIuDK/CP; 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="HIuDK/CP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E66D6C4CEE3; Thu, 10 Jul 2025 08:16:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752135396; bh=CGslljLzAvM/HLym40XR1WPdzZKX5/7eNIIC+UalimE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HIuDK/CPS9jaL0+p/3SUo+ziLb0uC6Mn/S5HnghrkCAv9vDV6nq2gxVqXi3WMrv9x ynehIZ98uWjWtVHVkHoWUOgqHeevGNYqvKfxm7uokqsV/gy2WMJ/b3e3l/FXePOF1P mjzklbOJhpQXZLV6aFCeBoYJOQHRr7px3+fGFE4W2ekpU6N+2tQsV+nJ/HTYYha78L JB7fnrIPfE1n6vLJ5u+V4MraOkTL8ld9KKXAWt/V0QVMuVc6qpbiEYy6ZptK6SlHWm JEZhGnm4Hp+ghKI/A1ADt8D2Rg2G/WgE8Wb+qafQyUBsvnWPfo65JxqU4L+YFfOVgW sAdBKxk12pwMw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 1/2] Squash to "mptcp: add recv_should_stop helper" Date: Thu, 10 Jul 2025 16:16:27 +0800 Message-ID: <8197ea3a696dd67809410ff1b12584db9b1e95b3.1752135065.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.48.1 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 Drop "shutdown" parameter of mptcp_recv_should_stop. Use mptcp_recv_should_stop for "if (copied)" case too. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 6b3be1d0668d..32ca63a0825a 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2090,20 +2090,13 @@ static unsigned int mptcp_inq_hint(const struct soc= k *sk) return 0; } =20 -static int mptcp_recv_should_stop(struct sock *sk, long timeo, int *shutdo= wn) +static int mptcp_recv_should_stop(struct sock *sk, long timeo) { if (sk->sk_err) return sock_error(sk); =20 - if (sk->sk_shutdown & RCV_SHUTDOWN) { - *shutdown =3D 1; - /* race breaker: the shutdown could be after the - * previous receive queue check - */ - if (__mptcp_move_skbs(sk)) - *shutdown =3D 0; - return 0; - } + if (sk->sk_shutdown & RCV_SHUTDOWN) + return -ESHUTDOWN; =20 if (sk->sk_state =3D=3D TCP_CLOSE) return -ENOTCONN; @@ -2123,7 +2116,6 @@ static int mptcp_recvmsg(struct sock *sk, struct msgh= dr *msg, size_t len, struct mptcp_sock *msk =3D mptcp_sk(sk); struct scm_timestamping_internal tss; int copied =3D 0, cmsg_flags =3D 0; - int shutdown =3D -1; int target; long timeo; =20 @@ -2166,19 +2158,22 @@ static int mptcp_recvmsg(struct sock *sk, struct ms= ghdr *msg, size_t len, if (copied >=3D target) break; =20 - if (copied) { - if (sk->sk_err || - sk->sk_state =3D=3D TCP_CLOSE || - (sk->sk_shutdown & RCV_SHUTDOWN) || - !timeo || - signal_pending(current)) + err =3D mptcp_recv_should_stop(sk, timeo); + if (err < 0) { + if (copied) break; - } else { - copied =3D mptcp_recv_should_stop(sk, timeo, &shutdown); - if (copied < 0 || shutdown =3D=3D 1) + + if (err =3D=3D -ESHUTDOWN) { + /* race breaker: the shutdown could be after the + * previous receive queue check + */ + if (__mptcp_move_skbs(sk)) + continue; break; - if (shutdown =3D=3D 0) - continue; + } + + copied =3D err; + break; } =20 pr_debug("block timeout %ld\n", timeo); --=20 2.48.1