Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 178019
b: refs/heads/master
c: 663997d
h: refs/heads/master
i:
  178017: 6c6de19
  178015: 34f0146
v: v3
  • Loading branch information
Joe Perches authored and Ingo Molnar committed Dec 13, 2009
1 parent fdcc3cb commit acbbd1f
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 54 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7539a3b3d1f892dd97eaf094134d7de55c13befe
refs/heads/master: 663997d417330a59a566452f52cfa04c8ffd190b
94 changes: 42 additions & 52 deletions trunk/kernel/sched.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
* Thomas Gleixner, Mike Kravetz
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/mm.h>
#include <linux/module.h>
#include <linux/nmi.h>
Expand Down Expand Up @@ -5337,8 +5339,8 @@ static noinline void __schedule_bug(struct task_struct *prev)
{
struct pt_regs *regs = get_irq_regs();

printk(KERN_ERR "BUG: scheduling while atomic: %s/%d/0x%08x\n",
prev->comm, prev->pid, preempt_count());
pr_err("BUG: scheduling while atomic: %s/%d/0x%08x\n",
prev->comm, prev->pid, preempt_count());

debug_show_held_locks(prev);
print_modules();
Expand Down Expand Up @@ -6906,23 +6908,23 @@ void sched_show_task(struct task_struct *p)
unsigned state;

state = p->state ? __ffs(p->state) + 1 : 0;
printk(KERN_INFO "%-13.13s %c", p->comm,
pr_info("%-13.13s %c", p->comm,
state < sizeof(stat_nam) - 1 ? stat_nam[state] : '?');
#if BITS_PER_LONG == 32
if (state == TASK_RUNNING)
printk(KERN_CONT " running ");
pr_cont(" running ");
else
printk(KERN_CONT " %08lx ", thread_saved_pc(p));
pr_cont(" %08lx ", thread_saved_pc(p));
#else
if (state == TASK_RUNNING)
printk(KERN_CONT " running task ");
pr_cont(" running task ");
else
printk(KERN_CONT " %016lx ", thread_saved_pc(p));
pr_cont(" %016lx ", thread_saved_pc(p));
#endif
#ifdef CONFIG_DEBUG_STACK_USAGE
free = stack_not_used(p);
#endif
printk(KERN_CONT "%5lu %5d %6d 0x%08lx\n", free,
pr_cont("%5lu %5d %6d 0x%08lx\n", free,
task_pid_nr(p), task_pid_nr(p->real_parent),
(unsigned long)task_thread_info(p)->flags);

Expand All @@ -6934,11 +6936,9 @@ void show_state_filter(unsigned long state_filter)
struct task_struct *g, *p;

#if BITS_PER_LONG == 32
printk(KERN_INFO
" task PC stack pid father\n");
pr_info(" task PC stack pid father\n");
#else
printk(KERN_INFO
" task PC stack pid father\n");
pr_info(" task PC stack pid father\n");
#endif
read_lock(&tasklist_lock);
do_each_thread(g, p) {
Expand Down Expand Up @@ -7296,9 +7296,8 @@ static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p)
* leave kernel.
*/
if (p->mm && printk_ratelimit()) {
printk(KERN_INFO "process %d (%s) no "
"longer affine to cpu%d\n",
task_pid_nr(p), p->comm, dead_cpu);
pr_info("process %d (%s) no longer affine to cpu%d\n",
task_pid_nr(p), p->comm, dead_cpu);
}
}

Expand Down Expand Up @@ -7805,72 +7804,66 @@ static int sched_domain_debug_one(struct sched_domain *sd, int cpu, int level,
printk(KERN_DEBUG "%*s domain %d: ", level, "", level);

if (!(sd->flags & SD_LOAD_BALANCE)) {
printk("does not load-balance\n");
pr_cont("does not load-balance\n");
if (sd->parent)
printk(KERN_ERR "ERROR: !SD_LOAD_BALANCE domain"
" has parent");
pr_err("ERROR: !SD_LOAD_BALANCE domain has parent\n");
return -1;
}

printk(KERN_CONT "span %s level %s\n", str, sd->name);
pr_cont("span %s level %s\n", str, sd->name);

if (!cpumask_test_cpu(cpu, sched_domain_span(sd))) {
printk(KERN_ERR "ERROR: domain->span does not contain "
"CPU%d\n", cpu);
pr_err("ERROR: domain->span does not contain CPU%d\n", cpu);
}
if (!cpumask_test_cpu(cpu, sched_group_cpus(group))) {
printk(KERN_ERR "ERROR: domain->groups does not contain"
" CPU%d\n", cpu);
pr_err("ERROR: domain->groups does not contain CPU%d\n", cpu);
}

printk(KERN_DEBUG "%*s groups:", level + 1, "");
do {
if (!group) {
printk("\n");
printk(KERN_ERR "ERROR: group is NULL\n");
pr_cont("\n");
pr_err("ERROR: group is NULL\n");
break;
}

if (!group->cpu_power) {
printk(KERN_CONT "\n");
printk(KERN_ERR "ERROR: domain->cpu_power not "
"set\n");
pr_cont("\n");
pr_err("ERROR: domain->cpu_power not set\n");
break;
}

if (!cpumask_weight(sched_group_cpus(group))) {
printk(KERN_CONT "\n");
printk(KERN_ERR "ERROR: empty group\n");
pr_cont("\n");
pr_err("ERROR: empty group\n");
break;
}

if (cpumask_intersects(groupmask, sched_group_cpus(group))) {
printk(KERN_CONT "\n");
printk(KERN_ERR "ERROR: repeated CPUs\n");
pr_cont("\n");
pr_err("ERROR: repeated CPUs\n");
break;
}

cpumask_or(groupmask, groupmask, sched_group_cpus(group));

cpulist_scnprintf(str, sizeof(str), sched_group_cpus(group));

printk(KERN_CONT " %s", str);
pr_cont(" %s", str);
if (group->cpu_power != SCHED_LOAD_SCALE) {
printk(KERN_CONT " (cpu_power = %d)",
group->cpu_power);
pr_cont(" (cpu_power = %d)", group->cpu_power);
}

group = group->next;
} while (group != sd->groups);
printk(KERN_CONT "\n");
pr_cont("\n");

if (!cpumask_equal(sched_domain_span(sd), groupmask))
printk(KERN_ERR "ERROR: groups don't span domain->span\n");
pr_err("ERROR: groups don't span domain->span\n");

if (sd->parent &&
!cpumask_subset(groupmask, sched_domain_span(sd->parent)))
printk(KERN_ERR "ERROR: parent span is not a superset "
"of domain->span\n");
pr_err("ERROR: parent span is not a superset of domain->span\n");
return 0;
}

Expand Down Expand Up @@ -8426,8 +8419,7 @@ static int build_numa_sched_groups(struct s_data *d,
sg = kmalloc_node(sizeof(struct sched_group) + cpumask_size(),
GFP_KERNEL, num);
if (!sg) {
printk(KERN_WARNING "Can not alloc domain group for node %d\n",
num);
pr_warning("Can not alloc domain group for node %d\n", num);
return -ENOMEM;
}
d->sched_group_nodes[num] = sg;
Expand Down Expand Up @@ -8456,8 +8448,8 @@ static int build_numa_sched_groups(struct s_data *d,
sg = kmalloc_node(sizeof(struct sched_group) + cpumask_size(),
GFP_KERNEL, num);
if (!sg) {
printk(KERN_WARNING
"Can not alloc domain group for node %d\n", j);
pr_warning("Can not alloc domain group for node %d\n",
j);
return -ENOMEM;
}
sg->cpu_power = 0;
Expand Down Expand Up @@ -8685,7 +8677,7 @@ static enum s_alloc __visit_domain_allocation_hell(struct s_data *d,
d->sched_group_nodes = kcalloc(nr_node_ids,
sizeof(struct sched_group *), GFP_KERNEL);
if (!d->sched_group_nodes) {
printk(KERN_WARNING "Can not alloc sched group node list\n");
pr_warning("Can not alloc sched group node list\n");
return sa_notcovered;
}
sched_group_nodes_bycpu[cpumask_first(cpu_map)] = d->sched_group_nodes;
Expand All @@ -8702,7 +8694,7 @@ static enum s_alloc __visit_domain_allocation_hell(struct s_data *d,
return sa_send_covered;
d->rd = alloc_rootdomain();
if (!d->rd) {
printk(KERN_WARNING "Cannot alloc root domain\n");
pr_warning("Cannot alloc root domain\n");
return sa_tmpmask;
}
return sa_rootdomain;
Expand Down Expand Up @@ -9684,13 +9676,11 @@ void __might_sleep(char *file, int line, int preempt_offset)
return;
prev_jiffy = jiffies;

printk(KERN_ERR
"BUG: sleeping function called from invalid context at %s:%d\n",
file, line);
printk(KERN_ERR
"in_atomic(): %d, irqs_disabled(): %d, pid: %d, name: %s\n",
in_atomic(), irqs_disabled(),
current->pid, current->comm);
pr_err("BUG: sleeping function called from invalid context at %s:%d\n",
file, line);
pr_err("in_atomic(): %d, irqs_disabled(): %d, pid: %d, name: %s\n",
in_atomic(), irqs_disabled(),
current->pid, current->comm);

debug_show_held_locks(current);
if (irqs_disabled())
Expand Down
2 changes: 1 addition & 1 deletion trunk/kernel/sched_idletask.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ static void
dequeue_task_idle(struct rq *rq, struct task_struct *p, int sleep)
{
spin_unlock_irq(&rq->lock);
printk(KERN_ERR "bad: scheduling from the idle thread!\n");
pr_err("bad: scheduling from the idle thread!\n");
dump_stack();
spin_lock_irq(&rq->lock);
}
Expand Down

0 comments on commit acbbd1f

Please sign in to comment.