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
Unified · Split
| @@ -300,7 +300,7 @@ struct util_est { · 299 unmodified lines | |||
| 300 | unsigned int enqueued; | 300 | unsigned int enqueued; |
| 301 | unsigned int ewma; | 301 | unsigned int ewma; |
| 302 | #define UTIL_EST_WEIGHT_SHIFT 2 | 302 | #define UTIL_EST_WEIGHT_SHIFT 2 |
| 303 | }; | 303 | } __attribute__((__aligned__(sizeof(u64)))); |
| 304 | 304 | ||
| 305 | /* | 305 | /* |
| 306 | * The load_avg/util_avg accumulates an infinite geometric series | 306 | * The load_avg/util_avg accumulates an infinite geometric series |
| @@ -364,7 +364,7 @@ struct sched_avg { · 57 unmodified lines | |||
| 364 | unsigned long runnable_load_avg; | 364 | unsigned long runnable_load_avg; |
| 365 | unsigned long util_avg; | 365 | unsigned long util_avg; |
| 366 | struct util_est util_est; | 366 | struct util_est util_est; |
| 367 | }; | 367 | } ____cacheline_aligned; |
| 368 | 368 | ||
| 369 | struct sched_statistics { | 369 | struct sched_statistics { |
| 370 | #ifdef CONFIG_SCHEDSTATS | 370 | #ifdef CONFIG_SCHEDSTATS |
| @@ -435,7 +435,7 @@ struct sched_entity { · 64 unmodified lines | |||
| 435 | * Put into separate cache line so it does not | 435 | * Put into separate cache line so it does not |
| 436 | * collide with read-mostly values above. | 436 | * collide with read-mostly values above. |
| 437 | */ | 437 | */ |
| 438 | struct sched_avg avg ____cacheline_aligned_in_smp; | 438 | struct sched_avg avg; |
| 439 | #endif | 439 | #endif |
| 440 | }; | 440 | }; |
| 441 | 441 | ||
| @@ -874,7 +874,7 @@ void check_preempt_curr(struct rq *rq, struct task_struct *p, int flags) · 873 unmodified lines | |||
| 874 | * this case, we can save a useless back to back clock update. | 874 | * this case, we can save a useless back to back clock update. |
| 875 | */ | 875 | */ |
| 876 | if (task_on_rq_queued(rq->curr) && test_tsk_need_resched(rq->curr)) | 876 | 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); |
| 878 | } | 878 | } |
| 879 | 879 | ||
| 880 | #ifdef CONFIG_SMP | 880 | #ifdef CONFIG_SMP |
| @@ -631,10 +631,9 @@ fail: · 630 unmodified lines | |||
| 631 | 631 | ||
| 632 | stop_kthread: | 632 | stop_kthread: |
| 633 | sugov_kthread_stop(sg_policy); | 633 | sugov_kthread_stop(sg_policy); |
| 634 | |||
| 635 | free_sg_policy: | ||
| 636 | mutex_unlock(&global_tunables_lock); | 634 | mutex_unlock(&global_tunables_lock); |
| 637 | 635 | ||
| 636 | free_sg_policy: | ||
| 638 | sugov_policy_free(sg_policy); | 637 | sugov_policy_free(sg_policy); |
| 639 | 638 | ||
| 640 | disable_fast_switch: | 639 | disable_fast_switch: |
| @@ -1560,7 +1560,7 @@ static void yield_task_dl(struct rq *rq) · 1559 unmodified lines | |||
| 1560 | * so we don't do microscopic update in schedule() | 1560 | * so we don't do microscopic update in schedule() |
| 1561 | * and double the fastpath cost. | 1561 | * and double the fastpath cost. |
| 1562 | */ | 1562 | */ |
| 1563 | rq_clock_skip_update(rq, true); | 1563 | rq_clock_skip_update(rq); |
| 1564 | } | 1564 | } |
| 1565 | 1565 | ||
| 1566 | #ifdef CONFIG_SMP | 1566 | #ifdef CONFIG_SMP |
| @@ -7089,7 +7089,7 @@ static void yield_task_fair(struct rq *rq) · 7088 unmodified lines | |||
| 7089 | * so we don't do microscopic update in schedule() | 7089 | * so we don't do microscopic update in schedule() |
| 7090 | * and double the fastpath cost. | 7090 | * and double the fastpath cost. |
| 7091 | */ | 7091 | */ |
| 7092 | rq_clock_skip_update(rq, true); | 7092 | rq_clock_skip_update(rq); |
| 7093 | } | 7093 | } |
| 7094 | 7094 | ||
| 7095 | set_skip_buddy(se); | 7095 | set_skip_buddy(se); |
| @@ -839,6 +839,8 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun) · 838 unmodified lines | |||
| 839 | continue; | 839 | continue; |
| 840 | 840 | ||
| 841 | raw_spin_lock(&rq->lock); | 841 | raw_spin_lock(&rq->lock); |
| 842 | update_rq_clock(rq); | ||
| 843 | |||
| 842 | if (rt_rq->rt_time) { | 844 | if (rt_rq->rt_time) { |
| 843 | u64 runtime; | 845 | u64 runtime; |
| 844 | 846 | ||
| @@ -859,7 +861,7 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun) · 14 unmodified lines | |||
| 859 | * 'runtime'. | 861 | * 'runtime'. |
| 860 | */ | 862 | */ |
| 861 | if (rt_rq->rt_nr_running && rq->curr == rq->idle) | 863 | if (rt_rq->rt_nr_running && rq->curr == rq->idle) |
| 862 | rq_clock_skip_update(rq, false); | 864 | rq_clock_cancel_skipupdate(rq); |
| 863 | } | 865 | } |
| 864 | if (rt_rq->rt_time || rt_rq->rt_nr_running) | 866 | if (rt_rq->rt_time || rt_rq->rt_nr_running) |
| 865 | idle = 0; | 867 | idle = 0; |
| @@ -976,13 +976,20 @@ static inline u64 rq_clock_task(struct rq *rq) · 975 unmodified lines | |||
| 976 | return rq->clock_task; | 976 | return rq->clock_task; |
| 977 | } | 977 | } |
| 978 | 978 | ||
| 979 | static inline void rq_clock_skip_update(struct rq *rq, bool skip) | 979 | static inline void rq_clock_skip_update(struct rq *rq) |
| 980 | { | 980 | { |
| 981 | lockdep_assert_held(&rq->lock); | 981 | lockdep_assert_held(&rq->lock); |
| 982 | if (skip) | 982 | rq->clock_update_flags |= RQCF_REQ_SKIP; |
| 983 | rq->clock_update_flags |= RQCF_REQ_SKIP; | 983 | } |
| 984 | else | 984 | |
| 985 | rq->clock_update_flags &= ~RQCF_REQ_SKIP; | 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; | ||
| 986 | } | 993 | } |
| 987 | 994 | ||
| 988 | struct rq_flags { | 995 | struct rq_flags { |