From d2a2014f152c09ff4f28c03a4ff6c5aae000ad5d Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Tue, 4 Jun 2024 11:54:18 +0200 Subject: [PATCH] MEDIUM: stconn: Be able to unblock zero-copy data forwarding from done_fastfwd This part is only experienced by applet. When an applet try to forward data via an iobuf, it may decide to block for any reason even if there is free space in the buffer. For instance, the stats applet don't procude data if the buffer is almost full. However, in this case, it could be good to let the consumer decide a new attempt is possible because more space was made. So, if IOBUF_FL_FF_BLOCKED flag is removed by the consumer when done_fastfwd() callback function is called, the SE_FL_WANT_ROOM flag is removed on the producer sedesc. It is only done for applets. And thanks to this change, the applet can be woken up for a new attempt. This patch is required for a fix on the QUIC multiplexer. --- src/applet.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/applet.c b/src/applet.c index c528963c3..2ad931611 100644 --- a/src/applet.c +++ b/src/applet.c @@ -716,8 +716,9 @@ int appctx_fastfwd(struct stconn *sc, unsigned int count, unsigned int flags) /* else */ /* applet_have_more_data(appctx); */ - if (se_done_ff(sdo) != 0) { - /* Something was forwarding, don't reclaim more room */ + if (se_done_ff(sdo) != 0 || !(sdo->iobuf.flags & IOBUF_FL_FF_BLOCKED)) { + /* Something was forwarding or the consumer states it is not + * blocked anyore, don't reclaim more room */ se_fl_clr(appctx->sedesc, SE_FL_WANT_ROOM); TRACE_STATE("more room available", APPLET_EV_RECV|APPLET_EV_BLK, appctx); }