* [PATCH mptcp-next 0/2] dump infinite_map in trace event
@ 2022-02-14 6:23 Geliang Tang
2022-02-14 6:23 ` [PATCH mptcp-next 1/2] mptcp: dump infinite_map field in mptcp_dump_mpext Geliang Tang
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Geliang Tang @ 2022-02-14 6:23 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Small patches for dumping newly added infinite_map in trace event.
Geliang Tang (2):
mptcp: dump infinite_map field in mptcp_dump_mpext
mptcp: add tracepoint in mptcp_sendmsg_frag
include/trace/events/mptcp.h | 10 ++++++++--
net/mptcp/protocol.c | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH mptcp-next 1/2] mptcp: dump infinite_map field in mptcp_dump_mpext
2022-02-14 6:23 [PATCH mptcp-next 0/2] dump infinite_map in trace event Geliang Tang
@ 2022-02-14 6:23 ` Geliang Tang
2022-02-14 6:23 ` [PATCH mptcp-next 2/2] mptcp: add tracepoint in mptcp_sendmsg_frag Geliang Tang
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Geliang Tang @ 2022-02-14 6:23 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
In trace event class mptcp_dump_mpext, dump the newly added infinite_map
field of struct mptcp_dump_mpext too.
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
include/trace/events/mptcp.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/trace/events/mptcp.h b/include/trace/events/mptcp.h
index 6bf43176f14c..b4175a52bdb2 100644
--- a/include/trace/events/mptcp.h
+++ b/include/trace/events/mptcp.h
@@ -84,6 +84,7 @@ DECLARE_EVENT_CLASS(mptcp_dump_mpext,
__field(u8, reset_transient)
__field(u8, reset_reason)
__field(u8, csum_reqd)
+ __field(u8, infinite_map)
),
TP_fast_assign(
@@ -102,9 +103,10 @@ DECLARE_EVENT_CLASS(mptcp_dump_mpext,
__entry->reset_transient = mpext->reset_transient;
__entry->reset_reason = mpext->reset_reason;
__entry->csum_reqd = mpext->csum_reqd;
+ __entry->infinite_map = mpext->infinite_map;
),
- TP_printk("data_ack=%llu data_seq=%llu subflow_seq=%u data_len=%u csum=%x use_map=%u dsn64=%u data_fin=%u use_ack=%u ack64=%u mpc_map=%u frozen=%u reset_transient=%u reset_reason=%u csum_reqd=%u",
+ TP_printk("data_ack=%llu data_seq=%llu subflow_seq=%u data_len=%u csum=%x use_map=%u dsn64=%u data_fin=%u use_ack=%u ack64=%u mpc_map=%u frozen=%u reset_transient=%u reset_reason=%u csum_reqd=%u infinite_map=%u",
__entry->data_ack, __entry->data_seq,
__entry->subflow_seq, __entry->data_len,
__entry->csum, __entry->use_map,
@@ -112,7 +114,7 @@ DECLARE_EVENT_CLASS(mptcp_dump_mpext,
__entry->use_ack, __entry->ack64,
__entry->mpc_map, __entry->frozen,
__entry->reset_transient, __entry->reset_reason,
- __entry->csum_reqd)
+ __entry->csum_reqd, __entry->infinite_map)
);
DEFINE_EVENT(mptcp_dump_mpext, get_mapping_status,
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH mptcp-next 2/2] mptcp: add tracepoint in mptcp_sendmsg_frag
2022-02-14 6:23 [PATCH mptcp-next 0/2] dump infinite_map in trace event Geliang Tang
2022-02-14 6:23 ` [PATCH mptcp-next 1/2] mptcp: dump infinite_map field in mptcp_dump_mpext Geliang Tang
@ 2022-02-14 6:23 ` Geliang Tang
2022-02-15 1:44 ` [PATCH mptcp-next 0/2] dump infinite_map in trace event Mat Martineau
2022-02-15 10:00 ` Matthieu Baerts
3 siblings, 0 replies; 5+ messages in thread
From: Geliang Tang @ 2022-02-14 6:23 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
The tracepoint in get_mapping_status() only dumped the incoming mpext
fields. This patch added a new tracepoint in mptcp_sendmsg_frag() to dump
the outgoing mpext too.
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
include/trace/events/mptcp.h | 4 ++++
net/mptcp/protocol.c | 1 +
2 files changed, 5 insertions(+)
diff --git a/include/trace/events/mptcp.h b/include/trace/events/mptcp.h
index b4175a52bdb2..563e48617374 100644
--- a/include/trace/events/mptcp.h
+++ b/include/trace/events/mptcp.h
@@ -117,6 +117,10 @@ DECLARE_EVENT_CLASS(mptcp_dump_mpext,
__entry->csum_reqd, __entry->infinite_map)
);
+DEFINE_EVENT(mptcp_dump_mpext, mptcp_sendmsg_frag,
+ TP_PROTO(struct mptcp_ext *mpext),
+ TP_ARGS(mpext));
+
DEFINE_EVENT(mptcp_dump_mpext, get_mapping_status,
TP_PROTO(struct mptcp_ext *mpext),
TP_ARGS(mpext));
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 3324e1c61576..4599bde215b2 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1371,6 +1371,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk,
mptcp_update_data_checksum(skb, copy);
if (mptcp_subflow_ctx(ssk)->send_infinite_map)
mptcp_update_infinite_map(msk, ssk, mpext);
+ trace_mptcp_sendmsg_frag(mpext);
mptcp_subflow_ctx(ssk)->rel_write_seq += copy;
return copy;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH mptcp-next 0/2] dump infinite_map in trace event
2022-02-14 6:23 [PATCH mptcp-next 0/2] dump infinite_map in trace event Geliang Tang
2022-02-14 6:23 ` [PATCH mptcp-next 1/2] mptcp: dump infinite_map field in mptcp_dump_mpext Geliang Tang
2022-02-14 6:23 ` [PATCH mptcp-next 2/2] mptcp: add tracepoint in mptcp_sendmsg_frag Geliang Tang
@ 2022-02-15 1:44 ` Mat Martineau
2022-02-15 10:00 ` Matthieu Baerts
3 siblings, 0 replies; 5+ messages in thread
From: Mat Martineau @ 2022-02-15 1:44 UTC (permalink / raw)
To: Geliang Tang; +Cc: mptcp
On Mon, 14 Feb 2022, Geliang Tang wrote:
> Small patches for dumping newly added infinite_map in trace event.
>
> Geliang Tang (2):
> mptcp: dump infinite_map field in mptcp_dump_mpext
> mptcp: add tracepoint in mptcp_sendmsg_frag
>
> include/trace/events/mptcp.h | 10 ++++++++--
> net/mptcp/protocol.c | 1 +
> 2 files changed, 9 insertions(+), 2 deletions(-)
>
Thanks Geliang, I tried out the trace events and all worked as expected
for both mptcp_sendmsg_frag and get_mapping_status events with
infinite_map output.
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH mptcp-next 0/2] dump infinite_map in trace event
2022-02-14 6:23 [PATCH mptcp-next 0/2] dump infinite_map in trace event Geliang Tang
` (2 preceding siblings ...)
2022-02-15 1:44 ` [PATCH mptcp-next 0/2] dump infinite_map in trace event Mat Martineau
@ 2022-02-15 10:00 ` Matthieu Baerts
3 siblings, 0 replies; 5+ messages in thread
From: Matthieu Baerts @ 2022-02-15 10:00 UTC (permalink / raw)
To: Geliang Tang, mptcp
Hi Geliang, Mat,
On 14/02/2022 07:23, Geliang Tang wrote:
> Small patches for dumping newly added infinite_map in trace event.
>
> Geliang Tang (2):
> mptcp: dump infinite_map field in mptcp_dump_mpext
> mptcp: add tracepoint in mptcp_sendmsg_frag
Thank you for the patches and the reviews!
Just applied in our tree -- feat. for net-next, just after your infinite
mapping series as the first patch is linked to that -- with Mat's RvB tag:
- c1def824105b: mptcp: dump infinite_map field in mptcp_dump_mpext
- d40888c52c52: mptcp: add tracepoint in mptcp_sendmsg_frag
- Results: 49fef9d3e44a..19d141cf146b
Builds and tests are now in progress:
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220215T100005
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-02-15 10:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-14 6:23 [PATCH mptcp-next 0/2] dump infinite_map in trace event Geliang Tang
2022-02-14 6:23 ` [PATCH mptcp-next 1/2] mptcp: dump infinite_map field in mptcp_dump_mpext Geliang Tang
2022-02-14 6:23 ` [PATCH mptcp-next 2/2] mptcp: add tracepoint in mptcp_sendmsg_frag Geliang Tang
2022-02-15 1:44 ` [PATCH mptcp-next 0/2] dump infinite_map in trace event Mat Martineau
2022-02-15 10:00 ` Matthieu Baerts
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.