MINOR: global: add tune.pt.zero-copy-forwarding

Signed-off-by: Vincent Gramer <[email protected]>
haproxytech · Dec 5, 2023 · 368ce77 · 368ce77
1 parent ca44a7a
commit 368ce77
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 2 deletions.
diff --git a/configuration/configuration_test.go b/configuration/configuration_test.go
@@ -85,6 +85,7 @@ global
   tune.pipesize 32
   tune.pool-high-fd-ratio 33
   tune.pool-low-fd-ratio 34
+  tune.pt.zero-copy-forwarding on
   tune.rcvbuf.backend 1024
   tune.rcvbuf.client 35
   tune.rcvbuf.frontend 2048

diff --git a/configuration/global.go b/configuration/global.go
@@ -2572,6 +2572,9 @@ func serializeTuneOptions(p parser.Parser, options *models.GlobalTuneOptions) er
 	if err := serializeOnOffOption(p, "tune.h2.zero-copy-fwd-send", options.H2ZeroCopyFwdSend); err != nil {
 		return err
 	}
+	if err := serializeOnOffOption(p, "tune.pt.zero-copy-forwarding", options.PtZeroCopyForwarding); err != nil {
+		return err
+	}
 	return serializeInt64Option(p, "tune.zlib.windowsize", options.ZlibWindowsize)
 }
 
@@ -3216,6 +3219,12 @@ func parseTuneOptions(p parser.Parser) (*models.GlobalTuneOptions, error) { //no
 	}
 	options.H2ZeroCopyFwdSend = strOption
 
+	strOption, err = parseOnOffOption(p, "tune.pt.zero-copy-forwarding")
+	if err != nil {
+		return nil, err
+	}
+	options.PtZeroCopyForwarding = strOption
+
 	return options, nil
 }
 

diff --git a/configuration/global_test.go b/configuration/global_test.go
@@ -381,6 +381,9 @@ func TestGetGlobal(t *testing.T) {
 	if global.TuneOptions.PoolLowFdRatio != 34 {
 		t.Errorf("PoolLowFdRatio is %v, expected 34", global.TuneOptions.PoolLowFdRatio)
 	}
+	if global.TuneOptions.PtZeroCopyForwarding != "enabled" {
+		t.Errorf("PtZeroCopyForwarding is %v, expected enabled", global.TuneOptions.PtZeroCopyForwarding)
+	}
 	if *global.TuneOptions.RcvbufBackend != 1024 {
 		t.Errorf("RcvbufBackend is %v, expected 1024", global.TuneOptions.RcvbufBackend)
 	}
@@ -747,6 +750,7 @@ func TestPutGlobal(t *testing.T) {
 			LuaLogStderr:                   "disabled",
 			MaxChecksPerThread:             misc.Int64P(20),
 			PeersMaxUpdatesAtOnce:          100,
+			PtZeroCopyForwarding:           "disabled",
 			QuicFrontendConnTxBuffersLimit: nil,
 			QuicFrontendMaxIdleTimeout:     misc.Int64P(5000),
 			QuicSocketOwner:                "listener",

diff --git a/models/global.go b/models/global.go
diff --git a/models/global_compare.go b/models/global_compare.go
diff --git a/models/global_compare_test.go b/models/global_compare_test.go
diff --git a/specification/build/haproxy_spec.yaml b/specification/build/haproxy_spec.yaml
@@ -1751,6 +1751,12 @@ definitions:
                   pool_low_fd_ratio:
                       type: integer
                       x-display-name: Max Used Low FD Ratio
+                  pt_zero_copy_forwarding:
+                      enum:
+                          - enabled
+                          - disabled
+                      type: string
+                      x-display-name: enable or disable the zero-copy forwarding of data for the pass-through multiplexer
                   quic_frontend_conn_tx_buffers_limit:
                       type: integer
                       x-display-name: QUIC Frontend Connection TX Buffer Limit

diff --git a/specification/models/configuration/global.yaml b/specification/models/configuration/global.yaml
@@ -437,6 +437,10 @@ global:
         pool_low_fd_ratio:
           type: integer
           x-display-name: Max Used Low FD Ratio
+        pt_zero_copy_forwarding:
+          type: string
+          enum: [enabled, disabled]
+          x-display-name: enable or disable the zero-copy forwarding of data for the pass-through multiplexer
         rcvbuf_backend:
           type: integer
           x-display-name: Backend Receive Buffer Size