mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-10 00:57:02 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: quic: Move traces at proto level

Browse Source 
These traces has already been useful to debug issues.

Must be backported to 2.7 and 2.6.
This commit is contained in:
Frédéric Lécaille 2023-04-24 10:59:33 +02:00
parent 3b50e5c164
commit e95e00e305
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/quic_conn.c
View File

@ -507,6 +507,7 @@ static void quic_trace(enum trace_level level, uint64_t mask, const struct trace
if (mask & QUIC_EV_CONN_PHPKTS) { if (mask & QUIC_EV_CONN_PHPKTS) {
const struct quic_enc_level *qel = a2; const struct quic_enc_level *qel = a2;
const struct list *l = a3;
if (qel) { if (qel) {
const struct quic_pktns *pktns = qel->pktns; const struct quic_pktns *pktns = qel->pktns;
@ -524,6 +525,14 @@ static void quic_trace(enum trace_level level, uint64_t mask, const struct trace
pktns->tx.pto_probe, pktns->tx.pto_probe,
qel->cstream ? (unsigned long long)qel->cstream->rx.offset : 0); qel->cstream ? (unsigned long long)qel->cstream->rx.offset : 0);
} }
if (l) {
const struct quic_frame *frm;
list_for_each_entry(frm, l, list) {
chunk_appendf(&trace_buf, " frm@%p", frm);
chunk_frm_appendf(&trace_buf, frm);
}
}
} }
if (mask & QUIC_EV_CONN_ENCPKT) { if (mask & QUIC_EV_CONN_ENCPKT) {
@ -3456,7 +3465,7 @@ static int qc_prep_app_pkts(struct quic_conn *qc, struct buffer *buf,
while (b_contig_space(buf) >= (int)qc->path->mtu + dg_headlen) { while (b_contig_space(buf) >= (int)qc->path->mtu + dg_headlen) {
int err, probe, cc, must_ack; int err, probe, cc, must_ack;
TRACE_PROTO("TX prep app pkts", QUIC_EV_CONN_PHPKTS, qc, qel); TRACE_PROTO("TX prep app pkts", QUIC_EV_CONN_PHPKTS, qc, qel, frms);
probe = 0; probe = 0;
cc = qc->flags & QUIC_FL_CONN_IMMEDIATE_CLOSE; cc = qc->flags & QUIC_FL_CONN_IMMEDIATE_CLOSE;
/* We do not probe if an immediate close was asked */ /* We do not probe if an immediate close was asked */
@ -4731,7 +4740,7 @@ static forceinline int qc_send_app_probing(struct quic_conn *qc,
TRACE_ENTER(QUIC_EV_CONN_TXPKT, qc); TRACE_ENTER(QUIC_EV_CONN_TXPKT, qc);
TRACE_STATE("preparing old data (probing)", QUIC_EV_CONN_TXPKT, qc); TRACE_PROTO("preparing old data (probing)", QUIC_EV_CONN_FRMLIST, qc, frms);
qc->flags |= QUIC_FL_CONN_RETRANS_OLD_DATA; qc->flags |= QUIC_FL_CONN_RETRANS_OLD_DATA;
ret = qc_send_app_pkts(qc, frms); ret = qc_send_app_pkts(qc, frms);
qc->flags &= ~QUIC_FL_CONN_RETRANS_OLD_DATA; qc->flags &= ~QUIC_FL_CONN_RETRANS_OLD_DATA;
@ -7812,7 +7821,7 @@ static int qc_do_build_pkt(unsigned char *pos, const unsigned char *end,
if (!cc && !LIST_ISEMPTY(frms)) { if (!cc && !LIST_ISEMPTY(frms)) {
ssize_t room = end - pos; ssize_t room = end - pos;
TRACE_DEVEL("Avail. ack eliciting frames", QUIC_EV_CONN_FRMLIST, qc, frms); TRACE_PROTO("Avail. ack eliciting frames", QUIC_EV_CONN_FRMLIST, qc, frms);
/* Initialize the length of the frames built below to <len>. /* Initialize the length of the frames built below to <len>.
* If any frame could be successfully built by qc_build_frms(), * If any frame could be successfully built by qc_build_frms(),
* we will have len_frms > len. * we will have len_frms > len.
@ -7820,7 +7829,7 @@ static int qc_do_build_pkt(unsigned char *pos, const unsigned char *end,
len_frms = len; len_frms = len;
if (!qc_build_frms(&frm_list, frms, if (!qc_build_frms(&frm_list, frms,
end - pos, &len_frms, pos - beg, qel, qc)) { end - pos, &len_frms, pos - beg, qel, qc)) {
TRACE_DEVEL("Not enough room", QUIC_EV_CONN_TXPKT, TRACE_PROTO("Not enough room", QUIC_EV_CONN_TXPKT,
qc, NULL, NULL, &room); qc, NULL, NULL, &room);
if (!ack_frm_len && !qel->pktns->tx.pto_probe) if (!ack_frm_len && !qel->pktns->tx.pto_probe)
goto no_room; goto no_room;
@ -7919,7 +7928,7 @@ static int qc_do_build_pkt(unsigned char *pos, const unsigned char *end,
list_for_each_entry_safe(cf, tmp_cf, &frm_list, list) { list_for_each_entry_safe(cf, tmp_cf, &frm_list, list) {
if (!qc_build_frm(&pos, end, cf, pkt, qc)) { if (!qc_build_frm(&pos, end, cf, pkt, qc)) {
ssize_t room = end - pos; ssize_t room = end - pos;
TRACE_DEVEL("Not enough room", QUIC_EV_CONN_TXPKT, TRACE_PROTO("Not enough room", QUIC_EV_CONN_TXPKT,
qc, NULL, NULL, &room); qc, NULL, NULL, &room);
/* Note that <cf> was added from <frms> to <frm_list> list by /* Note that <cf> was added from <frms> to <frm_list> list by
* qc_build_frms(). * qc_build_frms().
@ -7959,7 +7968,7 @@ static int qc_do_build_pkt(unsigned char *pos, const unsigned char *end,
if (pos == payload) { if (pos == payload) {
/* No payload was built because of congestion control */ /* No payload was built because of congestion control */
TRACE_DEVEL("limited by congestion control", QUIC_EV_CONN_TXPKT, qc); TRACE_PROTO("limited by congestion control", QUIC_EV_CONN_TXPKT, qc);
goto no_room; goto no_room;
} }
@ -7974,7 +7983,7 @@ static int qc_do_build_pkt(unsigned char *pos, const unsigned char *end,
LIST_SPLICE(&pkt->frms, &frm_list); LIST_SPLICE(&pkt->frms, &frm_list);
ret = 1; ret = 1;
TRACE_DEVEL("Packet ack-eliciting frames", QUIC_EV_CONN_TXPKT, qc, pkt); TRACE_PROTO("Packet ack-eliciting frames", QUIC_EV_CONN_TXPKT, qc, pkt);
leave: leave:
TRACE_LEAVE(QUIC_EV_CONN_TXPKT, qc); TRACE_LEAVE(QUIC_EV_CONN_TXPKT, qc);
return ret; return ret;
@ -7982,7 +7991,7 @@ static int qc_do_build_pkt(unsigned char *pos, const unsigned char *end,
no_room: no_room:
/* Replace the pre-built frames which could not be add to this packet */ /* Replace the pre-built frames which could not be add to this packet */
LIST_SPLICE(frms, &frm_list); LIST_SPLICE(frms, &frm_list);
TRACE_DEVEL("Remaining ack-eliciting frames", QUIC_EV_CONN_FRMLIST, qc, frms); TRACE_PROTO("Remaining ack-eliciting frames", QUIC_EV_CONN_FRMLIST, qc, frms);
goto leave; goto leave;
} }