From nobody Wed Sep 17 18:16:51 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 675AE1A3142 for ; Sat, 5 Jul 2025 11:17:50 +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=1751714270; cv=none; b=Cy+TBCN/5BEoV568JVf6FASROExjkbNv0IEL9U0iTgwO5gh1YArDnEgDKk6kuoPfZMegXQM4ss0nrY4Ry9cwI8ZplnL1+kAUfYNuWlGBdRVGOS6j9CulgtagEG6lMDAX8OY8mvCKJsnFGY75Nvxq86F+IuqqiVvynS/B7lNev+A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751714270; c=relaxed/simple; bh=WY9Ic8bt/AuSNg8fPez0SnXlt2PD17skEModuyxe3+A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pCm3IUkPWua4a1zihrkouyUakkj35wV1+rBxPy/XbfcZALMz0eEgnSJ9Z+bPb29AuloX/neu3XUWwErmj2yUlG0g9MkYjFTAyuwAQHIN2W11sbQp+a/NowoDLXjnDXAw1bqGOGCkZeJLixTjR2xur9oWMJ6tIX5KFFJLSdgYv84= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BJJ+/aFf; 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="BJJ+/aFf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B65CBC4CEED; Sat, 5 Jul 2025 11:17:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751714269; bh=WY9Ic8bt/AuSNg8fPez0SnXlt2PD17skEModuyxe3+A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BJJ+/aFfh+oOjtjs4EjfuebZLhvakfa0Yh5LJQTt9NNbIkF5L65IDpFSgJbchYeYq XL7o8uoGglMkr+Pppmc7HBEmXkejSC2oIzEFw5jJq13GPbvs5BfljczbEg48osQLF+ IUPQuNA4kwO0rtMRuJrMmcf/2u2c94iAJk5FY6PlpTlLfQp8Tl5mDC1di+S0C4UZBx roGo+MZwlkBYAtu9GzF4fimaryJ7HomlWuHfokJEunIkKi+OLT/A1xXsDP5izLqrYS hOG1t67jBo51yWcXffkejIztnQgniITr6lpWLMqSq4jIW6wC0fbmFDiCPAv2cyqOvD eoXj8X0ISSfAA== From: Geliang Tang To: mptcp@lists.linux.dev, pabeni@redhat.com, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v6 1/4] mptcp: use sk_eat_skb in recvmsg_mskq Date: Sat, 5 Jul 2025 19:17:39 +0800 Message-ID: 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 This patch uses sk_eat_skb() helper in __mptcp_recvmsg_mskq() instead of open-coding it. Reviewed-by: Paolo Abeni Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 0c93b36373b1..d1e5f72a9d6a 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1891,8 +1891,7 @@ static int __mptcp_recvmsg_mskq(struct sock *sk, skb->destructor =3D NULL; atomic_sub(skb->truesize, &sk->sk_rmem_alloc); sk_mem_uncharge(sk, skb->truesize); - __skb_unlink(skb, &sk->sk_receive_queue); - __kfree_skb(skb); + sk_eat_skb(sk, skb); msk->bytes_consumed +=3D count; } =20 --=20 2.48.1 From nobody Wed Sep 17 18:16:51 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 CB6401A3142 for ; Sat, 5 Jul 2025 11:17:51 +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=1751714271; cv=none; b=uSlDo5RnjmU3lyDQWKmGNLIRP/zpLO3xzuYrwRlmGP9HoLUzcBPH80KGMROncoKEMZtcWlLf47lqeFEaxMypjMtbma3vb3Um7aFW8DFaUuYXWmaNRzaaVfRJRFvMTBhZ9XyxsC2LFrXVb9Ih67GevfX2NiRbFwVvWqcfurb46jo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751714271; c=relaxed/simple; bh=Pgx/Nua0LJOHCsmctJe/HQduKGLc+j6spESnB10SWiE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RlT9p8yYjEUJw2wOvPi+l0R9KY7qL8V6gNgcKSBCtQoEIWY/eaiPqc2Wr8t9GEl7DZCQGVaBzg/TF/oxFkQpMaEaq3C+ObqjZTQ2MRA7Bf5xemA5VHZdCiX0UfXlE0flWagl0bInzxodQCO1e0w6PQJnMPfL7sXW6CRs/R7HHvQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Y+uiSXDM; 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="Y+uiSXDM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73E76C4CEE7; Sat, 5 Jul 2025 11:17:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751714271; bh=Pgx/Nua0LJOHCsmctJe/HQduKGLc+j6spESnB10SWiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y+uiSXDMO6jjz7sbsSo4EaPvmGkcIY6h75A+VvSGg1OQOIdyEoY0URZzNXkFR622U AM7eub/HPSreICjIWUEvNOfVV62+COKtS1ojsQAXf3cndIFtMHSZiUR6Ro7zUPo0xN YvHzzglR6aeH6Hs85YmjareigADzsImKIb2vTBoibuXw4s8AWWrpEK5XzIddODqIu2 PCgGY+tiekF2t/UkAyxcoEERgBuqGdMDtDyelNPFsxSu0beJUL2eesCUAHoJCYYHYO CohQ7z4OqmatIxv5TOOB1zl1Fq5KIuBjPdFPfxCxXU+zYeqzjQDqDcaClqtN+6C8cz qPfx+e8UbBhiw== From: Geliang Tang To: mptcp@lists.linux.dev, pabeni@redhat.com, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v6 2/4] mptcp: implement .read_sock Date: Sat, 5 Jul 2025 19:17:40 +0800 Message-ID: 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 nvme_tcp_try_recv() needs to call .read_sock interface of struct proto_ops, but it is not implemented in MPTCP. This patch implements it with reference to __mptcp_recvmsg_mskq(). v2: - first check the sk_state (Matt), but not look for the end of the end of a connection like TCP in __tcp_read_sock(): if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN) break; This will cause a use-after-free error: BUG: KASAN: slab-use-after-free in mptcp_read_sock. v3: - Use sk->sk_rcvbuf instead of INT_MAX as the max len. v4: - invoke __mptcp_move_skbs. Reviewed-by: Hannes Reinecke Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index d1e5f72a9d6a..7d58bb3f9fa3 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3957,6 +3957,72 @@ static __poll_t mptcp_poll(struct file *file, struct= socket *sock, return mask; } =20 +static int mptcp_recv_skb(struct sock *sk) +{ + if (skb_queue_empty(&sk->sk_receive_queue)) + __mptcp_move_skbs(sk); + + return 0; +} + +/* + * Note: + * - It is assumed that the socket was locked by the caller. + */ +static int mptcp_read_sock(struct sock *sk, read_descriptor_t *desc, + sk_read_actor_t recv_actor) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + size_t len =3D sk->sk_rcvbuf; + struct sk_buff *skb, *tmp; + int copied =3D 0; + + if (sk->sk_state =3D=3D TCP_LISTEN) + return -ENOTCONN; + skb_queue_walk_safe(&sk->sk_receive_queue, skb, tmp) { + u32 offset =3D MPTCP_SKB_CB(skb)->offset; + u32 data_len =3D skb->len - offset; + u32 size =3D min_t(size_t, len - copied, data_len); + int count; + + count =3D recv_actor(desc, skb, offset, size); + if (count <=3D 0) { + if (!copied) + copied =3D count; + break; + } + + copied +=3D count; + msk->bytes_consumed +=3D count; + + if (count < data_len) { + MPTCP_SKB_CB(skb)->offset +=3D count; + MPTCP_SKB_CB(skb)->map_seq +=3D count; + break; + } + + /* avoid the indirect call, we know the destructor is sock_wfree */ + skb->destructor =3D NULL; + atomic_sub(skb->truesize, &sk->sk_rmem_alloc); + sk_mem_uncharge(sk, skb->truesize); + sk_eat_skb(sk, skb); + + mptcp_recv_skb(sk); + + if (copied >=3D len) + break; + } + + mptcp_rcv_space_adjust(msk, copied); + + if (copied > 0) { + mptcp_recv_skb(sk); + mptcp_cleanup_rbuf(msk, copied); + } + + return copied; +} + static const struct proto_ops mptcp_stream_ops =3D { .family =3D PF_INET, .owner =3D THIS_MODULE, @@ -3977,6 +4043,7 @@ static const struct proto_ops mptcp_stream_ops =3D { .recvmsg =3D inet_recvmsg, .mmap =3D sock_no_mmap, .set_rcvlowat =3D mptcp_set_rcvlowat, + .read_sock =3D mptcp_read_sock, }; =20 static struct inet_protosw mptcp_protosw =3D { @@ -4081,6 +4148,7 @@ static const struct proto_ops mptcp_v6_stream_ops =3D= { .compat_ioctl =3D inet6_compat_ioctl, #endif .set_rcvlowat =3D mptcp_set_rcvlowat, + .read_sock =3D mptcp_read_sock, }; =20 static struct proto mptcp_v6_prot; --=20 2.48.1 From nobody Wed Sep 17 18:16:51 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 BE66F1A3142 for ; Sat, 5 Jul 2025 11:17:53 +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=1751714274; cv=none; b=bR8ZwAdBnh+OHEmwbNSZ5s8sqi1Wt/KwCpbjtOXyaS8FO7toVT8bm2AtpcpYOvAZJdfxAnAvrYnecNymI6mk5qP35Ai5G/Yb7E5mnn9NQmfZRZgmzKnEkVOlFO5jQV9IWHvWOC5Wf0Hnuseljh0GKTRFdiY6aV1qPB0C1onNZPQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751714274; c=relaxed/simple; bh=hRCUEhN08EMVpMX4kydKoNPiApXRv+3k63TEoFppVQs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tjm3edHat+4+/tb/4Kg13ulNZwOKpBMn6dic37GOHit7ks4BZ99eSuCtnQnzoGPuqsdz3F5XApa+rszeYazz/aApWfBMU7mEe90+dsr4Fgo0PoQLNwEhX+fDGaSW+5U7U8UPmmoPRWrrQpXopxjGtcfddrrbsPxGfPSuq3c1Imc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gh9aUNei; 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="gh9aUNei" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B597C4CEED; Sat, 5 Jul 2025 11:17:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751714273; bh=hRCUEhN08EMVpMX4kydKoNPiApXRv+3k63TEoFppVQs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gh9aUNeiLR3Ohjk59R8RbgN65iEUzYKvYBw3z96SLrVm7I7LYxycwRY3BAe3pTsAv 2CNQVkJKMrX0jNQY6jtmYaTONBvHoCK4oObrHMR6TwPLCVWFFeCCrrGQ2QMT/OosqA xizDVhBo3Ju+ffEtV+Q30J/04A++8kmrOHC0vP6+S4mMwM3IzKdk7oyC4FUOOn+3gq 5nj6244uUEfIJL8GMi8KcTKYI3YD0au2f1z52+OWML2TMzwiGYZ/Yuv207pmmVA5Li ZX5RLInLSUEZb2T3Vx+ZFJ5JLKk31qvMacSjpmCG44tsmrJUDePlh03673jjKLFRTx ksxRdXeTDpOmw== From: Geliang Tang To: mptcp@lists.linux.dev, pabeni@redhat.com, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v6 3/4] mptcp: implement .splice_read Date: Sat, 5 Jul 2025 19:17:41 +0800 Message-ID: <6ff0966262c7da64718a61dcb514829099c59e04.1751714072.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 This patch implements .splice_read interface of mptcp struct proto_ops as mptcp_splice_read() with reference to tcp_splice_read(). Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 136 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 7d58bb3f9fa3..327281ba5629 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4023,6 +4023,140 @@ static int mptcp_read_sock(struct sock *sk, read_de= scriptor_t *desc, return copied; } =20 +/* + * MPTCP splice context + */ +struct mptcp_splice_state { + struct pipe_inode_info *pipe; + size_t len; + unsigned int flags; +}; + +static int mptcp_splice_data_recv(read_descriptor_t *rd_desc, struct sk_bu= ff *skb, + unsigned int offset, size_t len) +{ + struct mptcp_splice_state *mss =3D rd_desc->arg.data; + int ret; + + ret =3D skb_splice_bits(skb, skb->sk, offset, mss->pipe, + min(rd_desc->count, len), mss->flags); + if (ret > 0) + rd_desc->count -=3D ret; + return ret; +} + +static int __mptcp_splice_read(struct sock *sk, struct mptcp_splice_state = *mss) +{ + /* Store MPTCP splice context information in read_descriptor_t. */ + read_descriptor_t rd_desc =3D { + .arg.data =3D mss, + .count =3D mss->len, + }; + + return mptcp_read_sock(sk, &rd_desc, mptcp_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 mptcp_splice_state mss =3D { + .pipe =3D pipe, + .len =3D len, + .flags =3D flags, + }; + struct sock *sk =3D sock->sk; + ssize_t spliced; + long timeo; + int ret; + + /* + * We can't seek on a socket input + */ + if (unlikely(*ppos)) + return -ESPIPE; + + spliced =3D 0; + ret =3D 0; + + lock_sock(sk); + + timeo =3D sock_rcvtimeo(sk, sock->file->f_flags & O_NONBLOCK); + while (mss.len) { + ret =3D __mptcp_splice_read(sk, &mss); + 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) { + if (__mptcp_move_skbs(sk)) + continue; + break; + } + if (sk->sk_state =3D=3D TCP_CLOSE) { + 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; + } + mss.len -=3D ret; + spliced +=3D ret; + + if (!mss.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, @@ -4044,6 +4178,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 { @@ -4149,6 +4284,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.48.1 From nobody Wed Sep 17 18:16:51 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 2D3C41A3142 for ; Sat, 5 Jul 2025 11:17:55 +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=1751714275; cv=none; b=VeqwVsjBg7xahhHIya2CI/Utldw9rZe4wnhkOeyCNJLGaNRVC8TXobnIN0SvjToaimetiqC+mTZnqmgFkdgggxJzZURTku7csC1Gh2FdccyE6/oWpqGY5Eaz0Bor6mTE25pMeX/ZqHS+fizV8r6XwNnlJVNserkSihPzL1t6fRk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751714275; c=relaxed/simple; bh=bhuC2TqYyeTrDbPGob8gPdZZn5KwfuDrY1y5UaLO+bw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BFd7caBNEX221YluMULrnPvRHkYuPv7EXy9uSzeO4wstf4CLqs4vH+BpvvYNIl8bz8kH+G5XpfwKjI6PQbHByBAesP4adoLBuoLXr/VP80bBpN5OWPc+mNyon8amuqZzeuPRI6ioleInhp3b39tTiMYqT3Ub7/bfKNlGQDKGfn8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rn4nHKWv; 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="rn4nHKWv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D00D5C4CEE7; Sat, 5 Jul 2025 11:17:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751714275; bh=bhuC2TqYyeTrDbPGob8gPdZZn5KwfuDrY1y5UaLO+bw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rn4nHKWvu5b0uU36Ikwl/XZBf+8N5Z3Xbu+BLZm8L+MZInpogp9aY1Sta3QFuWMRt Jk7Yqk/vPTano2iWNUF8AeguHWM4qRS7ES/PamNqEISesIimvW9dWmH5bMbvzyourh MlEXxhquujl4R4XzxnYWDm90aNoS6fXmyo7pb9lPboDhBoQP7LiY8iMxNyeYfmQlw5 6I1b5fbniNkVDoEUHR404WTgcS21AVXn5voZQikISKPmihBaoZxTgFfKE7WZqbM2/0 JkvaLm4LcpsyQlw+Zpf09iU/dzEPysfrw77au8Sa2RMBItN/jHHYsJ9AdpNwp+Z73C OigCv3lQz4VeQ== From: Geliang Tang To: mptcp@lists.linux.dev, pabeni@redhat.com, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v6 4/4] selftests: mptcp: add splice io mode Date: Sat, 5 Jul 2025 19:17:42 +0800 Message-ID: <2acf3b73afc0fc6a8fd8cf07c7c6d31cf690c9ed.1751714072.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 This patch adds a new 'splice' io mode for mptcp_connect to test the newly added read_sock() and splice() functions of MPTCP. ./mptcp_connect.sh -m splice v2: - only use 'splice' mode for MPTCP fallback tests too. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_connect.c | 63 ++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/test= ing/selftests/net/mptcp/mptcp_connect.c index ac1349c4b9e5..4c219d620398 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -51,6 +51,7 @@ enum cfg_mode { CFG_MODE_POLL, CFG_MODE_MMAP, CFG_MODE_SENDFILE, + CFG_MODE_SPLICE, }; =20 enum cfg_peek { @@ -123,7 +124,7 @@ static void die_usage(void) fprintf(stderr, "\t-j -- add additional sleep at connection start and= tear down " "-- for MPJ tests\n"); fprintf(stderr, "\t-l -- listens mode, accepts incoming connection\n"= ); - fprintf(stderr, "\t-m [poll|mmap|sendfile] -- use poll(default)/mmap+writ= e/sendfile\n"); + fprintf(stderr, "\t-m [poll|mmap|sendfile|splice] -- use poll(default)/mm= ap+write/sendfile/splice\n"); fprintf(stderr, "\t-M mark -- set socket packet mark\n"); fprintf(stderr, "\t-o option -- test sockopt