From: Paolo Abeni <pabeni@redhat.com>
To: mptcp@lists.linux.dev
Subject: [PATCH mptcp-next 0/4] mptcp: add some more diag info
Date: Thu, 4 May 2023 18:39:58 +0200 [thread overview]
Message-ID: <cover.1683212362.git.pabeni@redhat.com> (raw)
This is a follow up to the topic discussed in recent pubblic mtg.
Introduces unique id for accurate subflow stats tracking and
aggregate mptcp counters, plus some minimal self-tests.
The tests themself do not take in account support for running on
older kernel.
This is on top of "selftests: mptcp: centralize stats dumping" -
that is should land not on top of the current export branch head.
That in turn will cause some non trivial conflicts with:
"mptcp: use get_retrans wrapper"
the resolution should like the following (for brevity only reporting
the lines affected by the conflict resolution)
---
@@ -2574,16 +2569,17 @@ static void mptcp_check_fastclose(struct mptcp_sock *msk)
static void __mptcp_retrans(struct sock *sk)
{
struct mptcp_sock *msk = mptcp_sk(sk);
+ struct mptcp_subflow_context *subflow;
struct mptcp_sendmsg_info info = {};
struct mptcp_data_frag *dfrag;
- size_t copied = 0;
+ u16 already_sent, len = 0;
struct sock *ssk;
- int ret;
+ int ret, err;
// ...
@@ -2602,32 +2598,48 @@ static void __mptcp_retrans(struct sock *sk)
// ...
- release_sock(ssk);
+ already_send = max(dfrag->already_sent, len);
+ msk->bytes_retrans += already_sent - dfrag->alread_sent;
+ dfrag->already_sent = already_sent;
// ...
Paolo Abeni (4):
mptcp: add subflow unique id
mptcp: move snd_una update earlier for fallback socket.
mptcp: track some aggregate data counters.
selftests: mptcp: explicitly tests aggregate countes
include/uapi/linux/mptcp.h | 8 +++++++
net/mptcp/options.c | 14 ++++++++++-
net/mptcp/protocol.c | 20 ++++++++++------
net/mptcp/protocol.h | 9 +++++++-
net/mptcp/sockopt.c | 23 +++++++++++++++----
.../selftests/net/mptcp/mptcp_sockopt.c | 20 ++++++++++++++++
6 files changed, 80 insertions(+), 14 deletions(-)
--
2.40.0
next reply other threads:[~2023-05-04 16:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-04 16:39 Paolo Abeni [this message]
2023-05-04 16:39 ` [PATCH mptcp-next 1/4] mptcp: add subflow unique id Paolo Abeni
2023-05-17 14:25 ` Matthieu Baerts
2023-05-18 14:25 ` Paolo Abeni
2023-05-04 16:40 ` [PATCH mptcp-next 2/4] mptcp: move snd_una update earlier for fallback socket Paolo Abeni
2023-05-04 16:40 ` [PATCH mptcp-next 3/4] mptcp: track some aggregate data counters Paolo Abeni
2023-05-17 14:26 ` Matthieu Baerts
2023-05-18 14:17 ` Paolo Abeni
2023-05-19 9:18 ` Matthieu Baerts
2023-05-04 16:40 ` [PATCH mptcp-next 4/4] selftests: mptcp: explicitly tests aggregate countes Paolo Abeni
2023-05-17 14:27 ` Matthieu Baerts
2023-05-17 14:24 ` [PATCH mptcp-next 0/4] mptcp: add some more diag info Matthieu Baerts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1683212362.git.pabeni@redhat.com \
--to=pabeni@redhat.com \
--cc=mptcp@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.