* [PATCH iproute2-next] ss: mptcp: print out last time counters
@ 2024-04-12 8:19 Matthieu Baerts (NGI0)
2024-04-13 16:45 ` David Ahern
0 siblings, 1 reply; 3+ messages in thread
From: Matthieu Baerts (NGI0) @ 2024-04-12 8:19 UTC (permalink / raw)
To: David Ahern
Cc: netdev, mptcp, Stephen Hemminger, Mat Martineau, Geliang Tang,
Matthieu Baerts (NGI0)
From: Geliang Tang <geliang@kernel.org>
Three new "last time" counters have been added to "struct mptcp_info":
last_data_sent, last_data_recv and last_ack_recv. They have been added
in commit 18d82cde7432 ("mptcp: add last time fields in mptcp_info") in
net-next recently.
This patch prints out these new counters into mptcp_stats output in ss.
Signed-off-by: Geliang Tang <geliang@kernel.org>
Acked-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
include/uapi/linux/mptcp.h | 4 ++++
misc/ss.c | 6 ++++++
2 files changed, 10 insertions(+)
diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h
index c2e6f3be..a0da2632 100644
--- a/include/uapi/linux/mptcp.h
+++ b/include/uapi/linux/mptcp.h
@@ -56,6 +56,10 @@ struct mptcp_info {
__u64 mptcpi_bytes_received;
__u64 mptcpi_bytes_acked;
__u8 mptcpi_subflows_total;
+ __u8 reserved[3];
+ __u32 mptcpi_last_data_sent;
+ __u32 mptcpi_last_data_recv;
+ __u32 mptcpi_last_ack_recv;
};
/* MPTCP Reset reason codes, rfc8684 */
diff --git a/misc/ss.c b/misc/ss.c
index 87008d7c..81b813c1 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -3279,6 +3279,12 @@ static void mptcp_stats_print(struct mptcp_info *s)
out(" bytes_acked:%llu", s->mptcpi_bytes_acked);
if (s->mptcpi_subflows_total)
out(" subflows_total:%u", s->mptcpi_subflows_total);
+ if (s->mptcpi_last_data_sent)
+ out(" last_data_sent:%u", s->mptcpi_last_data_sent);
+ if (s->mptcpi_last_data_recv)
+ out(" last_data_recv:%u", s->mptcpi_last_data_recv);
+ if (s->mptcpi_last_ack_recv)
+ out(" last_ack_recv:%u", s->mptcpi_last_ack_recv);
}
static void mptcp_show_info(const struct nlmsghdr *nlh, struct inet_diag_msg *r,
---
base-commit: 7a6d30c95da98fbb375e7f1520fad34c1e959441
change-id: 20240412-upstream-iproute2-next-20240412-mptcp-last-time-info-da09da8beacc
Best regards,
--
Matthieu Baerts (NGI0) <matttbe@kernel.org>
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH iproute2-next] ss: mptcp: print out last time counters
2024-04-12 8:19 [PATCH iproute2-next] ss: mptcp: print out last time counters Matthieu Baerts (NGI0)
@ 2024-04-13 16:45 ` David Ahern
2024-04-16 7:36 ` Matthieu Baerts
0 siblings, 1 reply; 3+ messages in thread
From: David Ahern @ 2024-04-13 16:45 UTC (permalink / raw)
To: Matthieu Baerts (NGI0)
Cc: netdev, mptcp, Stephen Hemminger, Mat Martineau, Geliang Tang
On 4/12/24 2:19 AM, Matthieu Baerts (NGI0) wrote:
> From: Geliang Tang <geliang@kernel.org>
>
> Three new "last time" counters have been added to "struct mptcp_info":
> last_data_sent, last_data_recv and last_ack_recv. They have been added
> in commit 18d82cde7432 ("mptcp: add last time fields in mptcp_info") in
> net-next recently.
>
> This patch prints out these new counters into mptcp_stats output in ss.
>
> Signed-off-by: Geliang Tang <geliang@kernel.org>
> Acked-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> ---
> include/uapi/linux/mptcp.h | 4 ++++
> misc/ss.c | 6 ++++++
> 2 files changed, 10 insertions(+)
>
> diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h
> index c2e6f3be..a0da2632 100644
> --- a/include/uapi/linux/mptcp.h
> +++ b/include/uapi/linux/mptcp.h
uapi headers are synced using scripts, meaning at best uapi updates
should be a separate patch (the updates can also be omitted).
> @@ -56,6 +56,10 @@ struct mptcp_info {
> __u64 mptcpi_bytes_received;
> __u64 mptcpi_bytes_acked;
> __u8 mptcpi_subflows_total;
> + __u8 reserved[3];
> + __u32 mptcpi_last_data_sent;
> + __u32 mptcpi_last_data_recv;
> + __u32 mptcpi_last_ack_recv;
> };
>
> /* MPTCP Reset reason codes, rfc8684 */
> diff --git a/misc/ss.c b/misc/ss.c
> index 87008d7c..81b813c1 100644
> --- a/misc/ss.c
> +++ b/misc/ss.c
> @@ -3279,6 +3279,12 @@ static void mptcp_stats_print(struct mptcp_info *s)
> out(" bytes_acked:%llu", s->mptcpi_bytes_acked);
> if (s->mptcpi_subflows_total)
> out(" subflows_total:%u", s->mptcpi_subflows_total);
> + if (s->mptcpi_last_data_sent)
> + out(" last_data_sent:%u", s->mptcpi_last_data_sent);
> + if (s->mptcpi_last_data_recv)
> + out(" last_data_recv:%u", s->mptcpi_last_data_recv);
> + if (s->mptcpi_last_ack_recv)
> + out(" last_ack_recv:%u", s->mptcpi_last_ack_recv);
> }
>
applied to iproute2-next
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH iproute2-next] ss: mptcp: print out last time counters
2024-04-13 16:45 ` David Ahern
@ 2024-04-16 7:36 ` Matthieu Baerts
0 siblings, 0 replies; 3+ messages in thread
From: Matthieu Baerts @ 2024-04-16 7:36 UTC (permalink / raw)
To: David Ahern; +Cc: netdev, mptcp, Stephen Hemminger, Mat Martineau, Geliang Tang
Hi David,
On 13/04/2024 18:45, David Ahern wrote:
> On 4/12/24 2:19 AM, Matthieu Baerts (NGI0) wrote:
>> From: Geliang Tang <geliang@kernel.org>
>>
>> Three new "last time" counters have been added to "struct mptcp_info":
>> last_data_sent, last_data_recv and last_ack_recv. They have been added
>> in commit 18d82cde7432 ("mptcp: add last time fields in mptcp_info") in
>> net-next recently.
>>
>> This patch prints out these new counters into mptcp_stats output in ss.
>>
>> Signed-off-by: Geliang Tang <geliang@kernel.org>
>> Acked-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
>> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
>> ---
>> include/uapi/linux/mptcp.h | 4 ++++
>> misc/ss.c | 6 ++++++
>> 2 files changed, 10 insertions(+)
>>
>> diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h
>> index c2e6f3be..a0da2632 100644
>> --- a/include/uapi/linux/mptcp.h
>> +++ b/include/uapi/linux/mptcp.h
>
> uapi headers are synced using scripts, meaning at best uapi updates
> should be a separate patch (the updates can also be omitted).
Sorry for that, I didn't know. Thank you for the explanation, noted!
>> @@ -56,6 +56,10 @@ struct mptcp_info {
>> __u64 mptcpi_bytes_received;
>> __u64 mptcpi_bytes_acked;
>> __u8 mptcpi_subflows_total;
>> + __u8 reserved[3];
>> + __u32 mptcpi_last_data_sent;
>> + __u32 mptcpi_last_data_recv;
>> + __u32 mptcpi_last_ack_recv;
>> };
>>
>> /* MPTCP Reset reason codes, rfc8684 */
>> diff --git a/misc/ss.c b/misc/ss.c
>> index 87008d7c..81b813c1 100644
>> --- a/misc/ss.c
>> +++ b/misc/ss.c
>> @@ -3279,6 +3279,12 @@ static void mptcp_stats_print(struct mptcp_info *s)
>> out(" bytes_acked:%llu", s->mptcpi_bytes_acked);
>> if (s->mptcpi_subflows_total)
>> out(" subflows_total:%u", s->mptcpi_subflows_total);
>> + if (s->mptcpi_last_data_sent)
>> + out(" last_data_sent:%u", s->mptcpi_last_data_sent);
>> + if (s->mptcpi_last_data_recv)
>> + out(" last_data_recv:%u", s->mptcpi_last_data_recv);
>> + if (s->mptcpi_last_ack_recv)
>> + out(" last_ack_recv:%u", s->mptcpi_last_ack_recv);
>> }
>>
>
> applied to iproute2-next
Thank you!
Cheers,
Matt
--
Sponsored by the NGI0 Core fund.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-16 7:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-12 8:19 [PATCH iproute2-next] ss: mptcp: print out last time counters Matthieu Baerts (NGI0)
2024-04-13 16:45 ` David Ahern
2024-04-16 7:36 ` Matthieu Baerts
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).