17f5538441
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.18.33 Removed upstreamed: generic/backport-6.18/742-v7.1-r8152-fix-incorrect-register-write-to-USB_UPHY_XTAL.patch[1] generic/backport-6.18/827-v7.0-crypto-inside-secure-eip93-fix-register-definition.patch[2] generic/backport-6.18/828-v7.0-crypto-inside-secure-eip93-register-hash-before-auth.patch[3] generic/backport-6.18/940-v7.1-net-dsa-realtek-rtl8365mb-fix-mode-mask-calculation.patch[4] generic/pending-6.18/928-crypto-eip93-fix-hmac-setkey-algo-selection.patch[5] All other patches automatically rebased via update_kernel.sh 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.18.33&id=50c601805fe3 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.18.33&id=7ed07c9ce525 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.18.33&id=b6263eb2b188 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.18.33&id=b707f3109f1a 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.18.33&id=fc9310d79fdb Build system: x86/64 Build-tested: x86/64-glibc Run-tested: x86/64-glibc Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/23419 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
69 lines
2.2 KiB
Diff
69 lines
2.2 KiB
Diff
From 4eb720d360d3fc227eedbc76993719e1906c418c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Jonas=20K=C3=B6ppeler?= <j.koeppeler@tu-berlin.de>
|
|
Date: Wed, 11 Mar 2026 17:42:44 +0100
|
|
Subject: [PATCH] net/sched: sch_cake: configure sync_time via debugfs
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Add a debugfs entry for sync_time to allow runtime adjustment of its
|
|
value without recompilation. sync_time is specified in nanoseconds;
|
|
setting it to 0 triggers synchronization on every packet.
|
|
|
|
Signed-off-by: Jonas Köppeler <j.koeppeler@tu-berlin.de>
|
|
---
|
|
net/sched/sch_cake.c | 13 +++++++++++--
|
|
1 file changed, 11 insertions(+), 2 deletion(-)
|
|
|
|
--- a/net/sched/sch_cake.c
|
|
+++ b/net/sched/sch_cake.c
|
|
@@ -71,6 +71,7 @@
|
|
#include <net/pkt_cls.h>
|
|
#include <net/tcp.h>
|
|
#include <net/flow_dissector.h>
|
|
+#include <linux/debugfs.h>
|
|
|
|
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
|
|
#include <net/netfilter/nf_conntrack_core.h>
|
|
@@ -81,6 +82,8 @@
|
|
#define CAKE_QUEUES (1024)
|
|
#define CAKE_FLOW_MASK 63
|
|
#define CAKE_FLOW_NAT_FLAG 64
|
|
+static u64 g_sync_time_ns = 200*NSEC_PER_USEC;
|
|
+static struct dentry *cake_mq_debugfs;
|
|
|
|
/* struct cobalt_params - contains codel and blue parameters
|
|
* @interval: codel initial drop rate
|
|
@@ -2019,7 +2022,7 @@ static struct sk_buff *cake_dequeue(stru
|
|
u32 len;
|
|
|
|
if (q->config->is_shared && q->rate_ns &&
|
|
- now - q->last_checked_active >= q->config->sync_time) {
|
|
+ now - q->last_checked_active >= g_sync_time_ns) {
|
|
struct net_device *dev = qdisc_dev(sch);
|
|
struct cake_sched_data *other_priv;
|
|
u64 new_rate = q->config->rate_bps;
|
|
@@ -3361,8 +3364,13 @@ static int __init cake_module_init(void)
|
|
return ret;
|
|
|
|
ret = register_qdisc(&cake_mq_qdisc_ops);
|
|
- if (ret)
|
|
+ if (ret) {
|
|
unregister_qdisc(&cake_qdisc_ops);
|
|
+ } else {
|
|
+ struct dentry *cake_mq_debugfs = debugfs_create_dir("cake_mq", NULL);
|
|
+
|
|
+ debugfs_create_u64("sync_time_ns", 0644, cake_mq_debugfs, &g_sync_time_ns);
|
|
+ }
|
|
|
|
return ret;
|
|
}
|
|
@@ -3371,6 +3379,7 @@ static void __exit cake_module_exit(void
|
|
{
|
|
unregister_qdisc(&cake_qdisc_ops);
|
|
unregister_qdisc(&cake_mq_qdisc_ops);
|
|
+ debugfs_remove_recursive(cake_mq_debugfs);
|
|
}
|
|
|
|
module_init(cake_module_init)
|