MEDIUM: mux_quic: preserve connection while stream requests are present

Author: a-denoyelle

include/haproxy/mux_quic.h

@@ -97,9 +97,8 @@ static inline char *qcs_st_to_str(enum qcs_state st)
 
 int qcc_install_app_ops(struct qcc *qcc);
 
-/* Register <qcs> stream for http-request timeout. If the stream is not yet
- * attached in the configured delay, qcc timeout task will be triggered. This
- * means the full header section was not received in time.
+/* Flags <qcs> as a request stream. The connection will be considered as active
+ * until all request streams are closed or on inactivity timeout.
  *
  * This function should be called by the application protocol layer on request
  * streams initialization.
@@ -108,6 +107,9 @@ static inline void qcs_wait_http_req(struct qcs *qcs)
 {
 	struct qcc *qcc = qcs->qcc;
 
+	/* For frontend connections, register the stream in QCC opening_list.
+	 * This is necessary for http-request timeout.
+	 */
 	if (!conn_is_back(qcc->conn)) {
 		/* A stream cannot be registered several times. */
 		BUG_ON_HOT(tick_isset(qcs->start));
@@ -118,6 +120,13 @@ static inline void qcs_wait_http_req(struct qcs *qcs)
 		 */
 		LIST_APPEND(&qcc->opening_list, &qcs->el_opening);
 	}
+
+	/* QC_SF_HREQ_RECV must be set once for a stream. Else, nb_hreq counter
+	 * will be incorrect for the connection.
+	 */
+	BUG_ON_HOT(qcs->flags & QC_SF_HREQ_RECV);
+	qcs->flags |= QC_SF_HREQ_RECV;
+	++qcc->nb_hreq;
 }
 
 void qcc_show_quic(struct qcc *qcc);

src/mux_quic.c

@@ -102,6 +102,11 @@ static void qcs_free(struct qcs *qcs)
 	sedesc_free(qcs->sd);
 	qcs->sd = NULL;
 
+	if (qcs->flags & QC_SF_HREQ_RECV) {
+		BUG_ON(!qcc->nb_hreq);
+		--qcc->nb_hreq;
+	}
+
 	/* Release app-layer context. */
 	if (qcs->ctx && qcc->app_ops->detach)
 		qcc->app_ops->detach(qcs);
@@ -265,17 +270,10 @@ static forceinline void qcc_rm_sc(struct qcc *qcc)
 	--qcc->nb_sc;
 }
 
-/* Decrement <qcc> hreq. */
-static forceinline void qcc_rm_hreq(struct qcc *qcc)
-{
-	BUG_ON(!qcc->nb_hreq); /* Ensure http req count is always valid (ie >=0). */
-	--qcc->nb_hreq;
-}
-
 static inline int qcc_is_dead(const struct qcc *qcc)
 {
-	/* Maintain connection if stream endpoints are still active. */
-	if (qcc->nb_sc)
+	/* Maintain connection if there is still request streams active. */
+	if (qcc->nb_hreq)
 		return 0;
 
 	/* Connection considered dead if either :
@@ -287,8 +285,8 @@ static inline int qcc_is_dead(const struct qcc *qcc)
 	 */
 	if (qcc->flags & (QC_CF_ERR_CONN|QC_CF_ERRL_DONE) ||
 	    !qcc->task ||
-	    (!conn_is_back(qcc->conn) && !qcc->nb_hreq && qcc->app_st == QCC_APP_ST_SHUT) ||
-	    (conn_is_back(qcc->conn) && !qcc->nb_hreq && (qcc->flags & QC_CF_CONN_SHUT))) {
+	    (!conn_is_back(qcc->conn) && qcc->app_st == QCC_APP_ST_SHUT) ||
+	    (conn_is_back(qcc->conn) && (qcc->flags & QC_CF_CONN_SHUT))) {
 		return 1;
 	}
 
@@ -431,9 +429,6 @@ void qcs_close_local(struct qcs *qcs)
 
 	if (quic_stream_is_bidi(qcs->id)) {
 		qcs->st = (qcs->st == QC_SS_HREM) ? QC_SS_CLO : QC_SS_HLOC;
-
-		if (qcs->flags & QC_SF_HREQ_RECV)
-			qcc_rm_hreq(qcs->qcc);
 	}
 	else {
 		/* Only local uni streams are valid for this operation. */
@@ -1007,13 +1002,8 @@ int qcs_attach_sc(struct qcs *qcs, struct buffer *buf, char fin)
 		return -1;
 	}
 
-	/* QC_SF_HREQ_RECV must be set once for a stream. Else, nb_hreq counter
-	 * will be incorrect for the connection.
-	 */
-	BUG_ON_HOT(qcs->flags & QC_SF_HREQ_RECV);
-	qcs->flags |= QC_SF_HREQ_RECV;
+	BUG_ON(!(qcs->flags & QC_SF_HREQ_RECV));
 	++qcc->nb_sc;
-	++qcc->nb_hreq;
 	++qcc->tot_sc;
 
 	/* TODO duplicated from mux_h2 */