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

MINOR: proto_quic: Allocate TX ring buffers for listeners

Browse Source 
We allocate an array of QUIC ring buffer, one by thread, and arranges them in a
MT_LIST. Everything is allocated or nothing: we do not want to usse an incomplete
array of ring buffers to ensure that each thread may safely acquire one of these
buffers.
This commit is contained in:
Frédéric Lécaille 2021-07-06 15:39:26 +02:00 committed by Amaury Denoyelle
parent 22cfdf8d0e
commit 48f8e1925b
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,6 +66,8 @@ struct receiver {
struct eb_root odcids; /* QUIC original destination connection IDs. */ struct eb_root odcids; /* QUIC original destination connection IDs. */
struct eb_root cids; /* QUIC connection IDs. */ struct eb_root cids; /* QUIC connection IDs. */
__decl_thread(HA_RWLOCK_T cids_lock); /* RW lock for connection IDs tree accesses */ __decl_thread(HA_RWLOCK_T cids_lock); /* RW lock for connection IDs tree accesses */
struct qring *qrings; /* Array of rings (one by thread) */
struct mt_list tx_qrings; /* The same as ->qrings but arranged in a list */
#endif #endif
/* warning: this struct is huge, keep it at the bottom */ /* warning: this struct is huge, keep it at the bottom */
struct sockaddr_storage addr; /* the address the socket is bound to */ struct sockaddr_storage addr; /* the address the socket is bound to */

40
src/proto_quic.c
View File

@ -27,6 +27,7 @@
#include <haproxy/api.h> #include <haproxy/api.h>
#include <haproxy/arg.h> #include <haproxy/arg.h>
#include <haproxy/cbuf.h>
#include <haproxy/connection.h> #include <haproxy/connection.h>
#include <haproxy/errors.h> #include <haproxy/errors.h>
#include <haproxy/fd.h> #include <haproxy/fd.h>
@ -44,6 +45,7 @@
#include <haproxy/quic_sock.h> #include <haproxy/quic_sock.h>
#include <haproxy/sock_inet.h> #include <haproxy/sock_inet.h>
#include <haproxy/tools.h> #include <haproxy/tools.h>
#include <haproxy/xprt_quic-t.h>
static void quic_add_listener(struct protocol *proto, struct listener *listener); static void quic_add_listener(struct protocol *proto, struct listener *listener);
@ -521,6 +523,38 @@ static void quic_add_listener(struct protocol *proto, struct listener *listener)
default_add_listener(proto, listener); default_add_listener(proto, listener);
} }
/* Allocate the TX ring buffers for <l> listener.
* Return 1 if succeeded, 0 if not.
*/
static int quic_alloc_rings_listener(struct listener *l)
{
struct qring *qr;
int i;
l->rx.qrings = calloc(global.nbthread, sizeof *l->rx.qrings);
if (!l->rx.qrings)
return 0;
MT_LIST_INIT(&l->rx.tx_qrings);
for (i = 0; i < global.nbthread; i++) {
struct qring *qr = &l->rx.qrings[i];
qr->cbuf = cbuf_new();
if (!qr->cbuf)
goto err;
MT_LIST_APPEND(&l->rx.tx_qrings, &qr->mt_list);
}
return 1;
err:
while ((qr = MT_LIST_POP(&l->rx.tx_qrings, typeof(qr), mt_list)))
cbuf_free(qr->cbuf);
free(l->rx.qrings);
return 0;
}
/* This function tries to bind a QUIC4/6 listener. It may return a warning or /* This function tries to bind a QUIC4/6 listener. It may return a warning or
* an error message in <errmsg> if the message is at most <errlen> bytes long * an error message in <errmsg> if the message is at most <errlen> bytes long
* (including '\0'). Note that <errmsg> may be NULL if <errlen> is also zero. * (including '\0'). Note that <errmsg> may be NULL if <errlen> is also zero.
@ -551,6 +585,12 @@ static int quic_bind_listener(struct listener *listener, char *errmsg, int errle
goto udp_return; goto udp_return;
} }
if (!quic_alloc_rings_listener(listener)) {
msg = "could not initialize tx rings";
err |= ERR_WARN;
goto udp_return;
}
listener_set_state(listener, LI_LISTEN); listener_set_state(listener, LI_LISTEN);
udp_return: udp_return: