mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-20 13:21:29 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: connection: pass the thread number to conn_delete_from_tree()

Browse Source 
We'll soon need to choose the server's root based on the connection's
flags, and for this we'll need the thread it's attached to, which is
not always the current one. This patch simply passes the thread number
from all callers. They know it because they just set the idle_conns
lock on it prior to calling the function.
This commit is contained in:
Willy Tarreau 2025-09-12 16:47:12 +02:00
parent efe519ab89
commit 95b8adff67
10 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/connection.h
View File

@ -84,7 +84,7 @@ int conn_install_mux_be(struct connection *conn, void *ctx, struct session *sess
const struct mux_ops *force_mux_ops); const struct mux_ops *force_mux_ops);
int conn_install_mux_chk(struct connection *conn, void *ctx, struct session *sess); int conn_install_mux_chk(struct connection *conn, void *ctx, struct session *sess);
void conn_delete_from_tree(struct connection *conn); void conn_delete_from_tree(struct connection *conn, int thr);
void conn_init(struct connection *conn, void *target); void conn_init(struct connection *conn, void *target);
struct connection *conn_new(void *target); struct connection *conn_new(void *target);

14
src/backend.c
View File

@ -1313,7 +1313,7 @@ struct connection *conn_backend_get(int reuse_mode,
HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
conn = srv_lookup_conn(is_safe ? &srv->per_thr[tid].safe_conns : &srv->per_thr[tid].idle_conns, hash); conn = srv_lookup_conn(is_safe ? &srv->per_thr[tid].safe_conns : &srv->per_thr[tid].idle_conns, hash);
if (conn) if (conn)
conn_delete_from_tree(conn); conn_delete_from_tree(conn, tid);
/* If we failed to pick a connection from the idle list, let's try again with /* If we failed to pick a connection from the idle list, let's try again with
* the safe list. * the safe list.
@ -1321,7 +1321,7 @@ struct connection *conn_backend_get(int reuse_mode,
if (!conn && !is_safe && srv->curr_safe_nb > 0) { if (!conn && !is_safe && srv->curr_safe_nb > 0) {
conn = srv_lookup_conn(&srv->per_thr[tid].safe_conns, hash); conn = srv_lookup_conn(&srv->per_thr[tid].safe_conns, hash);
if (conn) { if (conn) {
conn_delete_from_tree(conn); conn_delete_from_tree(conn, tid);
is_safe = 1; is_safe = 1;
} }
} }
@ -1382,7 +1382,7 @@ check_tgid:
conn = srv_lookup_conn(tree, hash); conn = srv_lookup_conn(tree, hash);
while (conn) { while (conn) {
if (conn->mux->takeover && conn->mux->takeover(conn, i, 0) == 0) { if (conn->mux->takeover && conn->mux->takeover(conn, i, 0) == 0) {
conn_delete_from_tree(conn); conn_delete_from_tree(conn, i);
_HA_ATOMIC_INC(&activity[tid].fd_takeover); _HA_ATOMIC_INC(&activity[tid].fd_takeover);
found = 1; found = 1;
break; break;
@ -1487,7 +1487,7 @@ takeover_random_idle_conn(struct eb_root *root, int curtid)
hash_node = eb64_entry(node, struct conn_hash_node, node); hash_node = eb64_entry(node, struct conn_hash_node, node);
conn = hash_node->conn; conn = hash_node->conn;
if (conn && conn->mux->takeover && conn->mux->takeover(conn, curtid, 1) == 0) { if (conn && conn->mux->takeover && conn->mux->takeover(conn, curtid, 1) == 0) {
conn_delete_from_tree(conn); conn_delete_from_tree(conn, curtid);
return conn; return conn;
} }
node = eb64_next(node); node = eb64_next(node);
@ -1744,7 +1744,7 @@ int be_reuse_connection(int64_t hash, struct session *sess,
if (avail <= 1) { if (avail <= 1) {
/* no more streams available, remove it from the list */ /* no more streams available, remove it from the list */
HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
conn_delete_from_tree(srv_conn); conn_delete_from_tree(srv_conn, tid);
HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
} }
@ -1852,7 +1852,7 @@ int connect_server(struct stream *s)
HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
if (!LIST_ISEMPTY(&srv->per_thr[tid].idle_conn_list)) { if (!LIST_ISEMPTY(&srv->per_thr[tid].idle_conn_list)) {
tokill_conn = LIST_ELEM(srv->per_thr[tid].idle_conn_list.n, struct connection *, idle_list); tokill_conn = LIST_ELEM(srv->per_thr[tid].idle_conn_list.n, struct connection *, idle_list);
conn_delete_from_tree(tokill_conn); conn_delete_from_tree(tokill_conn, tid);
HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
/* Release the idle lock before calling mux->destroy. /* Release the idle lock before calling mux->destroy.
@ -1881,7 +1881,7 @@ int connect_server(struct stream *s)
if (!LIST_ISEMPTY(&srv->per_thr[i].idle_conn_list)) { if (!LIST_ISEMPTY(&srv->per_thr[i].idle_conn_list)) {
tokill_conn = LIST_ELEM(srv->per_thr[i].idle_conn_list.n, struct connection *, idle_list); tokill_conn = LIST_ELEM(srv->per_thr[i].idle_conn_list.n, struct connection *, idle_list);
conn_delete_from_tree(tokill_conn); conn_delete_from_tree(tokill_conn, i);
} }
HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[i].idle_conns_lock); HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[i].idle_conns_lock);

9
src/connection.c
View File

@ -73,12 +73,13 @@ struct conn_tlv_list *conn_get_tlv(struct connection *conn, int type)
return NULL; return NULL;
} }
/* Remove <conn> idle connection from its attached tree (idle, safe or avail). /* Remove <conn> idle connection from its attached tree (idle, safe or avail)
* If also present in the secondary server idle list, conn is removed from it. * for the server in the connection's target and thread <thr>. If also present
* in the secondary server idle list, conn is removed from it.
* *
* Must be called with idle_conns_lock held. * Must be called with idle_conns_lock held.
*/ */
void conn_delete_from_tree(struct connection *conn) void conn_delete_from_tree(struct connection *conn, int thr)
{ {
LIST_DEL_INIT(&conn->idle_list); LIST_DEL_INIT(&conn->idle_list);
eb64_delete(&conn->hash_node->node); eb64_delete(&conn->hash_node->node);
@ -209,7 +210,7 @@ int conn_notify_mux(struct connection *conn, int old_flags, int forced_wake)
conn_in_list = 0; conn_in_list = 0;
} }
else { else {
conn_delete_from_tree(conn); conn_delete_from_tree(conn, tid);
} }
HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
} }

