mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: quic: Make qc_treat_rx_pkts() be thread safe.

Browse Source 
Make quic_rx_packet_ref(inc|dec)() functions be thread safe.
Make use of ->rx.crypto.frms_rwlock RW lock when manipulating RX frames
from qc_treat_rx_crypto_frms().
Modify atomically several variables attached to RX part of quic_enc_level struct.
This commit is contained in:
Frédéric Lécaille 2021-07-26 16:42:56 +02:00 committed by Amaury Denoyelle
parent 98cdeb2f0c
commit 120ea6f169
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/haproxy/xprt_quic.h
View File

@ -1018,13 +1018,13 @@ static inline int qc_pkt_long(const struct quic_rx_packet *pkt)
/* Increment the reference counter of <pkt> */ /* Increment the reference counter of <pkt> */
static inline void quic_rx_packet_refinc(struct quic_rx_packet *pkt) static inline void quic_rx_packet_refinc(struct quic_rx_packet *pkt)
{ {
pkt->refcnt++; HA_ATOMIC_ADD(&pkt->refcnt, 1);
} }
/* Decrement the reference counter of <pkt> */ /* Decrement the reference counter of <pkt> */
static inline void quic_rx_packet_refdec(struct quic_rx_packet *pkt) static inline void quic_rx_packet_refdec(struct quic_rx_packet *pkt)
{ {
if (!--pkt->refcnt) if (!HA_ATOMIC_SUB_FETCH(&pkt->refcnt, 1))
pool_free(pool_head_quic_rx_packet, pkt); pool_free(pool_head_quic_rx_packet, pkt);
} }

25
src/xprt_quic.c
View File

@ -2516,6 +2516,7 @@ static inline int qc_treat_rx_crypto_frms(struct quic_enc_level *el,
struct eb64_node *node; struct eb64_node *node;
TRACE_ENTER(QUIC_EV_CONN_RXCDATA, ctx->conn); TRACE_ENTER(QUIC_EV_CONN_RXCDATA, ctx->conn);
HA_RWLOCK_WRLOCK(QUIC_LOCK, &el->rx.crypto.frms_rwlock);
node = eb64_first(&el->rx.crypto.frms); node = eb64_first(&el->rx.crypto.frms);
while (node) { while (node) {
struct quic_rx_crypto_frm *cf; struct quic_rx_crypto_frm *cf;
@ -2532,11 +2533,12 @@ static inline int qc_treat_rx_crypto_frms(struct quic_enc_level *el,
eb64_delete(&cf->offset_node); eb64_delete(&cf->offset_node);
pool_free(pool_head_quic_rx_crypto_frm, cf); pool_free(pool_head_quic_rx_crypto_frm, cf);
} }
HA_RWLOCK_WRUNLOCK(QUIC_LOCK, &el->rx.crypto.frms_rwlock);
TRACE_LEAVE(QUIC_EV_CONN_RXCDATA, ctx->conn); TRACE_LEAVE(QUIC_EV_CONN_RXCDATA, ctx->conn);
return 1; return 1;
err: err:
HA_RWLOCK_WRUNLOCK(QUIC_LOCK, &el->rx.crypto.frms_rwlock);
TRACE_DEVEL("leaving in error", QUIC_EV_CONN_RXCDATA, ctx->conn); TRACE_DEVEL("leaving in error", QUIC_EV_CONN_RXCDATA, ctx->conn);
return 0; return 0;
} }
@ -2548,6 +2550,7 @@ int qc_treat_rx_pkts(struct quic_enc_level *el, struct ssl_sock_ctx *ctx)
{ {
struct quic_tls_ctx *tls_ctx; struct quic_tls_ctx *tls_ctx;
struct eb64_node *node; struct eb64_node *node;
int64_t largest_pn = -1;
TRACE_ENTER(QUIC_EV_CONN_ELRXPKTS, ctx->conn); TRACE_ENTER(QUIC_EV_CONN_ELRXPKTS, ctx->conn);
tls_ctx = &el->tls_ctx; tls_ctx = &el->tls_ctx;
@ -2571,16 +2574,12 @@ int qc_treat_rx_pkts(struct quic_enc_level *el, struct ssl_sock_ctx *ctx)
else { else {
struct quic_arng ar = { .first = pkt->pn, .last = pkt->pn }; struct quic_arng ar = { .first = pkt->pn, .last = pkt->pn };
if (pkt->flags & QUIC_FL_RX_PACKET_ACK_ELICITING) { if (pkt->flags & QUIC_FL_RX_PACKET_ACK_ELICITING &&
el->pktns->rx.nb_ack_eliciting++; !(HA_ATOMIC_ADD_FETCH(&el->pktns->rx.nb_ack_eliciting, 1) & 1))
if (!(el->pktns->rx.nb_ack_eliciting & 1)) HA_ATOMIC_OR(&el->pktns->flags, QUIC_FL_PKTNS_ACK_REQUIRED);
el->pktns->flags |= QUIC_FL_PKTNS_ACK_REQUIRED;
}
/* Update the largest packet number. */
if (pkt->pn > el->pktns->rx.largest_pn)
el->pktns->rx.largest_pn = pkt->pn;
if (pkt->pn > largest_pn)
largest_pn = pkt->pn;
/* Update the list of ranges to acknowledge. */ /* Update the list of ranges to acknowledge. */
if (!quic_update_ack_ranges_list(&el->pktns->rx.arngs, &ar)) if (!quic_update_ack_ranges_list(&el->pktns->rx.arngs, &ar))
TRACE_DEVEL("Could not update ack range list", TRACE_DEVEL("Could not update ack range list",
@ -2592,6 +2591,9 @@ int qc_treat_rx_pkts(struct quic_enc_level *el, struct ssl_sock_ctx *ctx)
} }
HA_RWLOCK_WRUNLOCK(QUIC_LOCK, &el->rx.pkts_rwlock); HA_RWLOCK_WRUNLOCK(QUIC_LOCK, &el->rx.pkts_rwlock);
/* Update the largest packet number. */
if (largest_pn != -1)
HA_ATOMIC_UPDATE_MAX(&el->pktns->rx.largest_pn, largest_pn);
if (!qc_treat_rx_crypto_frms(el, ctx)) if (!qc_treat_rx_crypto_frms(el, ctx))
goto err; goto err;
@ -2636,8 +2638,7 @@ int qc_do_hdshk(struct ssl_sock_ctx *ctx)
(tls_ctx->rx.flags & QUIC_FL_TLS_SECRETS_SET)) (tls_ctx->rx.flags & QUIC_FL_TLS_SECRETS_SET))
qc_rm_hp_pkts(qel, ctx); qc_rm_hp_pkts(qel, ctx);
if (!eb_is_empty(&qel->rx.pkts) && if (!qc_treat_rx_pkts(qel, ctx))
!qc_treat_rx_pkts(qel, ctx))
goto err; goto err;
if (!qr) if (!qr)