From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Mon, 24 Apr 2023 09:32:22 +0000 (+0200)
Subject: BUG/MINOR: quic: Useless I/O handler task wakeups (draining, killing state)
X-Git-Tag: v2.8-dev9~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b73762ad78936b1295cf4f647f5025ed1fbf7a59;p=thirdparty%2Fhaproxy.git

BUG/MINOR: quic: Useless I/O handler task wakeups (draining, killing state)

From the idle_timer_task(), the I/O handler must be woken up to send ack. But
there is no reason to do that in draining state or killing state. In draining
state this is even forbidden.

Must be backported to 2.7.
---

diff --git a/src/quic_conn.c b/src/quic_conn.c
index 43737ec0a4..ee11963089 100644
--- a/src/quic_conn.c
+++ b/src/quic_conn.c
@@ -5882,8 +5882,14 @@ struct task *qc_idle_timer_task(struct task *t, void *ctx, unsigned int state)
 		qc->ack_expire = TICK_ETERNITY;
 		/* Note that ->idle_expire is always set. */
 		t->expire = qc->idle_expire;
-		qc->flags |= QUIC_FL_CONN_ACK_TIMER_FIRED;
-		tasklet_wakeup(qc->wait_event.tasklet);
+		/* Do not wakeup the I/O handler in DRAINING state or if the
+		 * connection must be killed as soon as possible.
+		 */
+		if (!(qc->flags & (QUIC_FL_CONN_DRAINING|QUIC_FL_CONN_TO_KILL))) {
+			qc->flags |= QUIC_FL_CONN_ACK_TIMER_FIRED;
+			tasklet_wakeup(qc->wait_event.tasklet);
+		}
+
 		goto requeue;
 	}