mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
b6a66e521a
The 'mptcp_subflow_context' structure has two items related to the
backup flags:
- 'backup': the subflow has been marked as backup by the other peer
- 'request_bkup': the backup flag has been set by the host
Before this patch, the scheduler was only looking at the 'backup' flag.
That can make sense in some cases, but it looks like that's not what we
wanted for the general use, because either the path-manager was setting
both of them when sending an MP_PRIO, or the receiver was duplicating
the 'backup' flag in the subflow request.
Note that the use of these two flags in the path-manager are going to be
fixed in the next commits, but this change here is needed not to modify
the behaviour.
Fixes: f296234c98
("mptcp: Add handling of incoming MP_JOIN requests")
Cc: stable@vger.kernel.org
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
185 lines
4.7 KiB
C
185 lines
4.7 KiB
C
/* 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>
|
|
|
|
#define show_mapping_status(status) \
|
|
__print_symbolic(status, \
|
|
{ 0, "MAPPING_OK" }, \
|
|
{ 1, "MAPPING_INVALID" }, \
|
|
{ 2, "MAPPING_EMPTY" }, \
|
|
{ 3, "MAPPING_DATA_FIN" }, \
|
|
{ 4, "MAPPING_DUMMY" })
|
|
|
|
TRACE_EVENT(mptcp_subflow_get_send,
|
|
|
|
TP_PROTO(struct mptcp_subflow_context *subflow),
|
|
|
|
TP_ARGS(subflow),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(bool, active)
|
|
__field(bool, free)
|
|
__field(u32, snd_wnd)
|
|
__field(u32, pace)
|
|
__field(u8, backup)
|
|
__field(u64, ratio)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
struct sock *ssk;
|
|
|
|
__entry->active = mptcp_subflow_active(subflow);
|
|
__entry->backup = subflow->backup || subflow->request_bkup;
|
|
|
|
if (subflow->tcp_sock && sk_fullsock(subflow->tcp_sock))
|
|
__entry->free = sk_stream_memory_free(subflow->tcp_sock);
|
|
else
|
|
__entry->free = 0;
|
|
|
|
ssk = mptcp_subflow_tcp_sock(subflow);
|
|
if (ssk && sk_fullsock(ssk)) {
|
|
__entry->snd_wnd = tcp_sk(ssk)->snd_wnd;
|
|
__entry->pace = READ_ONCE(ssk->sk_pacing_rate);
|
|
} else {
|
|
__entry->snd_wnd = 0;
|
|
__entry->pace = 0;
|
|
}
|
|
|
|
if (ssk && sk_fullsock(ssk) && __entry->pace)
|
|
__entry->ratio = div_u64((u64)ssk->sk_wmem_queued << 32, __entry->pace);
|
|
else
|
|
__entry->ratio = 0;
|
|
),
|
|
|
|
TP_printk("active=%d free=%d snd_wnd=%u pace=%u backup=%u ratio=%llu",
|
|
__entry->active, __entry->free,
|
|
__entry->snd_wnd, __entry->pace,
|
|
__entry->backup, __entry->ratio)
|
|
);
|
|
|
|
DECLARE_EVENT_CLASS(mptcp_dump_mpext,
|
|
|
|
TP_PROTO(struct mptcp_ext *mpext),
|
|
|
|
TP_ARGS(mpext),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(u64, data_ack)
|
|
__field(u64, data_seq)
|
|
__field(u32, subflow_seq)
|
|
__field(u16, data_len)
|
|
__field(u16, csum)
|
|
__field(u8, use_map)
|
|
__field(u8, dsn64)
|
|
__field(u8, data_fin)
|
|
__field(u8, use_ack)
|
|
__field(u8, ack64)
|
|
__field(u8, mpc_map)
|
|
__field(u8, frozen)
|
|
__field(u8, reset_transient)
|
|
__field(u8, reset_reason)
|
|
__field(u8, csum_reqd)
|
|
__field(u8, infinite_map)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->data_ack = mpext->ack64 ? mpext->data_ack : mpext->data_ack32;
|
|
__entry->data_seq = mpext->data_seq;
|
|
__entry->subflow_seq = mpext->subflow_seq;
|
|
__entry->data_len = mpext->data_len;
|
|
__entry->csum = (__force u16)mpext->csum;
|
|
__entry->use_map = mpext->use_map;
|
|
__entry->dsn64 = mpext->dsn64;
|
|
__entry->data_fin = mpext->data_fin;
|
|
__entry->use_ack = mpext->use_ack;
|
|
__entry->ack64 = mpext->ack64;
|
|
__entry->mpc_map = mpext->mpc_map;
|
|
__entry->frozen = mpext->frozen;
|
|
__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 infinite_map=%u",
|
|
__entry->data_ack, __entry->data_seq,
|
|
__entry->subflow_seq, __entry->data_len,
|
|
__entry->csum, __entry->use_map,
|
|
__entry->dsn64, __entry->data_fin,
|
|
__entry->use_ack, __entry->ack64,
|
|
__entry->mpc_map, __entry->frozen,
|
|
__entry->reset_transient, __entry->reset_reason,
|
|
__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));
|
|
|
|
TRACE_EVENT(ack_update_msk,
|
|
|
|
TP_PROTO(u64 data_ack, u64 old_snd_una,
|
|
u64 new_snd_una, u64 new_wnd_end,
|
|
u64 msk_wnd_end),
|
|
|
|
TP_ARGS(data_ack, old_snd_una,
|
|
new_snd_una, new_wnd_end,
|
|
msk_wnd_end),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(u64, data_ack)
|
|
__field(u64, old_snd_una)
|
|
__field(u64, new_snd_una)
|
|
__field(u64, new_wnd_end)
|
|
__field(u64, msk_wnd_end)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->data_ack = data_ack;
|
|
__entry->old_snd_una = old_snd_una;
|
|
__entry->new_snd_una = new_snd_una;
|
|
__entry->new_wnd_end = new_wnd_end;
|
|
__entry->msk_wnd_end = msk_wnd_end;
|
|
),
|
|
|
|
TP_printk("data_ack=%llu old_snd_una=%llu new_snd_una=%llu new_wnd_end=%llu msk_wnd_end=%llu",
|
|
__entry->data_ack, __entry->old_snd_una,
|
|
__entry->new_snd_una, __entry->new_wnd_end,
|
|
__entry->msk_wnd_end)
|
|
);
|
|
|
|
TRACE_EVENT(subflow_check_data_avail,
|
|
|
|
TP_PROTO(__u8 status, struct sk_buff *skb),
|
|
|
|
TP_ARGS(status, skb),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(u8, status)
|
|
__field(const void *, skb)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->status = status;
|
|
__entry->skb = skb;
|
|
),
|
|
|
|
TP_printk("mapping_status=%s, skb=%p",
|
|
show_mapping_status(__entry->status),
|
|
__entry->skb)
|
|
);
|
|
|
|
#endif /* _TRACE_MPTCP_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|