From c28aba2a8d16bf418063f7d90ba84d9c72fd93b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20L=C3=A9caille?= <flecaille@haproxy.com>
Date: Mon, 7 Jun 2021 10:28:10 +0200
Subject: [PATCH] MINOR: quic: Replace the RX list of packet by a thread safety
 one.

This list is shared between the I/O dgram handler and the task responsible
for processing the QUIC packets.
---
 include/haproxy/receiver-t.h  | 2 +-
 include/haproxy/xprt_quic-t.h | 2 +-
 src/proto_quic.c              | 2 +-
 src/quic_sock.c               | 5 ++---
 src/xprt_quic.c               | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/include/haproxy/receiver-t.h b/include/haproxy/receiver-t.h
index 1125be771..80e039b95 100644
--- a/include/haproxy/receiver-t.h
+++ b/include/haproxy/receiver-t.h
@@ -62,7 +62,7 @@ struct receiver {
 	struct rx_settings *settings;    /* points to the settings used by this receiver */
 	struct list proto_list;          /* list in the protocol header */
 #ifdef USE_QUIC
-	struct list qpkts;               /* QUIC Initial packets to accept new connections */
+	struct mt_list pkts;             /* QUIC Initial packets to accept new connections */
 	struct eb_root odcids;           /* QUIC original destination connection IDs. */
 	struct eb_root cids;             /* QUIC connection IDs. */
 #endif
diff --git a/include/haproxy/xprt_quic-t.h b/include/haproxy/xprt_quic-t.h
index f7c50c53e..9bf5b4004 100644
--- a/include/haproxy/xprt_quic-t.h
+++ b/include/haproxy/xprt_quic-t.h
@@ -395,7 +395,7 @@ extern struct quic_transport_params quic_dflt_transport_params;
 
 struct quic_rx_packet {
 	struct list list;
-	struct list rx_list;
+	struct mt_list rx_list;
 	struct quic_conn *qc;
 	unsigned char type;
 	uint32_t version;
diff --git a/src/proto_quic.c b/src/proto_quic.c
index 1cac5ab62..3b66ff911 100644
--- a/src/proto_quic.c
+++ b/src/proto_quic.c
@@ -514,7 +514,7 @@ int quic_connect_server(struct connection *conn, int flags)
  */
 static void quic_add_listener(struct protocol *proto, struct listener *listener)
 {
-	LIST_INIT(&listener->rx.qpkts);
+	MT_LIST_INIT(&listener->rx.pkts);
 	listener->rx.odcids = EB_ROOT_UNIQUE;
 	listener->rx.cids = EB_ROOT_UNIQUE;
 	default_add_listener(proto, listener);
diff --git a/src/quic_sock.c b/src/quic_sock.c
index 042c35d97..a2c4becb5 100644
--- a/src/quic_sock.c
+++ b/src/quic_sock.c
@@ -145,13 +145,12 @@ struct connection *quic_sock_accept_conn(struct listener *l, int *status)
 	int ret;
 
 	qc = NULL;
-	pkt = LIST_ELEM(l->rx.qpkts.n, struct quic_rx_packet *, rx_list);
+	pkt = MT_LIST_POP(&l->rx.pkts, struct quic_rx_packet *, rx_list);
 	/* Should never happen. */
-	if (&pkt->rx_list == &l->rx.qpkts)
+	if (!pkt)
 		goto err;
 
 	qc = pkt->qc;
-	LIST_DELETE(&pkt->rx_list);
 	if (!new_quic_cli_conn(qc, l, &pkt->saddr))
 		goto err;
 
diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 6a0f9bfac..cb052b427 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -3399,7 +3399,7 @@ static ssize_t qc_lstnr_pkt_rcv(unsigned char **buf, const unsigned char *end,
 	}
 	else if (!found_conn) {
 		/* Enqueue this packet. */
-		LIST_APPEND(&l->rx.qpkts, &pkt->rx_list);
+		MT_LIST_APPEND(&l->rx.pkts, &pkt->rx_list);
 		/* Try to accept a new connection. */
 		listener_accept(l);
 	}