1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MEDIUM: stconn: make the SE_FL_ERR_PENDING to ERROR transition systematic

Browse Source 
During a code audit of the various situations that promote ERR_PENDING to
ERROR, it appeared that:
  - all muxes use se_fl_set_error() to set it, which chooses either based
    on EOI/EOS presence ;
  - EOI/EOS that arrive late after ERR_PENDING were not systematically
    upgraded to ERROR

This results in confusion about how such ERROR or ERR_PENDING ought to
be handled, which is not quite desirable.

This patch adds a test to se_fl_set() to detect if we're setting EOI or
EOS while ERR_PENDING is present, or the other way around so that any
sequence of EOI/EOS <-> ERR_PENDING results in ERROR being set. This
way there will no longer be possible situations where ERROR is missing
while the other ones are set.
This commit is contained in:
Willy Tarreau 2023-05-23 16:08:22 +02:00
parent 2437377445
commit b7209d42d9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/haproxy/stconn.h
View File

@ -77,8 +77,14 @@ static forceinline void se_fl_setall(struct sedesc *se, uint all)
se->flags = all; se->flags = all;
} }
/* sets flags <on> on se->flags and handles ERR_PENDING to ERROR promotion if
* needed (upon EOI/EOS).
*/
static forceinline void se_fl_set(struct sedesc *se, uint on) static forceinline void se_fl_set(struct sedesc *se, uint on)
{ {
if (((on & (SE_FL_EOS|SE_FL_EOI)) && se->flags & SE_FL_ERR_PENDING) ||
((on & SE_FL_ERR_PENDING) && se->flags & (SE_FL_EOI|SE_FL_EOS)))
on |= SE_FL_ERROR;
se->flags |= on; se->flags |= on;
} }