From nobody Wed Sep 17 18:08:13 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 8A8BF14EC73 for ; Fri, 27 Jun 2025 16:01:27 +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=1751040087; cv=none; b=OZdlVHglKlO2fFYj/4okn/NcDk6K4zGYzOaYuaP04Rpefn3l9VvUkQtBFO3cV00Wv/4kj6x0iYuMtu9hwH73n5GXvpq5Uj8q228d6VjePwkxvd8aZ8mDA43AGwjk7xCfWLrISeG6DOAQc3mHNa4gegTxtePleXb/SrgeyzSt528= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751040087; c=relaxed/simple; bh=epwapybJb3CgkKtp/aeYa0kMv1PgIz/cC1O6ujlwZOY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=a9D5JoVv0syFCuxNhzrBNJ0nOoRVK3CM6bPX037x3ezC7kQa/Zp0FPuIR9s1B/gHlrzdDa8GgD+zzwNT1DUSzgCwO9iPw3hKieVO/JPlWyDTUMMntiq4YTkew5B8XUIFqFW+3LLDYC1/2O0wYQhdBt2uAlYNMscx3CoUC0AgTmI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=f8utLYfl; 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="f8utLYfl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B168C4CEED; Fri, 27 Jun 2025 16:01:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751040087; bh=epwapybJb3CgkKtp/aeYa0kMv1PgIz/cC1O6ujlwZOY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f8utLYflfDn5CofMP0jtQ78kLdv4zDe2mnZa21Ya0yMoMezm6wwr+aYI0xg9OJ0sK xqNJtKyGhLBCyTdyKm1V0KJTX0I00IcvOrkPpnN78pYrS1WBDBKoipjJLbP1mgCqNx 5SkQ5oONJ4eJh7y/8IBfQzUFyoVg8yzd70ioBsM0+HE0ZN0NzhYtKpSB2T3p6ZxdGU rNBwtE4sreTl1fIrrIJv1bRw99km/zaqhjkCPX6C1VdvxZCIKMydTlot/iVEtyQ84F HeSHlo3hGJhw9CIvfd8IwPMk5i5QdlvlFiHchHNhyo2SNO+CMXJQflOzcOk7N91Rtd HNN2w7K2ipW/w== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v4 1/4] mptcp: use sk_eat_skb in recvmsg_mskq Date: Fri, 27 Jun 2025 23:59:40 +0800 Message-ID: <28f02218b3e0dff52714f7ff8fd9a401d8f31fc8.1751039657.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 uses sk_eat_skb() helper in __mptcp_recvmsg_mskq() instead of open-coding it. 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 1de42dc4e8ea..2f747ab730e5 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1890,8 +1890,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:08:13 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 9F24E14EC73 for ; Fri, 27 Jun 2025 16:01:29 +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=1751040089; cv=none; b=gzUXFtjTyhdeQI5/ak+EwCUe9iC/eQEocROMZ5D0bxjKlbl1WK7CSZth/8fJTQfu4rYwECqIfBUr8unCPR9JrLtMZtlS7eWr5GLDyRXgV43EuMIOj2QE7azxu7hNf9IVCmwq0VZgs8PRTJts6EkQd8stUO8uIZsqV7wJ187LDFk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751040089; c=relaxed/simple; bh=JWZpxu94DK1POxA2FzHwmvjhPCH0nATuXGwwzNgtbqg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FRveEvZSh0oZ6Oo5Uks4exTQknZBd7wjixjIqoUP3E7fAEUgtYEDk/v2Y0YIUOTFYP5Zqyc7s//3YBtFGfSAF0mJr5DkLHC4kwKtijrV25pYNescHEiEL9NRDhHDQr0KnacWf/nfIwLZ/vXjBwbE3EA9aQwsrMv3jF2q2JtcqZY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LxZGPYT8; 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="LxZGPYT8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E354BC4CEEF; Fri, 27 Jun 2025 16:01:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751040089; bh=JWZpxu94DK1POxA2FzHwmvjhPCH0nATuXGwwzNgtbqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LxZGPYT8pkyJoCaaZ/IVvdHTa4AWsxfIi888Gwd2F/ByXGIB8d6S7l+xCz6t8Lrir eLLKHKl1WhbTTlieFTNfR45hWnEAyG/NliPrLAOmL3okkkSh2tKkEnWI4DEP2gj8wm /sdnKPgChou07yvD/WpxzNQKjTjahg6I7KGr5yybVP46S4L4hXjPmSYalc/tpP85IZ asH2UO7kWCnLAyYEXXmFQbpmFJ69aaDoHpwukfIJh21/EJmvd6doVZVeEf2pEJkGAL piCcAy0J0xvdjBwa80zx8A8BCJ3dAglOH5iABt+bqyIO5tgLSTDVh79WE4DCZo7NKN 1dBIKk20s88ww== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v4 2/4] mptcp: implement .read_sock Date: Fri, 27 Jun 2025 23:59:41 +0800 Message-ID: <886fea2d7d2d71ace157bacc1b38dc7ce2e4573a.1751039657.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 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 | 64 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 2f747ab730e5..10cc8756877e 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3956,6 +3956,68 @@ static __poll_t mptcp_poll(struct file *file, struct= socket *sock, return mask; } =20 +/* + * 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); + struct scm_timestamping_internal tss; + 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; + } + + if (MPTCP_SKB_CB(skb)->has_rxtstamp) + tcp_update_recv_tstamps(skb, &tss); + + copied +=3D count; + + if (count < data_len) { + MPTCP_SKB_CB(skb)->offset +=3D count; + MPTCP_SKB_CB(skb)->map_seq +=3D count; + msk->bytes_consumed +=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); + msk->bytes_consumed +=3D count; + + if (copied >=3D len) + break; + } + + mptcp_rcv_space_adjust(msk, copied); + + if (copied > 0) { + if (skb_queue_empty(&sk->sk_receive_queue)) + __mptcp_move_skbs(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, @@ -3976,6 +4038,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 { @@ -4080,6 +4143,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:08:13 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 6B95C14EC73 for ; Fri, 27 Jun 2025 16:01:30 +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=1751040091; cv=none; b=IdRjh/9eemaZg+q3bhQ9puWY6adKv2rkbuFa6jPqHlg8iYvvSLpK+lanrUrlLMXmfM306tASTtKT3EMO5X124zD5XKU4J5e47yZstTVfDfDgF/YyAxoY0piDWXRDtIhjRcMxTl21bAgU56unsJk0/7+LHKecM64ve1JNWYxEgEo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751040091; c=relaxed/simple; bh=3xuUr77WJdOE23V8Tpi+/hhttLBIYXzMFY0ZVafEskQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G9RGhJs1nMGf4YWlz6i20A3OeeDJlkC95lRfiTJxtGBpI4EaH6j/zkVWkxZ3Z5QyW2RL7t4zDfVO/WeAUlKN/kPMawyTlqWBFKKqDOlLLC+H7/ytvBnrAoPbXeQa91ZWhZckVAzBSoZxc/VtVRvpCY+0uNcKlBlA2PjN+8SSIZc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TbeAcBmu; 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="TbeAcBmu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD8EFC4CEE3; Fri, 27 Jun 2025 16:01:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751040090; bh=3xuUr77WJdOE23V8Tpi+/hhttLBIYXzMFY0ZVafEskQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TbeAcBmuBQ/S5pBVEgA3F7KQGSoqp1WE8jIccyjLO0E34ETjzuvWLUEPxR07+8+Z3 +BWsJqfGkiW5CZH8VvoBqYjtoLxmYRbvUtZcvLJu8yGYNozhjOEDMXA6UjKtGvviQ1 WrALDOxJ6vYtaqZsqb6ZCA2yUEbrdIYViEMZC+VfUr+diD4JZMIPurwBJK+JwvC/lw ZwVALA0xvH9jNNiZv1pmKSyJvw59yM6rMRZrIVMxABiel3w/kgNTjaDGSgjD5BKJR4 5qggD7IuKXAkEc+S2Rf5bIbpZRKM9T9+uhmgorFvdQtu+VKxdpWWuNqfQK5FANzlAF OzuJ8CPlzo1bg== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v4 3/4] mptcp: set .splice_read Date: Fri, 27 Jun 2025 23:59:42 +0800 Message-ID: <84557ee1e03cfe9172e5d52ad78cbf88d3711672.1751039657.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 sets .splice_read interface of mptcp struct proto_ops as tcp_splice_read. And invoke .read_sock in __tcp_splice_read(). v2: - use INDIRECT_CALL_INET_1. Signed-off-by: Geliang Tang --- net/ipv4/tcp.c | 4 +++- net/mptcp/protocol.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index c18682c3fa33..97175b75796b 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -774,13 +774,15 @@ static int tcp_splice_data_recv(read_descriptor_t *rd= _desc, struct sk_buff *skb, =20 static int __tcp_splice_read(struct sock *sk, struct tcp_splice_state *tss) { + const struct proto_ops *ops =3D READ_ONCE(sk->sk_socket->ops); /* Store TCP splice context information in read_descriptor_t. */ read_descriptor_t rd_desc =3D { .arg.data =3D tss, .count =3D tss->len, }; =20 - return tcp_read_sock(sk, &rd_desc, tcp_splice_data_recv); + return INDIRECT_CALL_INET_1(ops->read_sock, tcp_read_sock, + sk, &rd_desc, tcp_splice_data_recv); } =20 /** diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 10cc8756877e..33608404b871 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4039,6 +4039,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 tcp_splice_read, }; =20 static struct inet_protosw mptcp_protosw =3D { @@ -4144,6 +4145,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 tcp_splice_read, }; =20 static struct proto mptcp_v6_prot; --=20 2.48.1 From nobody Wed Sep 17 18:08:13 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 610A914EC73 for ; Fri, 27 Jun 2025 16:01:32 +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=1751040093; cv=none; b=dQ/RbGOlZfcJt7D4fqHf2iJnzGL7npyAakDyogA5olKu9eQnENS9AP6JAP3UgBHevxLXlnGxmTuM/hR4UXnd6/hxJ8X6N8oOacmGUCdJA5JkXF3LT4QiWkan3XX8anchUKny0SL0vLHLiPFXW5HUIFw/BgDYkEjbLNlNtnD2Eyo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751040093; c=relaxed/simple; bh=bhuC2TqYyeTrDbPGob8gPdZZn5KwfuDrY1y5UaLO+bw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MkrUC3l+D8csA27NveddhkQCxCDDKiLbeOv+xdffoY4gy5nA8q3TOx47G9QaGSedBQpmWlHXTM1EMHTZJjDCZ6Zs64p267PgYLXGH6x0+2xxFesT75juKxZ3FawO+UNauYkzWQWNcxzNg9DvXqYIXMuPa7rrgYy6ylutrXhVOIQ= 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+OEDQSV; 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="p+OEDQSV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6CCEEC4CEED; Fri, 27 Jun 2025 16:01:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751040092; bh=bhuC2TqYyeTrDbPGob8gPdZZn5KwfuDrY1y5UaLO+bw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p+OEDQSV+ilKGXsMCl5z+99LIEHBeILj0tGcD0WwyGHkV6y3ZMqaSmXSIcdwlIxFg 8sswxeYB0qK7b9YxZ7RrBn1hNc4zdtMO4hSNsK8vGeIA1rWyEuls50G5+zVdVW1Kuo mR4rCyvrJWzzhZGF+LryIiCmnCeWOVVP1CxCiNDUuDn6LgtVyy8SSh0xHmcm8Xz+G4 WNHat+K+ffk9EbaJ6nYyf9wqNLPyBkCABkh2KyzvSRDihRK1IUPAoxxcMhDNExZ8+P kwADZk4CmVY+Ih0FjvqzR1qVeuK+ldnts8OBcFsNX/MPwyl7HuLFzITe2+dse37SCN HOc/uO6K9d5dQ== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v4 4/4] selftests: mptcp: add splice io mode Date: Fri, 27 Jun 2025 23:59:43 +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 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