[PATCH mptcp-next 0/2] Squash to "implement mptcp read_sock"

[PATCH mptcp-next 0/2] Squash to "implement mptcp read_sock"

[Geliang Tang]

From: Geliang Tang <tanggeliang@kylinos.cn>

Two small cleanups for "implement mptcp read_sock" v5.

Based-on: <cover.1751093346.git.tanggeliang@kylinos.cn>

Geliang Tang (2):
  Squash to "mptcp: implement .read_sock"
  Squash to "mptcp: set .splice_read"

 net/ipv4/tcp.c       | 2 ++
 net/mptcp/protocol.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

-- 
2.48.1

[PATCH mptcp-next 1/2] Squash to "mptcp: implement .read_sock"

[Geliang Tang]

From: Geliang Tang <tanggeliang@kylinos.cn>

No need to init copied to zero.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 net/mptcp/protocol.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 068ec724e081..924b4d5bd1af 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -3997,7 +3997,7 @@ static int mptcp_read_sock(struct sock *sk, read_descriptor_t *desc,
 	struct scm_timestamping_internal tss;
 	int flags = 0, cmsg_flags = 0;
 	size_t len = sk->sk_rcvbuf;
-	int copied = 0;
+	int copied;
 
 	if (sk->sk_state == TCP_LISTEN)
 		return -ENOTCONN;
-- 
2.48.1

[PATCH mptcp-next 2/2] Squash to "mptcp: set .splice_read"

[Geliang Tang]

From: Geliang Tang <tanggeliang@kylinos.cn>

Add NULL pointer checks.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 net/ipv4/tcp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index a627e1ee5668..6fca35f3fd24 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -779,6 +779,8 @@ static int __tcp_splice_read(struct sock *sk, struct tcp_splice_state *tss)
 		.count	  = tss->len,
 	};
 
+	if (unlikely(!ops || !ops->read_sock))
+		return -ENOTSUPP;
 	return INDIRECT_CALL_INET_1(ops->read_sock, tcp_read_sock,
 				    sk, &rd_desc, tcp_splice_data_recv);
 }
-- 
2.48.1

[PATCH mptcp-next 0/2] squash to "implement mptcp read_sock"

[Geliang Tang]

From: Geliang Tang <tanggeliang@kylinos.cn>

Two squash-to patches for "implement mptcp read_sock" v2:

 - Use sk->sk_rcvbuf instead of INT_MAX as the max len.
 - Close all fds of mptcp_splice.c.
 - Add splice io mode for mptcp_connect.

Based-on: <cover.1749286212.git.tanggeliang@kylinos.cn>

Geliang Tang (2):
  Squash to "mptcp: implement .read_sock"
  Squash to "selftests: mptcp: add splice test"

 net/mptcp/protocol.c                          |  2 +-
 .../selftests/net/mptcp/mptcp_connect.c       | 61 ++++++++++++++++++-
 .../selftests/net/mptcp/mptcp_connect.sh      | 10 ++-
 .../selftests/net/mptcp/mptcp_splice.c        | 43 ++++++++-----
 4 files changed, 99 insertions(+), 17 deletions(-)

-- 
2.43.0

Re: [PATCH mptcp-next 0/2] squash to "implement mptcp read_sock"

[MPTCP CI]

Hi Geliang,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal: Success! ✅
- KVM Validation: debug: Success! ✅
- KVM Validation: btf-normal (only bpftest_all): Success! ✅
- KVM Validation: btf-debug (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/15581436214

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/b571299e8f55
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=970730


If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:

    $ cd [kernel source code]
    $ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
        --pull always mptcp/mptcp-upstream-virtme-docker:latest \
        auto-normal

For more details:

    https://github.com/multipath-tcp/mptcp-upstream-virtme-docker


Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)