scheduler fixes
Linus,
Please pull the latest sched-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-for-linus
HEAD: bf0bd948d1682e3996adc093b43021ed391983e6 sched: Ensure update_cfs_shares() is called for parents of continuously-running tasks
Docbook fixes that make 99% of the diffstat, plus a oneliner fix.
Thanks,
Ingo
------------------>
Peter Zijlstra (1):
sched: Ensure update_cfs_shares() is called for parents of continuously-running tasks
Yacine Belkadi (1):
sched: Fix some kernel-doc warnings
include/linux/sched.h | 6 ++++ kernel/sched/core.c | 82 ++++++++++++++++++++++++++++++++++++++------------- kernel/sched/cpupri.c | 4 +-- kernel/sched/fair.c | 10 +++++-- 4 files changed, 77 insertions(+), 25 deletions(-)
include/linux/sched.h +6 -0
@@ -1532,6 +1532,8 @@ static inline pid_t task_pgrp_nr(struct task_struct *tsk)* Test if a process is not yet dead (at most zombie state) * If pid_alive fails, then pointers within the task structure * can be stale and must not be dereferenced. +* +* Return: 1 if the process is alive. 0 otherwise. */ static inline int pid_alive (struct task_struct *p) {
@@ -1543,6 +1545,8 @@ static inline int pid_alive(struct task_struct *p)* @tsk: Task structure to be checked. * * Check if a task structure is the first user space task the kernel created. +* +* Return: 1 if the task structure is init. 0 otherwise. */ static inline int is_global_init (struct task_struct *tsk) {
@@ -1893,6 +1897,8 @@ extern struct task_struct *idle_task(int cpu);/** * is_idle_task - is the specified task an idle task? * @p: the task in question. +* +* Return: 1 if @p is an idle task. 0 otherwise. */ static inline bool is_idle_task (const struct task_struct *p) {
kernel/sched/core.c +61 -21
268 lines not on this page · raw message
kernel/sched/cpupri.c +2 -2
@@ -62,7 +62,7 @@ static int convert_prio(int prio)* any discrepancies created by racing against the uncertainty of the current * priority configuration. * -* Returns: (int)bool - CPUs were found +* Return: (int)bool - CPUs were found */ int cpupri_find (struct cpupri *cp,struct task_struct *p,struct cpumask *lowest_mask)
@@ -203,7 +203,7 @@ void cpupri_set(struct cpupri *cp, int cpu, int newpri)* cpupri_init - initialize the cpupri structure * @cp: The cpupri context * -* Returns: -ENOMEM if memory fails. +* Return: -ENOMEM on memory allocation failure. */ int cpupri_init (struct cpupri *cp) {
kernel/sched/fair.c +8 -2
@@ -2032,6 +2032,7 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued)*/ update_entity_load_avg (curr,1 );update_cfs_rq_blocked_load (cfs_rq,1 ); +update_cfs_shares (cfs_rq);#ifdef CONFIG_SCHED_HRTICK /*
@@ -4280,6 +4281,8 @@ struct sg_lb_stats {* get_sd_load_idx - Obtain the load index for a given sched domain. * @sd: The sched_domain whose load_idx is to be obtained. * @idle: The Idle status of the CPU for whose sd load_icx is obtained. +* +* Return: The load index. */ static inline int get_sd_load_idx (struct sched_domain *sd,enum cpu_idle_type idle)
@@ -4574,6 +4577,9 @@ static inline void update_sg_lb_stats(struct lb_env *env,* * Determine if @sg is a busier group than the previously selected * busiest group. +* +* Return: %true if @sg is a busier group than the previously selected +* busiest group. %false otherwise. */ static bool update_sd_pick_busiest(struct lb_env *env, struct sd_lb_stats *sds,
@@ -4691,7 +4697,7 @@ static inline void update_sd_lb_stats(struct lb_env *env,* assuming lower CPU number will be equivalent to lower a SMT thread * number. * -* Returns 1 when packing is required and a task should be moved to +* Return: 1 when packing is required and a task should be moved to * this CPU. The amount of the imbalance is returned in *imbalance. * * @env: The load balancing environment.
@@ -4869,7 +4875,7 @@ static inline void calculate_imbalance(struct lb_env *env, struct sd_lb_stats *s* @balance: Pointer to a variable indicating if this_cpu * is the appropriate cpu to perform load balancing at this_level. * -* Returns: - the busiest group if imbalance exists. +* Return: - The busiest group if imbalance exists. * - If no imbalance and user has opted for power-savings balance, * return the least loaded group whose CPUs can be * put to idle by rebalancing its tasks onto our group.