4
src/mux_fcgi.c
View File

@ -3068,7 +3068,7 @@ struct task *fcgi_io_cb(struct task *t, void *ctx, unsigned int state)
conn_in_list = 0; conn_in_list = 0;
} }
else { else {
conn_delete_from_tree(conn); conn_delete_from_tree(conn, tid);
} }
} }
@ -3329,7 +3329,7 @@ struct task *fcgi_timeout_task(struct task *t, void *context, unsigned int state
* to steal it from us. * to steal it from us.
*/ */
if (fconn->conn->flags & CO_FL_LIST_MASK) if (fconn->conn->flags & CO_FL_LIST_MASK)
conn_delete_from_tree(fconn->conn); conn_delete_from_tree(fconn->conn, tid);
else if (fconn->conn->flags & CO_FL_SESS_IDLE) else if (fconn->conn->flags & CO_FL_SESS_IDLE)
session_detach_idle_conn(fconn->conn->owner, fconn->conn); session_detach_idle_conn(fconn->conn->owner, fconn->conn);

4
src/mux_h1.c
View File

@ -4311,7 +4311,7 @@ struct task *h1_io_cb(struct task *t, void *ctx, unsigned int state)
conn_in_list = 0; conn_in_list = 0;
} }
else { else {
conn_delete_from_tree(conn); conn_delete_from_tree(conn, tid);
} }
} }
@ -4451,7 +4451,7 @@ struct task *h1_timeout_task(struct task *t, void *context, unsigned int state)
* to steal it from us. * to steal it from us.
*/ */
if (h1c->conn->flags & CO_FL_LIST_MASK) if (h1c->conn->flags & CO_FL_LIST_MASK)
conn_delete_from_tree(h1c->conn); conn_delete_from_tree(h1c->conn, tid);
HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);

