From e7e55a2d3bc3547422583d8f5b3a5a13299a4645 Mon Sep 17 00:00:00 2001
From: factor2431 <factor2431@outlook.com>
Date: Sun, 29 Jun 2025 14:35:16 +0800
Subject: T7589: Add no-split-gso and ack-filter for CAKE

---
 interface-definitions/qos.xml.in  | 19 +++++++++++++++++++
 python/vyos/qos/cake.py           |  9 +++++++++
 smoketest/scripts/cli/test_qos.py | 19 +++++++++++++++++++
 3 files changed, 47 insertions(+)

diff --git a/interface-definitions/qos.xml.in b/interface-definitions/qos.xml.in
index c6ecb742e..aad1de629 100644
--- a/interface-definitions/qos.xml.in
+++ b/interface-definitions/qos.xml.in
@@ -135,6 +135,25 @@
                   <valueless/>
                 </properties>
               </leafNode>
+              <leafNode name="no-split-gso">
+                <properties>
+                  <help>Do not split GSO super-packets into on-the-wire components</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+              <node name="ack-filter">
+                <properties>
+                  <help>Identify and filter out TCP ACK packets that do not convey significant new information</help>
+                </properties>
+                <children>
+                  <leafNode name="aggressive">
+                    <properties>
+                      <help>Enable aggressive mode which will result in more ACK packets being compresses/filtered</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
               <leafNode name="rtt">
                 <properties>
                   <help>Round-Trip-Time for Active Queue Management (AQM)</help>
diff --git a/python/vyos/qos/cake.py b/python/vyos/qos/cake.py
index ca5a26917..a58df5a62 100644
--- a/python/vyos/qos/cake.py
+++ b/python/vyos/qos/cake.py
@@ -54,7 +54,16 @@ class CAKE(QoSBase):
                     f'Invalid flow isolation parameter: {config["flow_isolation"]}'
                 )
 
+        if 'ack_filter' in config:
+            if 'aggressive' in config['ack_filter']:
+                tmp += ' ack-filter-aggressive'
+            else:
+                tmp += ' ack-filter'
+        else:
+            tmp += ' no-ack-filter'
+
         tmp += ' nat' if 'flow_isolation_nat' in config else ' nonat'
+        tmp += ' no-split-gso' if 'no_split_gso' in config else ' split-gso'
 
         self._cmd(tmp)
 
diff --git a/smoketest/scripts/cli/test_qos.py b/smoketest/scripts/cli/test_qos.py
index b3ed7f6dc..4b507852f 100755
--- a/smoketest/scripts/cli/test_qos.py
+++ b/smoketest/scripts/cli/test_qos.py
@@ -884,6 +884,8 @@ class TestQoS(VyOSUnitTestSHIM.TestCase):
             base_path + ['policy', 'cake', policy_name, 'bandwidth', str(bandwidth)]
         )
         self.cli_set(base_path + ['policy', 'cake', policy_name, 'rtt', str(rtt)])
+        self.cli_set(base_path + ['policy', 'cake', policy_name, 'no-split-gso'])
+        self.cli_set(base_path + ['policy', 'cake', policy_name, 'ack-filter', 'aggressive'])
 
         # commit changes
         self.cli_commit()
@@ -899,6 +901,23 @@ class TestQoS(VyOSUnitTestSHIM.TestCase):
         self.assertFalse(tmp['options']['ingress'])
         self.assertFalse(tmp['options']['nat'])
         self.assertTrue(tmp['options']['raw'])
+        self.assertFalse(tmp['options']['split_gso'])
+        self.assertEqual(tmp['options']['ack-filter'], 'aggressive')
+
+        self.cli_delete(base_path + ['policy', 'cake', policy_name, 'ack-filter', 'aggressive'])
+        self.cli_commit()
+        tmp = get_tc_qdisc_json(interface)
+        self.assertEqual(tmp['options']['ack-filter'], 'enabled')
+
+        self.cli_delete(base_path + ['policy', 'cake', policy_name, 'ack-filter'])
+        self.cli_commit()
+        tmp = get_tc_qdisc_json(interface)
+        self.assertEqual(tmp['options']['ack-filter'], 'disabled')
+
+        self.cli_delete(base_path + ['policy', 'cake', policy_name, 'no-split-gso'])
+        self.cli_commit()
+        tmp = get_tc_qdisc_json(interface)
+        self.assertTrue(tmp['options']['split_gso'])
 
         nat = True
         for flow_isolation in [
-- 
cgit v1.2.3