[master] 67f7647dd vmod_debug: Copy transport_reembarking_http1 to transport_vai
Nils Goroll
nils.goroll at uplex.de
Fri Jul 4 17:04:04 UTC 2025
commit 67f7647dd5fe600d69eee3551b5ca823e71355f5
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Tue Jan 14 18:45:05 2025 +0100
vmod_debug: Copy transport_reembarking_http1 to transport_vai
diff --git a/bin/varnishtest/tests/m00061.vtc b/bin/varnishtest/tests/m00061.vtc
new file mode 100644
index 000000000..64295775c
--- /dev/null
+++ b/bin/varnishtest/tests/m00061.vtc
@@ -0,0 +1,44 @@
+varnishtest "VMOD debug vai transport"
+
+server s1 {
+ rxreq
+ txresp -gziplen 13107
+} -start
+
+varnish v1 \
+ -arg "-p fetch_chunksize=4k" \
+ -vcl+backend {
+ import debug;
+
+ sub vcl_hash {
+ hash_data("");
+ return (lookup);
+ }
+
+ sub vcl_deliver {
+ if (req.url == "/chunked") {
+ set resp.filters += " debug.chunked";
+ }
+ debug.use_vai_http1();
+ set resp.http.filters = resp.filters;
+ }
+} -start
+
+varnish v1 -cliok "param.set debug +syncvsl"
+varnish v1 -cliok "param.set debug +req_state"
+
+client c1 -repeat 16 -keepalive {
+ txreq
+ rxresp
+ expect resp.bodylen == 13107
+} -start
+
+client c2 -repeat 16 -keepalive {
+ txreq -url "/chunked"
+ rxresp
+ expect resp.http.Content-Length == <undef>
+ expect resp.bodylen == 13107
+} -start
+
+client c1 -wait
+client c2 -wait
diff --git a/vmod/automake_boilerplate_debug.am b/vmod/automake_boilerplate_debug.am
index 5eb8eadc4..50d418fa8 100644
--- a/vmod/automake_boilerplate_debug.am
+++ b/vmod/automake_boilerplate_debug.am
@@ -10,7 +10,8 @@ libvmod_debug_la_SOURCES = \
vmod_debug_dyn.c \
vmod_debug_filters.c \
vmod_debug_obj.c \
- vmod_debug_transport_reembarking_http1.c
+ vmod_debug_transport_reembarking_http1.c \
+ vmod_debug_transport_vai.c
libvmod_debug_la_CFLAGS =
diff --git a/vmod/vmod_debug.c b/vmod/vmod_debug.c
index ecdd41155..5fac83db3 100644
--- a/vmod/vmod_debug.c
+++ b/vmod/vmod_debug.c
@@ -333,6 +333,7 @@ event_load(VRT_CTX, struct vmod_priv *priv)
debug_add_filters(ctx);
debug_transport_reembarking_http1_init();
+ debug_transport_vai_init();
return (0);
}
@@ -1289,6 +1290,12 @@ xyzzy_use_reembarking_http1(VRT_CTX)
debug_transport_reembarking_http1_use(ctx);
}
+VCL_VOID
+xyzzy_use_vai_http1(VRT_CTX)
+{
+ debug_transport_vai_use(ctx);
+}
+
static int
in_oc(struct worker *wrk, struct objcore *oc, const char *p)
{
diff --git a/vmod/vmod_debug.h b/vmod/vmod_debug.h
index be09c46cc..641148bfd 100644
--- a/vmod/vmod_debug.h
+++ b/vmod/vmod_debug.h
@@ -39,3 +39,9 @@ void
debug_transport_reembarking_http1_use(VRT_CTX);
void
debug_transport_reembarking_http1_init(void);
+
+/* vmod_debug_transport_vai.c */
+void
+debug_transport_vai_use(VRT_CTX);
+void
+debug_transport_vai_init(void);
diff --git a/vmod/vmod_debug.vcc b/vmod/vmod_debug.vcc
index bf69c6e34..d752c1eba 100644
--- a/vmod/vmod_debug.vcc
+++ b/vmod/vmod_debug.vcc
@@ -491,6 +491,13 @@ Example::
Debug c prefix[0]: (ws) 0x7fe69ef80420 abcd...
+$Function VOID use_vai_http1()
+
+$Restrict vcl_deliver
+
+Switch to the VAI http1 debug transport. Calling it from any other
+transport than http1 results in VCL failure.
+
DEPRECATED
==========
diff --git a/vmod/vmod_debug_transport_vai.c b/vmod/vmod_debug_transport_vai.c
new file mode 100644
index 000000000..ca1902804
--- /dev/null
+++ b/vmod/vmod_debug_transport_vai.c
@@ -0,0 +1,227 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2015 Varnish Software AS
+ * Copyright 2024 UPLEX - Nils Goroll Systemoptimierung
+ * All rights reserved.
+ *
+ * Authors: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ * Nils Goroll <slink at uplex.de>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include "cache/cache_varnishd.h"
+
+#include "cache/cache_filter.h"
+#include "cache/cache_transport.h"
+#include "http1/cache_http1.h"
+
+#include "vmod_debug.h"
+
+static void
+dbg_vai_error(struct req *req, struct v1l **v1lp, const char *msg)
+{
+
+ (void)req;
+ (void)v1lp;
+ (void)msg;
+ INCOMPL();
+}
+
+static void dbg_vai_deliver_finish(struct req *req, struct v1l **v1lp, int err);
+static void dbg_vai_sendbody(struct worker *wrk, void *arg);
+
+static task_func_t *hack_http1_req = NULL;
+
+// copied from cache_http_deliver.c, then split & modified
+static enum vtr_deliver_e v_matchproto_(vtr_deliver_f)
+dbg_vai_deliver(struct req *req, int sendbody)
+{
+ struct vrt_ctx ctx[1];
+ struct v1l *v1l;
+
+ CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
+ CHECK_OBJ_ORNULL(req->boc, BOC_MAGIC);
+ CHECK_OBJ_NOTNULL(req->objcore, OBJCORE_MAGIC);
+
+ if (req->doclose == SC_NULL &&
+ http_HdrIs(req->resp, H_Connection, "close")) {
+ req->doclose = SC_RESP_CLOSE;
+ } else if (req->doclose != SC_NULL) {
+ if (!http_HdrIs(req->resp, H_Connection, "close")) {
+ http_Unset(req->resp, H_Connection);
+ http_SetHeader(req->resp, "Connection: close");
+ }
+ } else if (!http_GetHdr(req->resp, H_Connection, NULL))
+ http_SetHeader(req->resp, "Connection: keep-alive");
+
+ CHECK_OBJ_NOTNULL(req->wrk, WORKER_MAGIC);
+
+ v1l = V1L_Open(req->ws, &req->sp->fd, req->vsl,
+ req->t_prev + SESS_TMO(req->sp, send_timeout),
+ cache_param->http1_iovs);
+
+ if (v1l == NULL) {
+ dbg_vai_error(req, &v1l, "Failure to init v1d (workspace_thread overflow)");
+ return (VTR_D_DONE);
+ }
+
+ // Do not roll back req->ws upon V1L_Close()
+ V1L_NoRollback(v1l);
+
+ if (sendbody) {
+ if (!http_GetHdr(req->resp, H_Content_Length, NULL)) {
+ if (req->http->protover == 11) {
+ http_SetHeader(req->resp,
+ "Transfer-Encoding: chunked");
+ } else {
+ req->doclose = SC_TX_EOF;
+ }
+ }
+ INIT_OBJ(ctx, VRT_CTX_MAGIC);
+ VCL_Req2Ctx(ctx, req);
+ if (VDP_Push(ctx, req->vdc, req->ws, VDP_v1l, v1l)) {
+ dbg_vai_error(req, &v1l, "Failure to push v1d processor");
+ return (VTR_D_DONE);
+ }
+ }
+
+ if (WS_Overflowed(req->ws)) {
+ dbg_vai_error(req, &v1l, "workspace_client overflow");
+ return (VTR_D_DONE);
+ }
+
+ if (WS_Overflowed(req->sp->ws)) {
+ dbg_vai_error(req, &v1l, "workspace_session overflow");
+ return (VTR_D_DONE);
+ }
+
+ if (WS_Overflowed(req->wrk->aws)) {
+ dbg_vai_error(req, &v1l, "workspace_thread overflow");
+ return (VTR_D_DONE);
+ }
+
+ req->acct.resp_hdrbytes += HTTP1_Write(v1l, req->resp, HTTP1_Resp);
+
+ if (! sendbody) {
+ dbg_vai_deliver_finish(req, &v1l, 0);
+ return (VTR_D_DONE);
+ }
+
+ (void)V1L_Flush(v1l);
+
+ if (hack_http1_req == NULL)
+ hack_http1_req = req->task->func;
+ AN(hack_http1_req);
+
+ VSLb(req->vsl, SLT_Debug, "w=%p scheduling dbg_vai_sendbody", req->wrk);
+
+ req->task->func = dbg_vai_sendbody;
+ req->task->priv = req;
+
+ req->wrk = NULL;
+ req->vdc->wrk = NULL;
+ req->transport_priv = v1l;
+
+ AZ(Pool_Task(req->sp->pool, req->task, TASK_QUEUE_RUSH));
+ return (VTR_D_DISEMBARK);
+}
+
+static void v_matchproto_(task_func_t)
+dbg_vai_sendbody(struct worker *wrk, void *arg)
+{
+ struct req *req;
+ struct v1l *v1l;
+ const char *p;
+ int err, chunked;
+
+ CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+ CAST_OBJ_NOTNULL(req, arg, REQ_MAGIC);
+ v1l = req->transport_priv;
+ req->transport_priv = NULL;
+ AN(v1l);
+
+ THR_SetRequest(req);
+ VSLb(req->vsl, SLT_Debug, "w=%p enter dbg_vai_sendbody", wrk);
+ AZ(req->wrk);
+ CNT_Embark(wrk, req);
+ req->vdc->wrk = wrk; // move to CNT_Embark?
+
+ chunked = http_GetHdr(req->resp, H_Transfer_Encoding, &p) && strcmp(p, "chunked") == 0;
+ if (chunked)
+ V1L_Chunked(v1l);
+ err = VDP_DeliverObj(req->vdc, req->objcore);
+ if (!err && chunked)
+ V1L_EndChunk(v1l);
+ dbg_vai_deliver_finish(req, &v1l, err);
+
+ VSLb(req->vsl, SLT_Debug, "w=%p resuming http1_req", wrk);
+ wrk->task->func = hack_http1_req;
+ wrk->task->priv = req;
+}
+
+static void
+dbg_vai_deliver_finish(struct req *req, struct v1l **v1lp, int err)
+{
+ stream_close_t sc;
+ uint64_t bytes;
+
+ sc = V1L_Close(v1lp, &bytes);
+
+ req->acct.resp_bodybytes += VDP_Close(req->vdc, req->objcore, req->boc);
+
+ if (sc == SC_NULL && err && req->sp->fd >= 0)
+ sc = SC_REM_CLOSE;
+ if (sc != SC_NULL)
+ Req_Fail(req, sc);
+}
+
+static struct transport DBG_transport;
+
+void
+debug_transport_vai_init(void)
+{
+ DBG_transport = HTTP1_transport;
+ DBG_transport.name = "DBG VAI";
+ DBG_transport.deliver = dbg_vai_deliver;
+}
+
+void
+debug_transport_vai_use(VRT_CTX)
+{
+ struct req *req;
+
+ CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
+ req = ctx->req;
+ CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
+
+ if (req->transport != &HTTP1_transport) {
+ VRT_fail(ctx, "Only works on built-in http1 transport");
+ return;
+ }
+ AZ(req->transport_priv);
+ req->transport = &DBG_transport;
+}
More information about the varnish-commit
mailing list