10
src/mux_h2.c
View File

@ -4966,7 +4966,7 @@ struct task *h2_io_cb(struct task *t, void *ctx, unsigned int state)
conn_in_list = 0; conn_in_list = 0;
} }
else { else {
conn_delete_from_tree(conn); conn_delete_from_tree(conn, tid);
} }
} }
@ -5143,7 +5143,7 @@ static int h2_process(struct h2c *h2c)
/* connections in error must be removed from the idle lists */ /* connections in error must be removed from the idle lists */
if (conn->flags & CO_FL_LIST_MASK) { if (conn->flags & CO_FL_LIST_MASK) {
HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
conn_delete_from_tree(conn); conn_delete_from_tree(conn, tid);
HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
} }
} }
@ -5151,7 +5151,7 @@ static int h2_process(struct h2c *h2c)
/* connections in error must be removed from the idle lists */ /* connections in error must be removed from the idle lists */
if (conn->flags & CO_FL_LIST_MASK) { if (conn->flags & CO_FL_LIST_MASK) {
HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
conn_delete_from_tree(conn); conn_delete_from_tree(conn, tid);
HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
} }
} }
@ -5259,7 +5259,7 @@ struct task *h2_timeout_task(struct task *t, void *context, unsigned int state)
* to steal it from us. * to steal it from us.
*/ */
if (h2c->conn->flags & CO_FL_LIST_MASK) if (h2c->conn->flags & CO_FL_LIST_MASK)
conn_delete_from_tree(h2c->conn); conn_delete_from_tree(h2c->conn, tid);
else if (h2c->conn->flags & CO_FL_SESS_IDLE) else if (h2c->conn->flags & CO_FL_SESS_IDLE)
session_detach_idle_conn(h2c->conn->owner, h2c->conn); session_detach_idle_conn(h2c->conn->owner, h2c->conn);
@ -5341,7 +5341,7 @@ do_leave:
/* in any case this connection must not be considered idle anymore */ /* in any case this connection must not be considered idle anymore */
if (h2c->conn->flags & CO_FL_LIST_MASK) { if (h2c->conn->flags & CO_FL_LIST_MASK) {
HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
conn_delete_from_tree(h2c->conn); conn_delete_from_tree(h2c->conn, tid);
HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
} }

6
src/mux_quic.c
View File

