History

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull scheduler fixes from Thomas Gleixner: "A few scheduler fixes: - Prevent a bogus warning vs. runqueue clock update flags in do_sched_rt_period_timer() - Simplify the helper functions which handle requests for skipping the runqueue clock updat. - Do not unlock the tunables mutex in the error path of the cpu frequency scheduler utils. Its not held. - Enforce proper alignement for 'struct util_est' in sched_avg to prevent a misalignment fault on IA64" * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched/core: Force proper alignment of 'struct util_est' sched/core: Simplify helpers for rq clock update skip requests sched/rt: Fix rq->clock_update_flags < RQCF_ACT_SKIP warning sched/cpufreq/schedutil: Fix error path mutex unlock

Linus Torvalds committed 8 years ago

Commit 71b8ebb2 parents 174e719 317d3597 files · +22 −14Browse files

Unified · Split

7 files
  1. include/linux/sched.h +3 −3
  2. kernel/sched/core.c +1 −1
  3. kernel/sched/cpufreq_schedutil.c +1 −2
  4. kernel/sched/deadline.c +1 −1
  5. kernel/sched/fair.c +1 −1
  6. kernel/sched/rt.c +3 −1
  7. kernel/sched/sched.h +12 −5
include/linux/sched.h+3−3
@@ -300,7 +300,7 @@ struct util_est { · 299 unmodified lines
300300 unsigned int enqueued;
301301 unsigned int ewma;
302302 #define UTIL_EST_WEIGHT_SHIFT 2
303−};
303+} __attribute__((__aligned__(sizeof(u64))));
304304
305305 /*
306306 * The load_avg/util_avg accumulates an infinite geometric series
@@ -364,7 +364,7 @@ struct sched_avg { · 57 unmodified lines
364364 unsigned long runnable_load_avg;
365365 unsigned long util_avg;
366366 struct util_est util_est;
367−};
367+} ____cacheline_aligned;
368368
369369 struct sched_statistics {
370370 #ifdef CONFIG_SCHEDSTATS
@@ -435,7 +435,7 @@ struct sched_entity { · 64 unmodified lines
435435 * Put into separate cache line so it does not
436436 * collide with read-mostly values above.
437437 */
438− struct sched_avg avg ____cacheline_aligned_in_smp;
438+ struct sched_avg avg;
439439 #endif
440440 };
441441
kernel/sched/core.c+1−1
@@ -874,7 +874,7 @@ void check_preempt_curr(struct rq *rq, struct task_struct *p, int flags) · 873 unmodified lines
874874 * this case, we can save a useless back to back clock update.
875875 */
876876 if (task_on_rq_queued(rq->curr) && test_tsk_need_resched(rq->curr))
877− rq_clock_skip_update(rq, true);
877+ rq_clock_skip_update(rq);
878878 }
879879
880880 #ifdef CONFIG_SMP
kernel/sched/cpufreq_schedutil.c+1−2
@@ -631,10 +631,9 @@ fail: · 630 unmodified lines
631631
632632 stop_kthread:
633633 sugov_kthread_stop(sg_policy);
634−
635−free_sg_policy:
636634 mutex_unlock(&global_tunables_lock);
637635
636+free_sg_policy:
638637 sugov_policy_free(sg_policy);
639638
640639 disable_fast_switch:
kernel/sched/deadline.c+1−1
@@ -1560,7 +1560,7 @@ static void yield_task_dl(struct rq *rq) · 1559 unmodified lines
15601560 * so we don't do microscopic update in schedule()
15611561 * and double the fastpath cost.
15621562 */
1563− rq_clock_skip_update(rq, true);
1563+ rq_clock_skip_update(rq);
15641564 }
15651565
15661566 #ifdef CONFIG_SMP
kernel/sched/fair.c+1−1
@@ -7089,7 +7089,7 @@ static void yield_task_fair(struct rq *rq) · 7088 unmodified lines
70897089 * so we don't do microscopic update in schedule()
70907090 * and double the fastpath cost.
70917091 */
7092− rq_clock_skip_update(rq, true);
7092+ rq_clock_skip_update(rq);
70937093 }
70947094
70957095 set_skip_buddy(se);
kernel/sched/rt.c+3−1
@@ -839,6 +839,8 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun) · 838 unmodified lines
839839 continue;
840840
841841 raw_spin_lock(&rq->lock);
842+ update_rq_clock(rq);
843+
842844 if (rt_rq->rt_time) {
843845 u64 runtime;
844846
@@ -859,7 +861,7 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun) · 14 unmodified lines
859861 * 'runtime'.
860862 */
861863 if (rt_rq->rt_nr_running && rq->curr == rq->idle)
862− rq_clock_skip_update(rq, false);
864+ rq_clock_cancel_skipupdate(rq);
863865 }
864866 if (rt_rq->rt_time || rt_rq->rt_nr_running)
865867 idle = 0;
kernel/sched/sched.h+12−5
@@ -976,13 +976,20 @@ static inline u64 rq_clock_task(struct rq *rq) · 975 unmodified lines
976976 return rq->clock_task;
977977 }
978978
979−static inline void rq_clock_skip_update(struct rq *rq, bool skip)
979+static inline void rq_clock_skip_update(struct rq *rq)
980980 {
981981 lockdep_assert_held(&rq->lock);
982− if (skip)
983− rq->clock_update_flags |= RQCF_REQ_SKIP;
984− else
985− rq->clock_update_flags &= ~RQCF_REQ_SKIP;
982+ rq->clock_update_flags |= RQCF_REQ_SKIP;
983+}
984+
985+/*
986+ * See rt task throttoling, which is the only time a skip
987+ * request is cancelled.
988+ */
989+static inline void rq_clock_cancel_skipupdate(struct rq *rq)
990+{
991+ lockdep_assert_held(&rq->lock);
992+ rq->clock_update_flags &= ~RQCF_REQ_SKIP;
986993 }
987994
988995 struct rq_flags {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t