[PATCH] squash-to: "mptcp: add basic kselftest for mptcp"
by Davide Caratti
checkpatch fixes
Signed-off-by: Davide Caratti <dcaratti(a)redhat.com>
---
.../selftests/net/mptcp/mptcp_connect.c | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c
index 8b8718e150d1..64550726917f 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c
@@ -71,7 +71,8 @@ static void xgetnameinfo(const struct sockaddr *addr, socklen_t addrlen,
char *serv, socklen_t servlen)
{
int flags = NI_NUMERICHOST | NI_NUMERICSERV;
- int err = getnameinfo(addr, addrlen, host, hostlen, serv, servlen, flags);
+ int err = getnameinfo(addr, addrlen, host, hostlen, serv, servlen,
+ flags);
if (err) {
const char *errstr = getxinfo_strerr(err);
@@ -161,7 +162,6 @@ static int sock_listen_mptcp(const char * const listenaddr,
static bool sock_test_tcpulp(const char * const remoteaddr,
const char * const port)
{
-
struct addrinfo hints = {
.ai_protocol = IPPROTO_TCP,
.ai_socktype = SOCK_STREAM,
@@ -281,11 +281,12 @@ static ssize_t do_rnd_read(const int fd, char *buf, const size_t len)
static void set_nonblock(int fd)
{
- int flags = fcntl(fd, F_GETFL);
- if (flags == -1)
- return;
+ int flags = fcntl(fd, F_GETFL);
+
+ if (flags == -1)
+ return;
- fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+ fcntl(fd, F_SETFL, flags | O_NONBLOCK);
}
static int copyfd_io_poll(int infd, int peerfd, int outfd)
@@ -478,7 +479,7 @@ static int do_sendfile(int infd, int outfd, unsigned int count)
}
static int copyfd_io_mmap(int infd, int peerfd, int outfd,
- unsigned int size)
+ unsigned int size)
{
int err;
@@ -501,7 +502,6 @@ static int copyfd_io_mmap(int infd, int peerfd, int outfd,
return err;
}
-
static int copyfd_io_sendfile(int infd, int peerfd, int outfd,
unsigned int size)
{
@@ -575,11 +575,11 @@ static void check_sockaddr(int pf, struct sockaddr_storage *ss,
if (salen != wanted_size)
fprintf(stderr, "accept: size mismatch, got %d expected %d\n",
- (int)salen, wanted_size);
+ (int)salen, wanted_size);
if (ss->ss_family != pf)
fprintf(stderr, "accept: pf mismatch, expect %d, ss_family is %d\n",
- (int)ss->ss_family, pf);
+ (int)ss->ss_family, pf);
}
static void check_getpeername(int fd, struct sockaddr_storage *ss, socklen_t salen)
@@ -746,15 +746,15 @@ int parse_sndbuf(const char *size)
if (errno) {
fprintf(stderr, "Invalid sndbuf size %s (%s)\n",
- size,
- strerror(errno));
+ size,
+ strerror(errno));
die_usage();
}
if (s > INT_MAX) {
fprintf(stderr, "Invalid sndbuf size %s (%s)\n",
- size,
- strerror(ERANGE));
+ size,
+ strerror(ERANGE));
die_usage();
}
--
2.23.0
9 months, 1 week
[PATCH] squash-to: "mptcp: Implement MPTCP receive path"
by Davide Caratti
checkpatch fixes
Signed-off-by: Davide Caratti <dcaratti(a)redhat.com>
---
net/mptcp/subflow.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index cfc90c471460..da10b5092d8d 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -237,7 +237,7 @@ static void warn_bad_map(struct mptcp_subflow_context *subflow, u32 ssn)
static bool skb_is_fully_mapped(struct sock *ssk, struct sk_buff *skb)
{
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
- unsigned skb_consumed;
+ unsigned int skb_consumed;
skb_consumed = tcp_sk(ssk)->copied_seq - TCP_SKB_CB(skb)->seq;
if (WARN_ON_ONCE(skb_consumed >= skb->len))
@@ -284,9 +284,9 @@ static enum mapping_status get_mapping_status(struct sock *ssk)
if (!mpext || !mpext->use_map) {
if (!subflow->map_valid && !skb->len) {
/* the TCP stack deliver 0 len FIN pkt to the receive
- * queue, that is the only 0len pkts ever expected here,
- * and we can admit no mapping only for 0 len pkts
- */
+ * queue, that is the only 0len pkts ever expected here,
+ * and we can admit no mapping only for 0 len pkts
+ */
if (!(TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN))
WARN_ONCE(1, "0len seq %d:%d flags %x",
TCP_SKB_CB(skb)->seq,
--
2.23.0
9 months, 1 week
[PATCH] squash-to: "mptcp: Add key generation and token tree"
by Davide Caratti
checkpatch fixes
Signed-off-by: Davide Caratti <dcaratti(a)redhat.com>
---
net/mptcp/crypto.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/mptcp/crypto.c b/net/mptcp/crypto.c
index ccb9f7effdcd..bbd6d01af211 100644
--- a/net/mptcp/crypto.c
+++ b/net/mptcp/crypto.c
@@ -44,8 +44,8 @@ static void sha1_update(struct sha1_state *state, u8 *input)
state->count += SHA_MESSAGE_BYTES;
}
-static void sha1_pad_final(struct sha1_state *state, u8 *input, unsigned length,
- __be32 *mptcp_hashed_key)
+static void sha1_pad_final(struct sha1_state *state, u8 *input,
+ unsigned int length, __be32 *mptcp_hashed_key)
{
int i;
@@ -78,7 +78,7 @@ void mptcp_crypto_key_sha(u64 key, u32 *token, u64 *idsn)
}
void mptcp_crypto_hmac_sha(u64 key1, u64 key2, u32 nonce1, u32 nonce2,
- u32 *hash_out)
+ u32 *hash_out)
{
u8 input[SHA_MESSAGE_BYTES * 2];
struct sha1_state state;
@@ -118,5 +118,5 @@ void mptcp_crypto_hmac_sha(u64 key1, u64 key2, u32 nonce1, u32 nonce2,
sha1_init(&state);
sha1_update(&state, input);
sha1_pad_final(&state, &input[SHA_MESSAGE_BYTES], SHA_DIGEST_WORDS << 2,
- (__be32*)hash_out);
+ (__be32 *)hash_out);
}
--
2.23.0
9 months, 1 week
[PATCH] squash-to: "mptcp: add subflow write space signalling and mptcp_poll"
by Davide Caratti
checkpatch fixes
Signed-off-by: Davide Caratti<dcaratti(a)redhat.com>
---
net/mptcp/protocol.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 71a305f391c4..44e6f0d1070c 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -817,7 +817,8 @@ static __poll_t mptcp_poll(struct file *file, struct socket *sock,
if (test_bit(MPTCP_DATA_READY, &msk->flags))
mask = EPOLLIN | EPOLLRDNORM;
- if (sk_stream_is_writeable(sk) && test_bit(MPTCP_SEND_SPACE, &msk->flags))
+ if (sk_stream_is_writeable(sk) &&
+ test_bit(MPTCP_SEND_SPACE, &msk->flags))
mask |= EPOLLOUT | EPOLLWRNORM;
if (sk->sk_shutdown & RCV_SHUTDOWN)
mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;
--
2.23.0
9 months, 1 week
[PATCH] squash-to: "mptcp: Handle MPTCP TCP options"
by Davide Caratti
checkpatch fixes
Signed-off-by: Davide Caratti <dcaratti(a)redhat.com>
---
include/linux/tcp.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index e5859d671111..52798ab00394 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -118,7 +118,8 @@ static inline void tcp_clear_options(struct tcp_options_received *rx_opt)
rx_opt->smc_ok = 0;
#endif
#if IS_ENABLED(CONFIG_MPTCP)
- rx_opt->mptcp.mp_capable = rx_opt->mptcp.mp_join = 0;
+ rx_opt->mptcp.mp_capable = 0;
+ rx_opt->mptcp.mp_join = 0;
rx_opt->mptcp.dss = 0;
#endif
}
--
2.23.0
9 months, 1 week
[PATCH] squash-to: "mptcp: recvmsg() can drain data from multiple subflows"
by Davide Caratti
checkpatch fixes
Signed-off-by: Davide Caratti <dcaratti(a)redhat.com>
---
net/mptcp/protocol.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index b9eed120913f..fd89075bd1c9 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -359,7 +359,8 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
desc.count = min_t(size_t, len - copied, map_remaining);
pr_debug("reading %zu bytes, copied %d", desc.count,
copied);
- bytes_read = tcp_read_sock(ssk, &desc, mptcp_read_actor);
+ bytes_read = tcp_read_sock(ssk, &desc,
+ mptcp_read_actor);
if (bytes_read < 0) {
if (!copied)
copied = bytes_read;
--
2.23.0
9 months, 1 week
[PATCH] squash-to: "mptcp: Write MPTCP DSS headers to outgoing data packets"
by Davide Caratti
checkpatch fixes
Signed-off-by_ Davide Caratti <dcaratti(a)redhat.com>
---
net/mptcp/options.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 672f7f1288f8..c9b5f37db63b 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -309,7 +309,7 @@ bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,
if (mptcp_established_options_mp(sk, &opt_size, remaining, opts))
ret = true;
else if (mptcp_established_options_dss(sk, skb, &opt_size, remaining,
- opts))
+ opts))
ret = true;
/* we reserved enough space for the above options, and exceeding the
--
2.23.0
9 months, 1 week
[RFC PATCH 0/4] mptcp: [try to] fix armegaddon on late tcp fallback
by Paolo Abeni
Passive connection can fallback to TCP after that the subflow is established.
That leads to disaster in several nasty ways.
Address the issue explicitly falling back to TCP (converting the socket) as
soon as we notice the unsuccessful MPC hanshake completion.
Sent as a very early RFC - completely untested yet.
Paolo Abeni (4):
mptcp: add helper to forcefully fallback the msk socket to TCP
mptcp: cache the first subflow sock
mptcp: late fallback support
mptcp: deal with fallback in additional places.
net/mptcp/protocol.c | 92 +++++++++++++++++++++++++++++++++++++-------
net/mptcp/protocol.h | 1 +
2 files changed, 79 insertions(+), 14 deletions(-)
--
2.21.0
9 months, 1 week
[PATCH v2 1/4] MAINTAINERS: Add MPTCP maintainers
by Mat Martineau
Possible other lines include:
L: mptcp(a)lists.01.org
The issue with including this ML is that it currently rejects messages
from non-subscribers. I can reconfigure the ML, the tradeoff is in
forwarding spam to subscribers.
Q: https://patchwork.ozlabs.org/project/mptcp/list/
It might be confusing for patches to end up in two patchworks (netdev
and mptcp).
T: git git://github.com/multipath-tcp/mptcp_net-next.git
I've seen two main models for net subsystem management:
netdev-based (TCP, TLS): Patches are sent to netdev, approved by
subsystem maintainers, and approved and applied by David Miller.
subtree (netfilter, BPF, bluetooth, wireless): Messages are sent to
netdev (netfilter/BPF) or a separate ML (bluetooth, wireless) and are
approved and merged to separate git repositories by subsystem
maintainers. Those maintainers then send pull requests for batches of
commits to netdev for David Miller to merge directly in git.
The scope of MPTCP seems more like the other netdev-based projects, so
for changes going directly upstream I've proposed MAINTAINERS entries
that match that development model. If we opt to use our own git repo to
merge upstream changes and then send pull requests, then we would
include the "T:" entry for our github repo.
squashto: mptcp: Add MPTCP to skb extensions
Signed-off-by: Mat Martineau <mathew.j.martineau(a)linux.intel.com>
---
MAINTAINERS | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 8608724835dd..97a922599b78 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11538,6 +11538,15 @@ F: net/ipv6/calipso.c
F: net/netfilter/xt_CONNSECMARK.c
F: net/netfilter/xt_SECMARK.c
+NETWORKING [MPTCP]
+M: Mat Martineau <mathew.j.martineau(a)linux.intel.com>
+M: Matthieu Baerts <matthieu.baerts(a)tessares.net>
+L: netdev(a)vger.kernel.org
+W: https://github.com/multipath-tcp/mptcp_net-next/wiki
+B: https://github.com/multipath-tcp/mptcp_net-next/issues
+S: Maintained
+F: include/net/mptcp.h
+
NETWORKING [TCP]
M: Eric Dumazet <edumazet(a)google.com>
L: netdev(a)vger.kernel.org
--
2.24.0
9 months, 1 week
[PATCH 0/2] kselftests: remove modif in framework + commit msg
by Matthieu Baerts
As discussed yesterday, better to remove the modifications we did in
the kselftest framework [1]. While looking at it, I propose to add more
details in the commit message.
[1] https://patchwork.kernel.org/patch/11204935/
Matthieu Baerts (2):
Revert "selftests: settings: tests can be in subsubdirs"
.topmsg: mptcp: add basic kselftest for mptcp
.topmsg | 18 ++++++++++++------
tools/testing/selftests/kselftest/runner.sh | 2 +-
2 files changed, 13 insertions(+), 7 deletions(-)
--
2.24.0
9 months, 1 week