@ -3205,7 +3205,7 @@ static void qcc_shutdown(struct qcc *qcc)
/* A connection is not reusable if app layer is closed. */ /* A connection is not reusable if app layer is closed. */
if (qcc->flags & QC_CF_IS_BACK) if (qcc->flags & QC_CF_IS_BACK)
conn_delete_from_tree(qcc->conn); conn_delete_from_tree(qcc->conn, tid);
out: out:
qcc->app_st = QCC_APP_ST_SHUT; qcc->app_st = QCC_APP_ST_SHUT;
@ -3408,7 +3408,7 @@ struct task *qcc_io_cb(struct task *t, void *ctx, unsigned int state)
if (conn->flags & CO_FL_SESS_IDLE) if (conn->flags & CO_FL_SESS_IDLE)
session_detach_idle_conn(conn->owner, conn); session_detach_idle_conn(conn->owner, conn);
else else
conn_delete_from_tree(conn); conn_delete_from_tree(conn, tid);
} }
HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
@ -3532,7 +3532,7 @@ static struct task *qcc_timeout_task(struct task *t, void *ctx, unsigned int sta
* attempts to steal it from us. * attempts to steal it from us.
*/ */
if (qcc->conn->flags & CO_FL_LIST_MASK) if (qcc->conn->flags & CO_FL_LIST_MASK)
conn_delete_from_tree(qcc->conn); conn_delete_from_tree(qcc->conn, tid);
else if (qcc->conn->flags & CO_FL_SESS_IDLE) else if (qcc->conn->flags & CO_FL_SESS_IDLE)
session_unown_conn(qcc->conn->owner, qcc->conn); session_unown_conn(qcc->conn->owner, qcc->conn);

6
src/mux_spop.c
View File

@ -2564,7 +2564,7 @@ static struct task *spop_io_cb(struct task *t, void *ctx, unsigned int state)
conn_in_list = 0; conn_in_list = 0;
} }
else { else {
conn_delete_from_tree(conn); conn_delete_from_tree(conn, tid);
} }
} }
@ -2676,7 +2676,7 @@ static int spop_process(struct spop_conn *spop_conn)
/* connections in error must be removed from the idle lists */ /* connections in error must be removed from the idle lists */
if (conn->flags & CO_FL_LIST_MASK) { if (conn->flags & CO_FL_LIST_MASK) {
HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
conn_delete_from_tree(conn); conn_delete_from_tree(conn, tid);
HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
} }
} }
@ -2799,7 +2799,7 @@ static struct task *spop_timeout_task(struct task *t, void *context, unsigned in
* to steal it from us. * to steal it from us.
*/ */
if (spop_conn->conn->flags & CO_FL_LIST_MASK) if (spop_conn->conn->flags & CO_FL_LIST_MASK)
conn_delete_from_tree(spop_conn->conn); conn_delete_from_tree(spop_conn->conn, tid);
else if (spop_conn->conn->flags & CO_FL_SESS_IDLE) else if (spop_conn->conn->flags & CO_FL_SESS_IDLE)
session_detach_idle_conn(spop_conn->conn->owner, spop_conn->conn); session_detach_idle_conn(spop_conn->conn->owner, spop_conn->conn);

8
src/server.c
View File

@ -7188,7 +7188,7 @@ static int srv_migrate_conns_to_remove(struct server *srv, int thr, int toremove
break; break;
conn = LIST_ELEM(srv->per_thr[thr].idle_conn_list.n, struct connection *, idle_list); conn = LIST_ELEM(srv->per_thr[thr].idle_conn_list.n, struct connection *, idle_list);
conn_delete_from_tree(conn); conn_delete_from_tree(conn, thr);
MT_LIST_APPEND(&idle_conns[thr].toremove_conns, &conn->toremove_list); MT_LIST_APPEND(&idle_conns[thr].toremove_conns, &conn->toremove_list);
i++; i++;
} }
@ -7263,7 +7263,7 @@ void srv_release_conn(struct server *srv, struct connection *conn)
/* Remove the connection from any tree (safe, idle or available) */ /* Remove the connection from any tree (safe, idle or available) */
if (conn->hash_node) { if (conn->hash_node) {
HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
conn_delete_from_tree(conn); conn_delete_from_tree(conn, tid);
conn->flags &= ~CO_FL_LIST_MASK; conn->flags &= ~CO_FL_LIST_MASK;
HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
} }
@ -7361,7 +7361,7 @@ int srv_add_to_idle_list(struct server *srv, struct connection *conn, int is_saf
_HA_ATOMIC_DEC(&srv->curr_used_conns); _HA_ATOMIC_DEC(&srv->curr_used_conns);
HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock); HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
conn_delete_from_tree(conn); conn_delete_from_tree(conn, tid);
if (is_safe) { if (is_safe) {
conn->flags = (conn->flags & ~CO_FL_LIST_MASK) | CO_FL_SAFE_LIST; conn->flags = (conn->flags & ~CO_FL_LIST_MASK) | CO_FL_SAFE_LIST;
@ -7523,7 +7523,7 @@ static void srv_close_idle_conns(struct server *srv)
if (conn->ctrl->ctrl_close) if (conn->ctrl->ctrl_close)
conn->ctrl->ctrl_close(conn); conn->ctrl->ctrl_close(conn);
conn_delete_from_tree(conn); conn_delete_from_tree(conn, i);
} }
} }
} }

2
src/ssl_sock.c
View File

@ -6422,7 +6422,7 @@ struct task *ssl_sock_io_cb(struct task *t, void *context, unsigned int state)
conn_in_list = 0; conn_in_list = 0;
} }
else { else {
conn_delete_from_tree(conn); conn_delete_from_tree(conn, tid);
} }
} }