From 5fc12b0afd97ac68ef77335b9b5b9a0288f439f5 Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Mon, 16 Sep 2024 19:12:02 +0200 Subject: [PATCH] BUG/MEDIUM: sc_strm/applet: Wake applet after a successfull synchronous send On a synchronous send from the stream to an applet, if some data were sent, we must take care to wake the applet up. It is important because if everything was sent at this stage, there is no other chance to wake the applet up, mainly because SE_FL_WAIT_DATA flag is set on the applet's sedesc in sc_update_tx() at the end of process_stream(). This flag prevent any wakeup of the applet for a send event. It is not necessary for a mux because the mux stream is called when a syncrhonous send from the stream is performed. So it is reponsible to wake the mux connection if necessary. This patch must be backport to 3.0. --- include/haproxy/sc_strm.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/haproxy/sc_strm.h b/include/haproxy/sc_strm.h index 4eaef8864..7c9fb8adf 100644 --- a/include/haproxy/sc_strm.h +++ b/include/haproxy/sc_strm.h @@ -348,8 +348,15 @@ static inline void sc_sync_send(struct stconn *sc) { if (sc_ep_test(sc, SE_FL_T_MUX)) sc_conn_sync_send(sc); - else if (sc_ep_test(sc, SE_FL_T_APPLET)) + else if (sc_ep_test(sc, SE_FL_T_APPLET)) { sc_applet_sync_send(sc); + if (sc_oc(sc)->flags & CF_WRITE_EVENT) { + /* Data was send, wake the applet up. It is safe to do so becasuse sc_applet_sync_send() + * removes CF_WRITE_EVENT flag from the channel before trying to send data to the applet. + */ + task_wakeup(__sc_appctx(sc)->t, TASK_WOKEN_OTHER); + } + } } /* Combines both sc_update_rx() and sc_update_tx() at once */