MINOR: mux: remove last occurences of qcc ring buffer
The mux tx buffers have been rewritten with buffers attached to qcs
instances. qc_buf_available and qc_get_buf functions are updated to
manipulates qcs. All occurences of the unused qcc ring buffer are
removed to ease the code maintenance.
diff --git a/include/haproxy/mux_quic-t.h b/include/haproxy/mux_quic-t.h
index a958f45..7cf9afd 100644
--- a/include/haproxy/mux_quic-t.h
+++ b/include/haproxy/mux_quic-t.h
@@ -89,9 +89,6 @@
QCS_MAX_TYPES,
};
-/* 32 buffers: one for the ring's root, rest for the mbuf itself */
-#define QCC_MBUF_CNT 32
-
/* Stream direction types */
enum qcs_dir {
QCS_BIDI = 0,
@@ -139,9 +136,6 @@
struct eb_root streams_by_id; /* all active streams by their ID */
- /* states for the mux direction */
- struct buffer mbuf[QCC_MBUF_CNT]; /* mux buffers (ring) */
-
int timeout; /* idle timeout duration in ticks */
int shut_timeout; /* idle timeout duration in ticks after GOAWAY was sent */
unsigned int nb_cs; /* number of attached conn_streams */
diff --git a/include/haproxy/mux_quic.h b/include/haproxy/mux_quic.h
index 4e9bb4c..2991e87 100644
--- a/include/haproxy/mux_quic.h
+++ b/include/haproxy/mux_quic.h
@@ -31,9 +31,8 @@
#include <haproxy/obj_type.h>
void quic_mux_transport_params_update(struct qcc *qcc);
-struct buffer *qc_get_buf(struct qcc *qcc, struct buffer *bptr);
-int qc_cpy_mbuf(struct qcs *qcs, unsigned char *buf, size_t len);
void qc_error(struct qcc *qcc, int err);
+struct buffer *qc_get_buf(struct qcs *qcs, struct buffer *bptr);
struct qcs *qcc_get_stream(struct qcc *qcc, uint64_t id);
struct qcs *bidi_qcs_new(struct qcc *qcc, uint64_t id);
struct qcs *luqs_new(struct qcc *qcc);
diff --git a/src/mux_quic.c b/src/mux_quic.c
index df6d147..4794a50 100644
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -321,26 +321,6 @@
return 0;
}
-/* returns true if the connection is allowed to expire, false otherwise. A
- * connection may expire when:
- * - it has no stream
- * - it has data in the mux buffer
- * - it has streams in the blocked list
- * - it has streams in the fctl list
- * - it has streams in the send list
- * Otherwise it means some streams are waiting in the data layer and it should
- * not expire.
- */
-__maybe_unused
-static inline int qcc_may_expire(const struct qcc *qcc)
-{
- return eb_is_empty(&qcc->streams_by_id) ||
- br_data(qcc->mbuf) ||
- !LIST_ISEMPTY(&qcc->blocked_list) ||
- !LIST_ISEMPTY(&qcc->fctl_list) ||
- !LIST_ISEMPTY(&qcc->send_list);
-}
-
static __inline int
qcc_is_dead(const struct qcc *qcc)
{
@@ -406,45 +386,24 @@
tasklet_wakeup(qcc->wait_event.tasklet);
}
-/* Tries to grab a buffer and to re-enable processing on mux <target>. The qcc
- * flags are used to figure what buffer was requested. It returns 1 if the
- * allocation succeeds, in which case the connection is woken up, or 0 if it's
- * impossible to wake up and we prefer to be woken up later.
- */
static int qc_buf_available(void *target)
{
- struct qcc *qcc = target;
-
- if ((qcc->flags & QC_CF_MUX_MALLOC) && b_alloc(br_tail(qcc->mbuf))) {
- qcc->flags &= ~QC_CF_MUX_MALLOC;
-
- if (qcc->flags & QC_CF_DEM_MROOM) {
- qcc->flags &= ~QC_CF_DEM_MROOM;
- qcc_restart_reading(qcc, 1);
- }
- return 1;
- }
-
-#if 0
- if ((qcc->flags & QC_CF_DEM_SALLOC) &&
- (qcs = qcc_st_by_id(qcc, qcc->dsi)) && qcs->cs &&
- b_alloc_margin(&qcs->rxbuf, 0)) {
- qcc->flags &= ~QC_CF_DEM_SALLOC;
- qcc_restart_reading(qcc, 1);
- return 1;
- }
-#endif
+ struct qcs *qcs = target;
+ if (!b_alloc(&qcs->tx.buf))
+ return 0;
- return 0;
+ qcc_restart_reading(qcs->qcc, 1);
+ return 1;
}
-struct buffer *qc_get_buf(struct qcc *qcc, struct buffer *bptr)
+struct buffer *qc_get_buf(struct qcs *qcs, struct buffer *bptr)
{
struct buffer *buf = NULL;
+ struct qcc *qcc = qcs->qcc;
if (likely(!LIST_INLIST(&qcc->buf_wait.list)) &&
unlikely((buf = b_alloc(bptr)) == NULL)) {
- qcc->buf_wait.target = qcc;
+ qcc->buf_wait.target = qcs;
qcc->buf_wait.wakeup_cb = qc_buf_available;
LIST_APPEND(&th_ctx->buffer_wq, &qcc->buf_wait.list);
}
@@ -452,28 +411,6 @@
return buf;
}
-__maybe_unused
-static inline void qc_release_buf(struct qcc *qcc, struct buffer *bptr)
-{
- if (bptr->size) {
- b_free(bptr);
- offer_buffers(NULL, 1);
- }
-}
-
-static inline void qc_release_mbuf(struct qcc *qcc)
-{
- struct buffer *buf;
- unsigned int count = 0;
-
- while (b_size(buf = br_head_pick(qcc->mbuf))) {
- b_free(buf);
- count++;
- }
- if (count)
- offer_buffers(NULL, count);
-}
-
/* returns the number of streams in use on a connection to figure if it's
* idle or not. We check nb_cs and not nb_streams as the caller will want
* to know if it was the last one after a detach().
@@ -715,7 +652,6 @@
qcc->nb_cs = 0;
qcc->stream_cnt = 0;
- br_init(qcc->mbuf, sizeof(qcc->mbuf) / sizeof(qcc->mbuf[0]));
qcc->streams_by_id = EB_ROOT_UNIQUE;
LIST_INIT(&qcc->send_list);
LIST_INIT(&qcc->fctl_list);
@@ -785,8 +721,6 @@
if (LIST_INLIST(&qcc->buf_wait.list))
LIST_DELETE(&qcc->buf_wait.list);
- qc_release_mbuf(qcc);
-
if (qcc->task) {
qcc->task->context = NULL;
task_wakeup(qcc->task, TASK_WOKEN_OTHER);
@@ -1313,7 +1247,7 @@
struct quic_enc_level *qel = &qcs->qcc->conn->qc->els[QUIC_TLS_ENC_LEVEL_APP];
int total = 0, to_xfer;
- qc_get_buf(qcs->qcc, buf);
+ qc_get_buf(qcs, buf);
to_xfer = QUIC_MIN(b_data(payload), b_room(buf));
if (!to_xfer)
goto out;
@@ -1864,7 +1798,6 @@
int send_cnt = 0;
int tree_cnt = 0;
int orph_cnt = 0;
- struct buffer *hmbuf, *tmbuf;
if (!qcc)
return 0;
@@ -1885,26 +1818,18 @@
node = eb64_next(node);
}
- hmbuf = br_head(qcc->mbuf);
- tmbuf = br_tail(qcc->mbuf);
chunk_appendf(msg, " qcc.st0=%s .flg=0x%04x"
" clt.nb_streams_bidi=%llu srv.nb_streams_bidi=%llu"
" clt.nb_streams_uni=%llu srv.nb_streams_uni=%llu"
" .nbcs=%u .fctl_cnt=%d .send_cnt=%d .tree_cnt=%d"
- " .orph_cnt=%d .sub=%d"
- " .mbuf=[%u..%u|%u],h=[%u@%p+%u/%u],t=[%u@%p+%u/%u]",
+ " .orph_cnt=%d .sub=%d",
qcc_st_to_str(qcc->st0), qcc->flags,
(unsigned long long)qcc->strms[QCS_CLT_BIDI].nb_streams,
(unsigned long long)qcc->strms[QCS_SRV_BIDI].nb_streams,
(unsigned long long)qcc->strms[QCS_CLT_UNI].nb_streams,
(unsigned long long)qcc->strms[QCS_SRV_UNI].nb_streams,
qcc->nb_cs, fctl_cnt, send_cnt, tree_cnt, orph_cnt,
- qcc->wait_event.events,
- br_head_idx(qcc->mbuf), br_tail_idx(qcc->mbuf), br_size(qcc->mbuf),
- (unsigned int)b_data(hmbuf), b_orig(hmbuf),
- (unsigned int)b_head_ofs(hmbuf), (unsigned int)b_size(hmbuf),
- (unsigned int)b_data(tmbuf), b_orig(tmbuf),
- (unsigned int)b_head_ofs(tmbuf), (unsigned int)b_size(tmbuf));
+ qcc->wait_event.events);
if (qcs) {
chunk_appendf(msg, " last_qcs=%p .id=%llu rx.st=%s tx.st=%s .flg=0x%04x .rxbuf=%u@%p+%u/%u .cs=%p",
diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 130652f..70bcea8 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -1822,7 +1822,7 @@
if (strm_frm->offset.key == strm->rx.offset) {
int ret;
- if (!qc_get_buf(qc->qcc, &strm->rx.buf))
+ if (!qc_get_buf(strm, &strm->rx.buf))
goto store_frm;
ret = qc_strm_cpy(&strm->rx.buf, strm_frm);
@@ -1886,7 +1886,7 @@
if (strm_frm->offset.key == strm->rx.offset) {
int ret;
- if (!qc_get_buf(qc->qcc, &strm->rx.buf))
+ if (!qc_get_buf(strm, &strm->rx.buf))
goto store_frm;
/* qc_strm_cpy() will modify the offset, depending on the number