| Message ID | 38cfc37b362365f951585f9fda3031896f734e01.1613978710.git.geliangtang@gmail.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | Paolo Abeni |
| Headers | show |
| Series | add tracepoints | expand |
On Mon, 2021-02-22 at 15:30 +0800, Geliang Tang wrote: > This patch added the tracepoint for the packet scheduler function > mptcp_subflow_get_send. > > Signed-off-by: Geliang Tang <geliangtang@gmail.com> > --- > include/trace/events/mptcp.h | 45 ++++++++++++++++++++++++++++++++++++ > net/mptcp/protocol.c | 9 +++++--- > 2 files changed, 51 insertions(+), 3 deletions(-) > create mode 100644 include/trace/events/mptcp.h > > diff --git a/include/trace/events/mptcp.h b/include/trace/events/mptcp.h > new file mode 100644 > index 000000000000..b36b308f48e2 > --- /dev/null > +++ b/include/trace/events/mptcp.h > @@ -0,0 +1,45 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +#undef TRACE_SYSTEM > +#define TRACE_SYSTEM mptcp > + > +#if !defined(_TRACE_MPTCP_H) || defined(TRACE_HEADER_MULTI_READ) > +#define _TRACE_MPTCP_H > + > +#include <linux/tracepoint.h> > + > +TRACE_EVENT(mptcp_subflow_get_send, > + > + TP_PROTO(struct mptcp_sock *msk, int nr_active, > + struct sock *ssk_0, u64 ratio_0, > + struct sock *ssk_1, u64 ratio_1), > + > + TP_ARGS(msk, nr_active, ssk_0, ratio_0, ssk_1, ratio_1), > + > + TP_STRUCT__entry( > + __field(const void *, msk) > + __field(__u32, nr_active) > + __field(const void *, ssk_0) > + __field(__u64, ratio_0) > + __field(const void *, ssk_1) > + __field(__u64, ratio_1) > + ), > + > + TP_fast_assign( > + __entry->msk = msk; > + __entry->nr_active = nr_active; > + __entry->ssk_0 = ssk_0; > + __entry->ratio_0 = ratio_0; > + __entry->ssk_1 = ssk_1; > + __entry->ratio_1 = ratio_1; > + ), > + > + TP_printk("msk=%p nr_active=%d ssk=%p:%lld backup=%p:%lld", > + __entry->msk, __entry->nr_active, > + __entry->ssk_0, __entry->ratio_0, > + __entry->ssk_1, __entry->ratio_1) > +); > + > +#endif /* _TRACE_MPTCP_H */ > + > +/* This part must be outside protection */ > +#include <trace/define_trace.h> > diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c > index ec808187fa0e..dff3f8c96c5d 100644 > --- a/net/mptcp/protocol.c > +++ b/net/mptcp/protocol.c > @@ -27,6 +27,9 @@ > #include "protocol.h" > #include "mib.h" > > +#define CREATE_TRACE_POINTS > +#include <trace/events/mptcp.h> > + > #if IS_ENABLED(CONFIG_MPTCP_IPV6) > struct mptcp6_sock { > struct mptcp_sock msk; > @@ -1418,9 +1421,9 @@ static struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk) > } > } > > - pr_debug("msk=%p nr_active=%d ssk=%p:%lld backup=%p:%lld", > - msk, nr_active, send_info[0].ssk, send_info[0].ratio, > - send_info[1].ssk, send_info[1].ratio); > + trace_mptcp_subflow_get_send(msk, nr_active, > + send_info[0].ssk, send_info[0].ratio, > + send_info[1].ssk, send_info[1].ratio); I think it would be nice having a tracepoint inside the mptcp_subflow_get_send() main loop, dumping info for each subflow. It could receive as arguments subflow and ssk and dumping: mptcp_subflow_active(subflow) sk_stream_memory_free(subflow->tcp_sock) tcp_sk(ssk)->snd_wnd ssk->sk_pacing_rate subflow->backup (end ev. 'ratio', to be computed) so that we could track exactly why a given subflow was selected. 2 tracepoints here are possibly a bit too much. If so, I would keep the one inside the loop. Thanks! Paolo
diff --git a/include/trace/events/mptcp.h b/include/trace/events/mptcp.h new file mode 100644 index 000000000000..b36b308f48e2 --- /dev/null +++ b/include/trace/events/mptcp.h @@ -0,0 +1,45 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM mptcp + +#if !defined(_TRACE_MPTCP_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_MPTCP_H + +#include <linux/tracepoint.h> + +TRACE_EVENT(mptcp_subflow_get_send, + + TP_PROTO(struct mptcp_sock *msk, int nr_active, + struct sock *ssk_0, u64 ratio_0, + struct sock *ssk_1, u64 ratio_1), + + TP_ARGS(msk, nr_active, ssk_0, ratio_0, ssk_1, ratio_1), + + TP_STRUCT__entry( + __field(const void *, msk) + __field(__u32, nr_active) + __field(const void *, ssk_0) + __field(__u64, ratio_0) + __field(const void *, ssk_1) + __field(__u64, ratio_1) + ), + + TP_fast_assign( + __entry->msk = msk; + __entry->nr_active = nr_active; + __entry->ssk_0 = ssk_0; + __entry->ratio_0 = ratio_0; + __entry->ssk_1 = ssk_1; + __entry->ratio_1 = ratio_1; + ), + + TP_printk("msk=%p nr_active=%d ssk=%p:%lld backup=%p:%lld", + __entry->msk, __entry->nr_active, + __entry->ssk_0, __entry->ratio_0, + __entry->ssk_1, __entry->ratio_1) +); + +#endif /* _TRACE_MPTCP_H */ + +/* This part must be outside protection */ +#include <trace/define_trace.h> diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index ec808187fa0e..dff3f8c96c5d 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -27,6 +27,9 @@ #include "protocol.h" #include "mib.h" +#define CREATE_TRACE_POINTS +#include <trace/events/mptcp.h> + #if IS_ENABLED(CONFIG_MPTCP_IPV6) struct mptcp6_sock { struct mptcp_sock msk; @@ -1418,9 +1421,9 @@ static struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk) } } - pr_debug("msk=%p nr_active=%d ssk=%p:%lld backup=%p:%lld", - msk, nr_active, send_info[0].ssk, send_info[0].ratio, - send_info[1].ssk, send_info[1].ratio); + trace_mptcp_subflow_get_send(msk, nr_active, + send_info[0].ssk, send_info[0].ratio, + send_info[1].ssk, send_info[1].ratio); /* pick the best backup if no other subflow is active */ if (!nr_active)
This patch added the tracepoint for the packet scheduler function mptcp_subflow_get_send. Signed-off-by: Geliang Tang <geliangtang@gmail.com> --- include/trace/events/mptcp.h | 45 ++++++++++++++++++++++++++++++++++++ net/mptcp/protocol.c | 9 +++++--- 2 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 include/trace/events/mptcp.h