From f91f3697e23474a2786b2e042f44237c5139cd2e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 2 Nov 2025 21:20:56 +0900 Subject: [PATCH] drop queue-6.17/sched-fair-update_cfs_group-for-throttled-cfs_rqs.patch --- ...date_cfs_group-for-throttled-cfs_rqs.patch | 55 ------------------- queue-6.17/series | 1 - 2 files changed, 56 deletions(-) delete mode 100644 queue-6.17/sched-fair-update_cfs_group-for-throttled-cfs_rqs.patch diff --git a/queue-6.17/sched-fair-update_cfs_group-for-throttled-cfs_rqs.patch b/queue-6.17/sched-fair-update_cfs_group-for-throttled-cfs_rqs.patch deleted file mode 100644 index 318b3d523b..0000000000 --- a/queue-6.17/sched-fair-update_cfs_group-for-throttled-cfs_rqs.patch +++ /dev/null @@ -1,55 +0,0 @@ -From cf5b7d7a98bfe5768f519b0840be34ee7ef9d389 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 10 Sep 2025 17:50:42 +0800 -Subject: sched/fair: update_cfs_group() for throttled cfs_rqs - -From: Aaron Lu - -[ Upstream commit fcd394866e3db344cbe0bb485d7e3f741ac07245 ] - -With task based throttle model, tasks in a throttled hierarchy are -allowed to continue to run if they are running in kernel mode. For this -reason, PELT clock is not stopped for these cfs_rqs in throttled -hierarchy when they still have tasks running or queued. - -Since PELT clock is not stopped, whether to allow update_cfs_group() -doing its job for cfs_rqs which are in throttled hierarchy but still -have tasks running/queued is a question. - -The good side is, continue to run update_cfs_group() can get these -cfs_rq entities with an up2date weight and that up2date weight can be -useful to derive an accurate load for the CPU as well as ensure fairness -if multiple tasks of different cgroups are running on the same CPU. -OTOH, as Benjamin Segall pointed: when unthrottle comes around the most -likely correct distribution is the distribution we had at the time of -throttle. - -In reality, either way may not matter that much if tasks in throttled -hierarchy don't run in kernel mode for too long. But in case that -happens, let these cfs_rq entities have an up2date weight seems a good -thing to do. - -Signed-off-by: Aaron Lu -Signed-off-by: Peter Zijlstra (Intel) -Signed-off-by: Sasha Levin ---- - kernel/sched/fair.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 4770d25ae2406..3e0d999e5ee2c 100644 ---- a/kernel/sched/fair.c -+++ b/kernel/sched/fair.c -@@ -3957,9 +3957,6 @@ static void update_cfs_group(struct sched_entity *se) - if (!gcfs_rq || !gcfs_rq->load.weight) - return; - -- if (throttled_hierarchy(gcfs_rq)) -- return; -- - shares = calc_group_shares(gcfs_rq); - if (unlikely(se->load.weight != shares)) - reweight_entity(cfs_rq_of(se), se, shares); --- -2.51.0 - diff --git a/queue-6.17/series b/queue-6.17/series index fc76b3a9b9..53e89009d8 100644 --- a/queue-6.17/series +++ b/queue-6.17/series @@ -17,7 +17,6 @@ edac-fix-wrong-executable-file-modes-for-c-source-fi.patch seccomp-passthrough-uprobe-systemcall-without-filter.patch sched_ext-keep-bypass-on-between-enable-failure-and-.patch x86-bugs-add-attack-vector-controls-for-vmscape.patch -sched-fair-update_cfs_group-for-throttled-cfs_rqs.patch x86-bugs-fix-reporting-of-lfence-retpoline.patch edac-mc_sysfs-increase-legacy-channel-support-to-16.patch cpuset-use-new-excpus-for-nocpu-error-check-when-ena.patch -- 2.47.3