Skip to content
This repository was archived by the owner on Feb 16, 2026. It is now read-only.

http2: Move all socket operations to the session thread #4368

Open
dridi wants to merge 39 commits into
base: master
Choose a base branch
from
Open

http2: Move all socket operations to the session thread #4368

Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
a9e1667
vtc: White space cleanup in t02027
dridi Jul 17, 2025
6e33056
vtc: Stabilize r2387
dridi Jul 18, 2025
541ecb1
vefd: Thin emulation layer over eventfd
dridi Jun 13, 2025
4c0b6f5
build: Detect eventfd() at configure time
dridi Jun 13, 2025
845dfc5
vefd: Use eventfd() when available
dridi Jun 13, 2025
bd12dce
http2_session: Always pass a req to h2_init_sess()
mbgrydeland Mar 3, 2025
04fbc50
http2_proto: Take immediate ownership of req in h2_req
mbgrydeland Mar 3, 2025
e37c41a
http2_session: Remove misleading return value
mbgrydeland Apr 9, 2025
b0c75fd
http2_session: Rename h2_ou_rel() to h2_ou_rel_req()
mbgrydeland Apr 9, 2025
433106d
http2_session: Take ownership of req in h2_ou_rel_req()
mbgrydeland Apr 9, 2025
b19d4e7
http2_proto: Make h2_del_req() take the struct h2_req
mbgrydeland Mar 3, 2025
950a578
http2_session: Directly return the h2_req set up
mbgrydeland Mar 3, 2025
a1ba004
http2_session: Await PRISM req just after 101 resp
mbgrydeland Mar 3, 2025
b7a2fe6
http2_proto: Expose h2_tx_goaway()
mbgrydeland Mar 5, 2025
24277a7
http2_proto: Release WS in h2_rxframe() on early return
mbgrydeland Mar 5, 2025
8d02710
http2_session: Process OU req after sending settings
mbgrydeland Mar 5, 2025
ce499f9
http2: Consolidate frame flags
mbgrydeland Mar 27, 2025
dd79a62
http2_proto: Drain stale comment
mbgrydeland Apr 17, 2025
eec922f
viov: New VIOV_prune() function
mbgrydeland Apr 10, 2025
7b68db3
http2_send: Adopt VIOV_prune()
mbgrydeland Apr 17, 2025
a758f8d
http2_deliver: Rename VDP callbacks to h2_vdp_*()
mbgrydeland Apr 17, 2025
cc63579
http2_deliver: Prepare response flags upfront
mbgrydeland Apr 17, 2025
4b7150d
http2_deliver: Prepare minimal response flags upfront
mbgrydeland Apr 17, 2025
d015983
http2_reqbody: Manage req body in its own file
mbgrydeland Apr 10, 2025
25eb677
http2: Rename h2_req::[rt]_window fields
mbgrydeland Apr 17, 2025
01e82b7
http2: Rename ASSERT_RXTHR() to ASSERT_H2_SESS()
mbgrydeland Apr 17, 2025
2610bc0
http2_send: Move h2_errcheck() to cache_http2_proto.c
mbgrydeland Apr 18, 2025
319c043
http2_session: Associate an eventfd to each h2_sess
mbgrydeland Mar 7, 2025
8373853
http2: Rework HTTP/2 to be using non-blocking sockets
mbgrydeland Mar 25, 2025
fffe00d
http2_proto: Enforce preface SETTINGS frame
mbgrydeland Apr 16, 2025
1553eca
http2_proto: Centralize stream state changes
mbgrydeland Apr 22, 2025
d9823ba
H2: Turn session send shutdown into a two stage operation
mbgrydeland May 22, 2025
78b0d0b
H2: Fix a bad assertion being made
mbgrydeland May 22, 2025
f809988
H2: Set connection error if we kill the req holding the hpack lock
mbgrydeland May 22, 2025
f766328
H2: Don't call h2_kill_req() from within h2_rx_rst_stream()
mbgrydeland May 25, 2025
359ee11
H2: Clear the h2_req magic value when freeing the req
mbgrydeland May 25, 2025
d1187c7
H2: Don't refund connection window on updates on closed streams
mbgrydeland Jun 5, 2025
d9691fc
H2: Don't lock when adding a new req
mbgrydeland Jun 12, 2025
022025f
H2: Hold session lock while checking the req scheduled status
mbgrydeland Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions bin/varnishd/http2/cache_http2_proto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ h2_del_req(struct worker *wrk, struct h2_req **pr2)
struct h2_sess *h2;
struct sess *sp;
struct stv_buffer *stvbuf;
struct req *req;

TAKE_OBJ_NOTNULL(r2, pr2, H2_REQ_MAGIC);
AZ(r2->scheduled);
Expand All @@ -218,10 +219,16 @@ h2_del_req(struct worker *wrk, struct h2_req **pr2)
AZ(stvbuf);
}

Req_Cleanup(sp, wrk, r2->req);
req = r2->req;
CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
r2->magic = 0;
req->transport_priv = NULL;
Comment on lines +222 to +223

@mbgrydeland mbgrydeland Jul 28, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe these two lines need to be moved after Req_Cleanup(). This due to Req_Cleanup() calling VDP_Fini(), which I guess may for some VDP call on code expecting to see the complete structure.

@dridi dridi Sep 8, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, I forgot about the increased scope of Req_Cleanup() in this branch.


AZ(req->ws->r);
Req_Cleanup(sp, wrk, req);
if (FEATURE(FEATURE_BUSY_STATS_RATE))
WRK_AddStat(wrk);
Req_Release(r2->req);
Req_Release(req);
}

void
Expand Down