2019-01-11 14:52:15 +00:00
|
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
|
|
|
Date: Tue, 8 Jan 2019 12:31:06 +0100
|
2019-11-25 00:04:39 +00:00
|
|
|
Subject: [PATCH 102/290] sched/fair: Make the hrtimers non-hard again
|
|
|
|
|
Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=02fb0a5ce45172d0c7f8f6ad175c42016a7764fe
|
2019-01-11 14:52:15 +00:00
|
|
|
|
|
|
|
|
Since commit "sched/fair: Robustify CFS-bandwidth timer locking" both
|
|
|
|
|
hrtimer can run in softirq context because now interrupts are disabled
|
|
|
|
|
as part of the locking procedure.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
|
|
|
---
|
2019-04-08 23:49:20 +00:00
|
|
|
kernel/sched/fair.c | 4 ++--
|
2019-01-11 14:52:15 +00:00
|
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
2019-04-08 23:49:20 +00:00
|
|
|
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
|
2019-11-25 00:04:39 +00:00
|
|
|
index 5bbc77b948e7..da5d60d25c27 100644
|
2019-01-11 14:52:15 +00:00
|
|
|
--- a/kernel/sched/fair.c
|
|
|
|
|
+++ b/kernel/sched/fair.c
|
2019-11-25 00:04:39 +00:00
|
|
|
@@ -4967,9 +4967,9 @@ void init_cfs_bandwidth(struct cfs_bandwidth *cfs_b)
|
2019-01-11 14:52:15 +00:00
|
|
|
cfs_b->period = ns_to_ktime(default_cfs_period());
|
|
|
|
|
|
|
|
|
|
INIT_LIST_HEAD(&cfs_b->throttled_cfs_rq);
|
|
|
|
|
- hrtimer_init(&cfs_b->period_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED_HARD);
|
|
|
|
|
+ hrtimer_init(&cfs_b->period_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED);
|
|
|
|
|
cfs_b->period_timer.function = sched_cfs_period_timer;
|
|
|
|
|
- hrtimer_init(&cfs_b->slack_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_HARD);
|
|
|
|
|
+ hrtimer_init(&cfs_b->slack_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
|
|
|
|
|
cfs_b->slack_timer.function = sched_cfs_slack_timer;
|
|
|
|
|
cfs_b->distribute_running = 0;
|
|
|
|
|
}
|
