Signed-off-by: add the ones of the sender
by Matthieu Baerts
Hi,
FYI, I just added Mat and Christoph' signed-off at the end in all
patches where the sender is not the author.
Mat' signed-off:
t/tcp-clean-ext-on-tx-recycle d0a53799b41b
t/skb-add-helpers-to-allocate-ext-independently-from-sk_buff 49657b530937
t/mptcp-Handle-MPTCP-TCP-options 7dcbde272d8d
t/mptcp-Associate-MPTCP-context-with-TCP-socket 77bc072d50bb
t/mptcp-Handle-MP_CAPABLE-options-for-outgoing-connections fa30eb93af07
t/mptcp-Create-SUBFLOW-socket-for-incoming-connections 6aeb1ed9011b
t/mptcp-Add-key-generation-and-token-tree 51937718ddb0
t/mptcp-Add-shutdown-socket-operation 54fb2be27f3f
t/mptcp-Add-setsockopt-getsockopt-socket-operations 408d02d51c75
t/mptcp-add-subflow-write-space-signalling-and-mptcp_poll 688e4e89051c
t/mptcp-recvmsg-can-drain-data-from-multiple-subflows 1a2a035ade5c
t/mptcp-allow-collapsing-consecutive-sendpages-on-the-same-substream
86d9099d23ae
t/mptcp-new-sysctl-to-control-the-activation-per-NS e95682b4a686
t/mptcp-add-basic-kselftest-for-mptcp 254904819820
Christoph' signed-off:
t/mptcp-move-from-sha1-v0-to-sha256-v1 76bdd7c23334
Cheers,
Matt
--
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
6 months, 3 weeks
[RFC PATCH 1/4] Squash-to: "mptcp: Handle MP_CAPABLE options for outgoing connections"
by Paolo Abeni
After upstream feedback, I just noticed that we actually
don't clear the is_mptcp field on clone allocation failure.
Do that and additionally don't allocate at all the subflow if MPC handshake
failed.
Note: we need to update accordingly accept on later patch
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
---
net/mptcp/subflow.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index b9aca17b0b91..7dd8733dc72a 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -262,23 +262,19 @@ static void subflow_ulp_clone(const struct request_sock *req,
struct mptcp_subflow_context *old_ctx = mptcp_subflow_ctx(newsk);
struct mptcp_subflow_context *new_ctx;
- /* newsk->sk_socket is NULL at this point */
- new_ctx = subflow_create_ctx(newsk, priority);
- if (!new_ctx)
+ if (!subflow_req->mp_capable ||
+ (new_ctx = subflow_create_ctx(newsk, priority)) == NULL) {
+ tcp_sk(newsk)->is_mptcp = 0;
return;
+ }
new_ctx->conn = NULL;
new_ctx->conn_finished = 1;
new_ctx->icsk_af_ops = old_ctx->icsk_af_ops;
-
- if (subflow_req->mp_capable) {
- new_ctx->mp_capable = 1;
- new_ctx->fourth_ack = 1;
- new_ctx->remote_key = subflow_req->remote_key;
- new_ctx->local_key = subflow_req->local_key;
- } else {
- tcp_sk(newsk)->is_mptcp = 0;
- }
+ new_ctx->mp_capable = 1;
+ new_ctx->fourth_ack = 1;
+ new_ctx->remote_key = subflow_req->remote_key;
+ new_ctx->local_key = subflow_req->local_key;
}
static struct tcp_ulp_ops subflow_ulp_ops __read_mostly = {
--
2.21.0
7 months
[RFC PATCH 2/4] Squash-to "mptcp: Create SUBFLOW socket for incoming connection"
by Paolo Abeni
use is_mptcp instead of 'subflow->mp_capable'
---
net/mptcp/protocol.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 70e28cc0dbe0..283e7dc2d25e 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -243,7 +243,6 @@ static struct sock *mptcp_accept(struct sock *sk, int flags, int *err,
bool kern)
{
struct mptcp_sock *msk = mptcp_sk(sk);
- struct mptcp_subflow_context *subflow;
struct socket *listener;
struct sock *newsk;
@@ -258,13 +257,14 @@ static struct sock *mptcp_accept(struct sock *sk, int flags, int *err,
if (!newsk)
return NULL;
- subflow = mptcp_subflow_ctx(newsk);
- pr_debug("msk=%p, new subflow=%p, ", msk, subflow);
+ pr_debug("msk=%p, subflow is mptcp=%d", msk, tcp_sk(newsk)->is_mptcp);
- if (subflow->mp_capable) {
+ if (tcp_sk(newsk)->is_mptcp) {
+ struct mptcp_subflow_context *subflow;
struct sock *new_mptcp_sock;
struct sock *ssk = newsk;
+ subflow = mptcp_subflow_ctx(newsk);
lock_sock(sk);
local_bh_disable();
@@ -295,8 +295,6 @@ static struct sock *mptcp_accept(struct sock *sk, int flags, int *err,
bh_unlock_sock(new_mptcp_sock);
local_bh_enable();
release_sock(sk);
- } else {
- tcp_sk(newsk)->is_mptcp = 0;
}
return newsk;
--
2.21.0
7 months, 1 week
[RFC PATCH 3/4] Squash-to: "mptcp: Implement MPTCP receive path"
by Paolo Abeni
deal with fallback: we must reset sk callback to the TCP one.
Use the cached ptr in the old ctx.
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
---
net/mptcp/protocol.h | 13 ++++++++++++-
net/mptcp/subflow.c | 11 ++++++++---
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index e4fce9f0ad65..7f3cc7952227 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -121,7 +121,10 @@ struct mptcp_subflow_context {
struct sock *tcp_sock; /* tcp sk backpointer */
struct sock *conn; /* parent mptcp_sock */
const struct inet_connection_sock_af_ops *icsk_af_ops;
- void (*tcp_sk_data_ready)(struct sock *sk);
+ void (*tcp_data_ready)(struct sock *sk);
+ void (*tcp_state_change)(struct sock *sk);
+ void (*tcp_write_space)(struct sock *sk);
+
struct rcu_head rcu;
};
@@ -159,6 +162,14 @@ bool mptcp_subflow_data_available(struct sock *sk);
void mptcp_subflow_init(void);
int mptcp_subflow_create_socket(struct sock *sk, struct socket **new_sock);
+static inline void mptcp_subflow_tcp_fallback(struct sock *sk,
+ struct mptcp_subflow_context *ctx)
+{
+ sk->sk_data_ready = ctx->tcp_data_ready;
+ sk->sk_state_change = ctx->tcp_state_change;
+ sk->sk_write_space = ctx->tcp_write_space;
+}
+
extern const struct inet_connection_sock_af_ops ipv4_specific;
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
extern const struct inet_connection_sock_af_ops ipv6_specific;
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 48bf0b1d8d28..3ac1764f276b 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -504,7 +504,7 @@ static void subflow_data_ready(struct sock *sk)
struct sock *parent = subflow->conn;
if (!parent || !subflow->mp_capable) {
- subflow->tcp_sk_data_ready(sk);
+ subflow->tcp_data_ready(sk);
if (parent)
parent->sk_data_ready(parent);
@@ -652,7 +652,9 @@ static int subflow_ulp_init(struct sock *sk)
if (sk->sk_family == AF_INET6)
icsk->icsk_af_ops = &subflow_v6_specific;
#endif
- ctx->tcp_sk_data_ready = sk->sk_data_ready;
+ ctx->tcp_data_ready = sk->sk_data_ready;
+ ctx->tcp_state_change = sk->sk_state_change;
+ ctx->tcp_write_space = sk->sk_write_space;
sk->sk_data_ready = subflow_data_ready;
sk->sk_write_space = subflow_write_space;
sk->sk_state_change = subflow_state_change;
@@ -683,6 +685,7 @@ static void subflow_ulp_clone(const struct request_sock *req,
if (!subflow_req->mp_capable ||
(new_ctx = subflow_create_ctx(newsk, priority)) == NULL) {
+ mptcp_subflow_tcp_fallback(newsk, old_ctx);
tcp_sk(newsk)->is_mptcp = 0;
return;
}
@@ -690,7 +693,9 @@ static void subflow_ulp_clone(const struct request_sock *req,
new_ctx->conn = NULL;
new_ctx->conn_finished = 1;
new_ctx->icsk_af_ops = old_ctx->icsk_af_ops;
- new_ctx->tcp_sk_data_ready = old_ctx->tcp_sk_data_ready;
+ new_ctx->tcp_data_ready = old_ctx->tcp_data_ready;
+ new_ctx->tcp_state_change = old_ctx->tcp_state_change;
+ new_ctx->tcp_write_space = old_ctx->tcp_write_space;
new_ctx->mp_capable = 1;
new_ctx->fourth_ack = 1;
new_ctx->remote_key = subflow_req->remote_key;
--
2.21.0
7 months, 1 week
Posledni exekucni vyzova 20.12.2019-0177-56.
by Adam Vojtech
Vazeni,
Do dnesniho dne jste nesplnili Vasi zakonnou povinnost a nevratili mi zaplacenou financni castku, kterou jste byli povinni mi vratit.
V opacnem pripade budu nucen obratit se se svym narokem na soud s navrhem na vydani platebniho rozkazu. Verim vsak, ze to nebude nutne.
Stahnout prilohu.
S pozdravem,
soudni exekutor: Adam Vojtech.
7 months, 2 weeks
[Weekly meetings] MoM - 19th of December 2019
by Matthieu Baerts
Hello,
On Thursday, we had our 80th meeting with Mat, Peter and Ossama (Intel
OTC), Paolo (RedHat) and myself (Tessares).
Thanks again for this new good meeting!
Here are the minutes of the meeting:
Accepted patches:
- The list of accepted patches can be seen on PatchWork:
https://patchwork.ozlabs.org/project/mptcp/list/?state=3
- By Paolo Abeni, Matthieu Baerts
1214271 Squash-to: "tcp: coalesce/collapse must respect MPTCP extension
1214225 Squash-to: "mptcp: Add MPTCP to skb extensions"
1213556 [v3] Squash-to: "tcp: Prevent coalesce/collapse when skb has MP
1212550 Squash-to: "mptcp: Add MPTCP socket stubs"
1212331 [2/2] Squash-to: "mptcp: Implement MPTCP receive path"
1212314 [1/2] Squash-to: "mptcp: Add MPTCP socket stubs"
1212209 Squash-to: "mptcp: recvmsg() can drain data from multiple subfl
1211460 Squash-to: "mptcp: Add key generation and token tree"
1211244 Squash-to: "sock: Make sk_protocol a 16-bit value"
1210776 Squash-to: "mptcp: Implement MPTCP receive path"
1210775 Squash-to: "mptcp: Handle MP_CAPABLE options for outgoing conne
1210697 [v2] Squash-to: "mptcp: cope with later TCP fallback"
1210382 Squash-to: tcp: Check for filled TCP option space before SACK
1210375 Squash-to: "sock: Make sk_protocol a 16-bit value"
1209395 Re: [PATCH] mptcp: cope with later TCP fallback.
Pending patches:
- The list of pending patches can be seen on PatchWork:
https://patchwork.ozlabs.org/project/mptcp/list/?state=*
- By Paolo Abeni, Matthieu Baerts, Peter Krystad
1194592: Changes Requested: [RFC,1/1] mptcp: Optimize struct mptcp_recei
1196109: RFC: [10/10,RFC] selftests:mptcp: decrease timeout to 100 sec
1214280: Changes Requested: [RFC,1/4] Squash-to: "mptcp: Handle MP_CAPAB
1214277: Changes Requested: [RFC,2/4] Squash-to "mptcp: Create SUBFLOW s
1214278: Changes Requested: [RFC,3/4] Squash-to: "mptcp: Implement MPTCP
1214279: Changes Requested: [RFC,4/4] Squash-to: "mptcp: cope with later
FYI: Current Roadmap:
- Part 1 (mainly TCP changes, will be sent with Part 2):
- Sent to Netdev, in review
- Part 2 (minimum set for MPTCP, up to KSelftests, one subflow):
- Sent to Netdev, in review, waiting for Part 1 to be ready
- Part 3 (MPTCPv1):
- Ready to be sent to Netdev, waiting for Part 2 to be ready
- Part 4 (to be sent before the end of the merge window or more
probably at the next one)
- Full DATA_FIN support [WIP]
- Shared recv window (drop data received on other subflows) [TODO]
- Active backup support [WIP]
- Opti in TCP option structures (unions) [to be rebased)
- Part 5 (to fully support MPTCP):
- Shared recv window (full support)
- IPv6 - IPv4 mapped support
- not dropping MPTCP options (ADD_ADDR, etc.)
- FAST_CLOSE
- full MPTCP v1 support (reliable add_addr, etc.)
- after a few attempts of failed MPTCP, we fallback to TCP
(like TFO is doing)
- Part 6 (extra needed for prod):
- opti/perfs
- TFO
Initial submission to net-next:
- Part 1:
- We got some reviews from Eric Dumazet and recommendations
from Davem
- v1 has been sent on Friday:
- comments from Eric about patch 2 (struct sock) and patch
9 (SACK)
- v2 has been sent on Monday:
- v1 -> v2: sk_pacing_shift left as a regular struct member
(patch 2), and modified SACK space check based on recent -net fix (patch 9).
- comment from Eric about patch 2 again (struct sock)
- v3 has been sent on Tuesday:
- v2 -> v3: Ensure sk_type alignment in struct sock (patch 2)
- discussions on: tcp: Prevent coalesce/collapse when skb
has MPTCP extensions:
- Eric: This seems a very pessimistic change to me. Are
you planing later to refine this limitation ? Surely if a sender sends
TSO packet, we allow all the segments being aggregated at receive side
either by GRO or TCP coalescing.
- Davem: This turns off absolutely crucial functional
elements of our TCP stack, and will avoid all of the machinery that
avoids wastage in TCP packets sitting in the various queues.
skb->truesize management, etc. I will not apply these patches with such
a non-trivial regression in place for MPTCP streams, sorry.
- Paolo has just added support of coalescing for MPTCP:
- to coalesce the ones with the same options
- some room to improvement (DSN/ACK in sequence)
but additional hooks needed and it will increase the complexity
- here we address Eric concerns
- for the moment we are checking the bit-field on
each packet. We can optimise this later. Compiler can optimise stuff but
maybe not to that point.
- *Paolo* will check what the binary looks like
just after the meeting → The compiler did well his job!
- v4 & v5 have been sent on Thursday after the meeting:
- We got a full review from Eric (except the last patch)
- v6 is ready but will be sent in January
- Part 2:
- v1 was sent on Friday
- v2 was sent on Wednesday (rebase) but rejected until part 1
is applied. →
https://lore.kernel.org/netdev/20191218.124244.864160487872326152.davem@d...
- Part 3:
- v1 was not sent on Wednesday, David Miller prefers to wait.
- We are not going to send Part 3 until part 1 & 2 are merged,
not even as an RFC
Other WIP items:
- Mostly on hold, focusing on part 1 → 3
mptcpd:
- mptcpd 0.3: Beta release
- https://github.com/intel/mptcpd/releases/tag/v0.3
- mainly plugin API, fixes, stabilisation, it's now a beta!
- could be nice to stress it (and the kernel part) to see if we can
use it for servers with a lot of connections (we can lose netlink messages)
Perfs figures:
- saw issues with the unblocked connect → mptcp_finish_connect()
can set msk fields async. In a specific sequences from the userspace, we
can have issues.
- we can address that later
- tests were done with MPTCP, one subflow, loopback, same machine
- we are close to TCP so that's good!
Plan for the next weeks:
- Rest
- Enjoy the end of the year! Merry Xmas and Happy New Year everybody!
- Check patches from Part 1, ideally around the 2nd/3rd of January
- Tag "netdev-v6-part1" using:
$ git fetch origin
$ git tag -sfm "Multipath TCP part 1: Prerequisites, version 6" \
netdev-v6-part1 $(git log -1 --format=%H --grep \
'^skb: add helpers to allocate ext independently from s' \
origin/net-next..origin/export)
$ git tag -sfm "Multipath TCP: full working branch, version 7" \
netdev-v7-full origin/export
- Send part 1 v6 to netdev, ideally around the 2nd/3rd of January
Misc:
- Let's do it!
https://www.tessares.net/a-key-step-for-mptcp-integration-in-linux-5-x/
Next meeting:
- We decided to *skip the two next meetings* (26th / 2nd)
- We propose to have the next meeting on Thursday, the 9th of January.
- Usual time: 17:00 UTC (9am PST, 6pm CET)
- Still open to everyone!
- https://annuel2.framapad.org/p/mptcp_upstreaming_20200109
Feel free to comment on these points and propose new ones for the next
meeting!
Merry Xmas and Happy New Year everybody!
Talk to you next year,
Matt
--
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
7 months, 2 weeks
Re: Abandoned Project..
by Mr. Peter Brook
Good day.
I am the new EXECUTIVE DIRECTOR and Head of Operations of
Overseas
Credit Commission London, UK. Sometime ago, in
our organization your overdue consignment fund was brought to our
office for final delivery clearance.
However, upon my arrival to this office, I found your consignment
clearance file lying fallow on my desk without any attention. On
a
thorough scrutiny I discovered that your consignment have been
abandoned by your delivery agent. Meanwhile, I have made several
attempts to contact your delivery agent but to no avail. To my
greatest surprise, during my recent routine checking, I
personally
discovered that your consignment content declaration documents
stated
that your consignment contains personal effects meanwhile, it
contains
United States dollar bills worth over US$ 10.5 Million dollars,
which
made it impossible for the consignment to be delivered to you
earlier
before now.
Based on this personal discovery, I am contacting you now to let
you
know that with my position and power in this office, I can assist
you
to legally clear your consignment fund, but you must agree with
the
following conditions:
You must not disclose to any member of my organization whatever
assistance that I am going to render to you in respect of
clearing
this consignment fund into your custody.
You will provide me with an authenticated promissory note, other
wise
known as partnership agreement, that upon the safe arrival of the
consignment fund to your custody, that you give me 40% of the
total
fund contained in the consignment.
You must give adequate attention to this matter until we
successfully
and legally clear the consignment fund into your custody.
Upon your acceptance with my above conditions, I will furnish you
with
further details of what should be done to legally get the
consignment
fund cleared and delivered to you as the rightful owner of the
consignment.
Meanwhile, if you know that you would be unable to keep the
secret of
my assistance to you in this regards, please do not border to
reply.
Hence the consignment fund would be recovered into our
organization
treasury account as unclaimed consignment fund. Be informed that
the
consignment contain the sum of $10.5 million dollars in the
luggage.
But if you can assure me of your competency to keep this secret,
I
would like to hear from you soon as possible so that I can email
you
further details and guidelines.
I am looking forward to your earliest response.
Have a Great Day
Mr. Peter Brook
Head of Operations
7 months, 2 weeks
[PATCH] Squash-to: "tcp: coalesce/collapse must respect MPTCP extensions"
by Paolo Abeni
clarify mptcp ext usage
to be added to squashed commit changelog:
"""
v5 -> v6:
- clarify MPTCP must always be cleared at allocation time
"""
---
include/net/mptcp.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/include/net/mptcp.h b/include/net/mptcp.h
index 7d693d0a38ff..8825da7538dd 100644
--- a/include/net/mptcp.h
+++ b/include/net/mptcp.h
@@ -48,6 +48,9 @@ static inline void mptcp_skb_ext_move(struct sk_buff *to,
static inline bool mptcp_ext_matches(const struct mptcp_ext *to_ext,
const struct mptcp_ext *from_ext)
{
+ /* MPTCP always clear the ext when adding it to the skb, so
+ * holes do not bother us here
+ */
return !from_ext ||
(to_ext && from_ext &&
!memcmp(from_ext, to_ext, sizeof(struct mptcp_ext)));
--
2.21.0
7 months, 2 weeks
