From nobody Mon Feb 9 09:32:27 2026 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 7FD75324B20; Thu, 29 Jan 2026 19:24:03 +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=1769714643; cv=none; b=lgMzwTJlSyAlB3YgrG+ccFzyAPMXrXH4bf7itUPomlXCAtA+uaV82JHbltxViIM2TY0Fb99WuK7AKhf+0E4LAz5O79x8cx5rnGXB7JtsVwOh0nSCsAfm/1pTkdNwaFmhYehvO/Q+kO+Ml960+UO/FeByriBykTTpvyQoyphgL58= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769714643; c=relaxed/simple; bh=5Dh23pg4rmx3pdbZnLnTYRE9W6G0tlsmGnODKbU5NA4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HBZx0D4TDW161BSPdCl09wgyoRghzSy0dRHVSIvHAv9MsDA9BeGBOIPz7GoHCl5LXJXNm242T9KeDW5hxl1s9NQwakm0OGKL/FkxuHPlXY5l7QY7LWCnQcSBAwM37u8B/13uZW7tECfJBMx7CEO4zK7rZxfWVn90PFcbbgNRQ48= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bFZBf/wJ; 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="bFZBf/wJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C0C5C16AAE; Thu, 29 Jan 2026 19:24:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769714643; bh=5Dh23pg4rmx3pdbZnLnTYRE9W6G0tlsmGnODKbU5NA4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=bFZBf/wJ8hri4UyRUcvsyJFZLO9JtXx8lFUzwdiPm4MiUVySbe3GmXwXj4oZL+4mY np9CuiKNL2Khhtp1rBJ6EzL/IgmH5GRbAmlP49ksXCmJq0FGJc44Nq5WXPP2IW8xLb GLn+zCnoX1UObVcuO1veEaBuJ6CbNXX98kWQqEDq+bCpf9HewDp/n2+nwpxm2Hyq// 2dMhF34domOta3t6Hq9mmIEO4fZKYGYRl7mIVI3tlVmbl722GmfrfuVAPQaC5oXQ9k FMuXW8MZRLfkS9W2wUsYI0DMg3Cv9TlZwx1O1Tt2F2l9f7QVe7VXZFr++CrmCLxGZG KaPjuGWIoTqew== From: "Matthieu Baerts (NGI0)" Date: Thu, 29 Jan 2026 20:23:37 +0100 Subject: [PATCH net-next 4/6] mptcp: implement .splice_read Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260129-net-next-mptcp-splice-v1-4-994cac40daa0@kernel.org> References: <20260129-net-next-mptcp-splice-v1-0-994cac40daa0@kernel.org> In-Reply-To: <20260129-net-next-mptcp-splice-v1-0-994cac40daa0@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern , Shuah Khan Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "Matthieu Baerts (NGI0)" , Geliang Tang X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4175; i=matttbe@kernel.org; h=from:subject:message-id; bh=IWSUQH5+FB7+9xbI11VudN0EMrz/ck/e9lZJTN2typA=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDKrNx+uy0l4dGtBV2z1vZUVgocebukX37XZ5ry1WltLz KqLT1wudZSyMIhxMciKKbJIt0Xmz3xexVvi5WcBM4eVCWQIAxenAEykR5jhn7LZdVGJFTXtbXyp W26vX+Wl9WpzAwPbzx+HLm0u/mtT3sHwV/r8CbHt959ueDw1WcTz3tT0R6wB9873akTVbDxuYbu dgQsA X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Geliang Tang This patch implements .splice_read interface of mptcp struct proto_ops as mptcp_splice_read() with reference to tcp_splice_read(). Corresponding to __tcp_splice_read(), __mptcp_splice_read() is defined, invoking mptcp_read_sock() instead of tcp_read_sock(). mptcp_splice_read() is almost the same as tcp_splice_read(), except for sock_rps_record_flow(). Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/protocol.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 114 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index c58e306ec3ef..3aee29f70954 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4396,6 +4396,118 @@ static int mptcp_read_sock(struct sock *sk, read_de= scriptor_t *desc, return __mptcp_read_sock(sk, desc, recv_actor, false); } =20 +static int __mptcp_splice_read(struct sock *sk, struct tcp_splice_state *t= ss) +{ + /* Store TCP splice context information in read_descriptor_t. */ + read_descriptor_t rd_desc =3D { + .arg.data =3D tss, + .count =3D tss->len, + }; + + return mptcp_read_sock(sk, &rd_desc, tcp_splice_data_recv); +} + +/** + * mptcp_splice_read - splice data from MPTCP socket to a pipe + * @sock: socket to splice from + * @ppos: position (not valid) + * @pipe: pipe to splice to + * @len: number of bytes to splice + * @flags: splice modifier flags + * + * Description: + * Will read pages from given socket and fill them into a pipe. + * + **/ +static ssize_t mptcp_splice_read(struct socket *sock, loff_t *ppos, + struct pipe_inode_info *pipe, size_t len, + unsigned int flags) +{ + struct tcp_splice_state tss =3D { + .pipe =3D pipe, + .len =3D len, + .flags =3D flags, + }; + struct sock *sk =3D sock->sk; + ssize_t spliced =3D 0; + int ret =3D 0; + long timeo; + + /* + * We can't seek on a socket input + */ + if (unlikely(*ppos)) + return -ESPIPE; + + lock_sock(sk); + + mptcp_rps_record_subflows(mptcp_sk(sk)); + + timeo =3D sock_rcvtimeo(sk, sock->file->f_flags & O_NONBLOCK); + while (tss.len) { + ret =3D __mptcp_splice_read(sk, &tss); + if (ret < 0) { + break; + } else if (!ret) { + if (spliced) + break; + if (sock_flag(sk, SOCK_DONE)) + break; + if (sk->sk_err) { + ret =3D sock_error(sk); + break; + } + if (sk->sk_shutdown & RCV_SHUTDOWN) + break; + if (sk->sk_state =3D=3D TCP_CLOSE) { + /* + * This occurs when user tries to read + * from never connected socket. + */ + ret =3D -ENOTCONN; + break; + } + if (!timeo) { + ret =3D -EAGAIN; + break; + } + /* if __mptcp_splice_read() got nothing while we have + * an skb in receive queue, we do not want to loop. + * This might happen with URG data. + */ + if (!skb_queue_empty(&sk->sk_receive_queue)) + break; + ret =3D sk_wait_data(sk, &timeo, NULL); + if (ret < 0) + break; + if (signal_pending(current)) { + ret =3D sock_intr_errno(timeo); + break; + } + continue; + } + tss.len -=3D ret; + spliced +=3D ret; + + if (!tss.len || !timeo) + break; + release_sock(sk); + lock_sock(sk); + + if (sk->sk_err || sk->sk_state =3D=3D TCP_CLOSE || + (sk->sk_shutdown & RCV_SHUTDOWN) || + signal_pending(current)) + break; + } + + release_sock(sk); + + if (spliced) + return spliced; + + return ret; +} + static const struct proto_ops mptcp_stream_ops =3D { .family =3D PF_INET, .owner =3D THIS_MODULE, @@ -4417,6 +4529,7 @@ static const struct proto_ops mptcp_stream_ops =3D { .mmap =3D sock_no_mmap, .set_rcvlowat =3D mptcp_set_rcvlowat, .read_sock =3D mptcp_read_sock, + .splice_read =3D mptcp_splice_read, }; =20 static struct inet_protosw mptcp_protosw =3D { @@ -4522,6 +4635,7 @@ static const struct proto_ops mptcp_v6_stream_ops =3D= { #endif .set_rcvlowat =3D mptcp_set_rcvlowat, .read_sock =3D mptcp_read_sock, + .splice_read =3D mptcp_splice_read, }; =20 static struct proto mptcp_v6_prot; --=20 2.51.0