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: quid: Add traces quic_close() and quic_conn_io_cb()

Browse Source 
This is to have an idea of possible remaining issues regarding the
connection terminations.
This commit is contained in:
Frédéric Lécaille 2022-01-11 14:43:50 +01:00
parent 81cd3c8eed
commit ba85acdc70
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/xprt_quic-t.h
View File

@ -216,6 +216,8 @@ enum quic_pkt_type {
#define QUIC_EV_CONN_BCFRMS (1ULL << 36) #define QUIC_EV_CONN_BCFRMS (1ULL << 36)
#define QUIC_EV_CONN_XPRTSEND (1ULL << 37) #define QUIC_EV_CONN_XPRTSEND (1ULL << 37)
#define QUIC_EV_CONN_XPRTRECV (1ULL << 38) #define QUIC_EV_CONN_XPRTRECV (1ULL << 38)
#define QUIC_EV_CONN_FREED (1ULL << 39)
#define QUIC_EV_CONN_CLOSE (1ULL << 40)
/* Similar to kernel min()/max() definitions. */ /* Similar to kernel min()/max() definitions. */
#define QUIC_MIN(a, b) ({ \ #define QUIC_MIN(a, b) ({ \

8
src/xprt_quic.c
View File

@ -116,6 +116,8 @@ static const struct trace_event quic_trace_events[] = {
{ .mask = QUIC_EV_CONN_BCFRMS, .name = "bcfrms", .desc = "build CRYPTO data frames" }, { .mask = QUIC_EV_CONN_BCFRMS, .name = "bcfrms", .desc = "build CRYPTO data frames" },
{ .mask = QUIC_EV_CONN_XPRTSEND, .name = "xprt_send", .desc = "sending XRPT subscription" }, { .mask = QUIC_EV_CONN_XPRTSEND, .name = "xprt_send", .desc = "sending XRPT subscription" },
{ .mask = QUIC_EV_CONN_XPRTRECV, .name = "xprt_recv", .desc = "receiving XRPT subscription" }, { .mask = QUIC_EV_CONN_XPRTRECV, .name = "xprt_recv", .desc = "receiving XRPT subscription" },
{ .mask = QUIC_EV_CONN_FREED, .name = "conn_freed", .desc = "releasing conn. memory" },
{ .mask = QUIC_EV_CONN_CLOSE, .name = "conn_close", .desc = "closing conn." },
{ /* end */ } { /* end */ }
}; };
@ -3120,9 +3122,10 @@ struct task *quic_conn_io_cb(struct task *t, void *context, unsigned int state)
ctx = context; ctx = context;
qc = ctx->qc; qc = ctx->qc;
TRACE_ENTER(QUIC_EV_CONN_HDSHK, qc);
qr = NULL; qr = NULL;
st = HA_ATOMIC_LOAD(&qc->state); st = HA_ATOMIC_LOAD(&qc->state);
TRACE_ENTER(QUIC_EV_CONN_HDSHK, qc, &st); TRACE_PROTO("state", QUIC_EV_CONN_HDSHK, qc, &st);
if (HA_ATOMIC_LOAD(&qc->flags) & QUIC_FL_CONN_IO_CB_WAKEUP) { if (HA_ATOMIC_LOAD(&qc->flags) & QUIC_FL_CONN_IO_CB_WAKEUP) {
HA_ATOMIC_BTR(&qc->flags, QUIC_FL_CONN_IO_CB_WAKEUP_BIT); HA_ATOMIC_BTR(&qc->flags, QUIC_FL_CONN_IO_CB_WAKEUP_BIT);
/* The I/O handler has been woken up by the dgram listener /* The I/O handler has been woken up by the dgram listener
@ -3337,6 +3340,7 @@ static void quic_conn_drop(struct quic_conn *qc)
pool_free(pool_head_quic_conn_rxbuf, qc->rx.buf.area); pool_free(pool_head_quic_conn_rxbuf, qc->rx.buf.area);
pool_free(pool_head_quic_conn, qc); pool_free(pool_head_quic_conn, qc);
TRACE_PROTO("QUIC conn. freed", QUIC_EV_CONN_FREED, qc);
} }
void quic_close(struct connection *conn, void *xprt_ctx) void quic_close(struct connection *conn, void *xprt_ctx)
@ -3344,6 +3348,7 @@ void quic_close(struct connection *conn, void *xprt_ctx)
struct ssl_sock_ctx *conn_ctx = xprt_ctx; struct ssl_sock_ctx *conn_ctx = xprt_ctx;
struct quic_conn *qc = conn_ctx->conn->qc; struct quic_conn *qc = conn_ctx->conn->qc;
TRACE_ENTER(QUIC_EV_CONN_CLOSE, qc);
/* This task must be deleted by the connection-pinned thread. */ /* This task must be deleted by the connection-pinned thread. */
if (qc->timer_task) { if (qc->timer_task) {
task_destroy(qc->timer_task); task_destroy(qc->timer_task);
@ -3351,6 +3356,7 @@ void quic_close(struct connection *conn, void *xprt_ctx)
} }
quic_conn_drop(qc); quic_conn_drop(qc);
TRACE_LEAVE(QUIC_EV_CONN_CLOSE, qc);
} }
/* Callback called upon loss detection and PTO timer expirations. */ /* Callback called upon loss detection and PTO timer expirations. */