8f638f9366
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.91 Remove upstreamed patches: - airoha/patches-6.12/017-v6.13-net-airoha-Implement-BQL-support.patch[1] - airoha/patches-6.12/138-v7.1-net-airoha-Add-missing-RX_CPU_IDX-configuration-in-a.patch[2] - airoha/patches-6.12/149-v7.1-net-airoha-Move-ndesc-initialization-at-end-of-airoh.patch[3] - generic/backport-6.12/940-v7.1-net-dsa-realtek-rtl8365mb-fix-mode-mask-calculation.patch[5] Manually rebased patches: - airoha/patches-6.12/048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol.patch[1] - ath79/patches-6.12/800-leds-add-reset-controller-based-driver.patch[4] - bcm27xx/patches-6.12/950-0122-bcmgenet-Better-coalescing-parameter-defaults.patch[6] We also backported four patches to fix perf tool regression: - generic/backport-6.12/216-01-revert-perf-cgroup-update-metric-leader-in-evlist__e.patch - generic/backport-6.12/216-02-revert-perf-tool_pmu-fix-aggregation-on-duration_tim.patch - generic/backport-6.12/216-03-revert-perf-python-add-parse_events-function.patch - generic/backport-6.12/216-04-revert-perf-tool_pmu-factor-tool-events-into-their-o.patch All other patches are automatically refreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=ca24fcac1daaa5e8a667981d81986a3eb4b9fb04 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=f00037a99bc2332ef59dc85298b98b20af165904 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=d36be272adda7f313e39dd118086955d993bf6a7 [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=07d3611389ba7d78b80ea360a42ce32ab2521fbc [5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=3354d6c62fd4baa7b32cbd80cc5a8aa3f2bd0656 [6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=b84351dcc359667bc952131c1424b692ec83dce2 Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/23444 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
|
|
@@ -2013,7 +2016,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;
|
|
@@ -3353,8 +3356,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;
|
|
}
|
|
@@ -3363,6 +3371,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)
|