.. | .. |
---|
21 | 21 | |
---|
22 | 22 | static void kdb_show_stack(struct task_struct *p, void *addr) |
---|
23 | 23 | { |
---|
24 | | - int old_lvl = console_loglevel; |
---|
25 | | - console_loglevel = CONSOLE_LOGLEVEL_MOTORMOUTH; |
---|
26 | 24 | kdb_trap_printk++; |
---|
27 | | - kdb_set_current_task(p); |
---|
28 | | - if (addr) { |
---|
29 | | - show_stack((struct task_struct *)p, addr); |
---|
30 | | - } else if (kdb_current_regs) { |
---|
31 | | -#ifdef CONFIG_X86 |
---|
32 | | - show_stack(p, &kdb_current_regs->sp); |
---|
33 | | -#else |
---|
34 | | - show_stack(p, NULL); |
---|
35 | | -#endif |
---|
| 25 | + |
---|
| 26 | + if (!addr && kdb_task_has_cpu(p)) { |
---|
| 27 | + int old_lvl = console_loglevel; |
---|
| 28 | + |
---|
| 29 | + console_loglevel = CONSOLE_LOGLEVEL_MOTORMOUTH; |
---|
| 30 | + kdb_dump_stack_on_cpu(kdb_process_cpu(p)); |
---|
| 31 | + console_loglevel = old_lvl; |
---|
36 | 32 | } else { |
---|
37 | | - show_stack(p, NULL); |
---|
| 33 | + show_stack(p, addr, KERN_EMERG); |
---|
38 | 34 | } |
---|
39 | | - console_loglevel = old_lvl; |
---|
| 35 | + |
---|
40 | 36 | kdb_trap_printk--; |
---|
41 | 37 | } |
---|
42 | 38 | |
---|
.. | .. |
---|
78 | 74 | */ |
---|
79 | 75 | |
---|
80 | 76 | static int |
---|
81 | | -kdb_bt1(struct task_struct *p, unsigned long mask, |
---|
82 | | - int argcount, int btaprompt) |
---|
| 77 | +kdb_bt1(struct task_struct *p, unsigned long mask, bool btaprompt) |
---|
83 | 78 | { |
---|
84 | | - char buffer[2]; |
---|
85 | | - if (kdb_getarea(buffer[0], (unsigned long)p) || |
---|
86 | | - kdb_getarea(buffer[0], (unsigned long)(p+1)-1)) |
---|
| 79 | + char ch; |
---|
| 80 | + |
---|
| 81 | + if (kdb_getarea(ch, (unsigned long)p) || |
---|
| 82 | + kdb_getarea(ch, (unsigned long)(p+1)-1)) |
---|
87 | 83 | return KDB_BADADDR; |
---|
88 | 84 | if (!kdb_task_state(p, mask)) |
---|
89 | 85 | return 0; |
---|
.. | .. |
---|
91 | 87 | kdb_ps1(p); |
---|
92 | 88 | kdb_show_stack(p, NULL); |
---|
93 | 89 | if (btaprompt) { |
---|
94 | | - kdb_getstr(buffer, sizeof(buffer), |
---|
95 | | - "Enter <q> to end, <cr> to continue:"); |
---|
96 | | - if (buffer[0] == 'q') { |
---|
97 | | - kdb_printf("\n"); |
---|
| 90 | + kdb_printf("Enter <q> to end, <cr> or <space> to continue:"); |
---|
| 91 | + do { |
---|
| 92 | + ch = kdb_getchar(); |
---|
| 93 | + } while (!strchr("\r\n q", ch)); |
---|
| 94 | + kdb_printf("\n"); |
---|
| 95 | + |
---|
| 96 | + /* reset the pager */ |
---|
| 97 | + kdb_nextline = 1; |
---|
| 98 | + |
---|
| 99 | + if (ch == 'q') |
---|
98 | 100 | return 1; |
---|
99 | | - } |
---|
100 | 101 | } |
---|
101 | 102 | touch_nmi_watchdog(); |
---|
102 | 103 | return 0; |
---|
| 104 | +} |
---|
| 105 | + |
---|
| 106 | +static void |
---|
| 107 | +kdb_bt_cpu(unsigned long cpu) |
---|
| 108 | +{ |
---|
| 109 | + struct task_struct *kdb_tsk; |
---|
| 110 | + |
---|
| 111 | + if (cpu >= num_possible_cpus() || !cpu_online(cpu)) { |
---|
| 112 | + kdb_printf("WARNING: no process for cpu %ld\n", cpu); |
---|
| 113 | + return; |
---|
| 114 | + } |
---|
| 115 | + |
---|
| 116 | + /* If a CPU failed to round up we could be here */ |
---|
| 117 | + kdb_tsk = KDB_TSK(cpu); |
---|
| 118 | + if (!kdb_tsk) { |
---|
| 119 | + kdb_printf("WARNING: no task for cpu %ld\n", cpu); |
---|
| 120 | + return; |
---|
| 121 | + } |
---|
| 122 | + |
---|
| 123 | + kdb_bt1(kdb_tsk, ~0UL, false); |
---|
103 | 124 | } |
---|
104 | 125 | |
---|
105 | 126 | int |
---|
106 | 127 | kdb_bt(int argc, const char **argv) |
---|
107 | 128 | { |
---|
108 | 129 | int diag; |
---|
109 | | - int argcount = 5; |
---|
110 | 130 | int btaprompt = 1; |
---|
111 | 131 | int nextarg; |
---|
112 | 132 | unsigned long addr; |
---|
.. | .. |
---|
125 | 145 | /* Run the active tasks first */ |
---|
126 | 146 | for_each_online_cpu(cpu) { |
---|
127 | 147 | p = kdb_curr_task(cpu); |
---|
128 | | - if (kdb_bt1(p, mask, argcount, btaprompt)) |
---|
| 148 | + if (kdb_bt1(p, mask, btaprompt)) |
---|
129 | 149 | return 0; |
---|
130 | 150 | } |
---|
131 | 151 | /* Now the inactive tasks */ |
---|
132 | | - kdb_do_each_thread(g, p) { |
---|
| 152 | + for_each_process_thread(g, p) { |
---|
133 | 153 | if (KDB_FLAG(CMD_INTERRUPT)) |
---|
134 | 154 | return 0; |
---|
135 | 155 | if (task_curr(p)) |
---|
136 | 156 | continue; |
---|
137 | | - if (kdb_bt1(p, mask, argcount, btaprompt)) |
---|
| 157 | + if (kdb_bt1(p, mask, btaprompt)) |
---|
138 | 158 | return 0; |
---|
139 | | - } kdb_while_each_thread(g, p); |
---|
| 159 | + } |
---|
140 | 160 | } else if (strcmp(argv[0], "btp") == 0) { |
---|
141 | 161 | struct task_struct *p; |
---|
142 | 162 | unsigned long pid; |
---|
.. | .. |
---|
146 | 166 | if (diag) |
---|
147 | 167 | return diag; |
---|
148 | 168 | p = find_task_by_pid_ns(pid, &init_pid_ns); |
---|
149 | | - if (p) { |
---|
150 | | - kdb_set_current_task(p); |
---|
151 | | - return kdb_bt1(p, ~0UL, argcount, 0); |
---|
152 | | - } |
---|
| 169 | + if (p) |
---|
| 170 | + return kdb_bt1(p, ~0UL, false); |
---|
153 | 171 | kdb_printf("No process with pid == %ld found\n", pid); |
---|
154 | 172 | return 0; |
---|
155 | 173 | } else if (strcmp(argv[0], "btt") == 0) { |
---|
.. | .. |
---|
158 | 176 | diag = kdbgetularg((char *)argv[1], &addr); |
---|
159 | 177 | if (diag) |
---|
160 | 178 | return diag; |
---|
161 | | - kdb_set_current_task((struct task_struct *)addr); |
---|
162 | | - return kdb_bt1((struct task_struct *)addr, ~0UL, argcount, 0); |
---|
| 179 | + return kdb_bt1((struct task_struct *)addr, ~0UL, false); |
---|
163 | 180 | } else if (strcmp(argv[0], "btc") == 0) { |
---|
164 | 181 | unsigned long cpu = ~0; |
---|
165 | | - struct task_struct *save_current_task = kdb_current_task; |
---|
166 | | - char buf[80]; |
---|
167 | 182 | if (argc > 1) |
---|
168 | 183 | return KDB_ARGCOUNT; |
---|
169 | 184 | if (argc == 1) { |
---|
.. | .. |
---|
171 | 186 | if (diag) |
---|
172 | 187 | return diag; |
---|
173 | 188 | } |
---|
174 | | - /* Recursive use of kdb_parse, do not use argv after |
---|
175 | | - * this point */ |
---|
176 | | - argv = NULL; |
---|
177 | 189 | if (cpu != ~0) { |
---|
178 | | - if (cpu >= num_possible_cpus() || !cpu_online(cpu)) { |
---|
179 | | - kdb_printf("no process for cpu %ld\n", cpu); |
---|
180 | | - return 0; |
---|
| 190 | + kdb_bt_cpu(cpu); |
---|
| 191 | + } else { |
---|
| 192 | + /* |
---|
| 193 | + * Recursive use of kdb_parse, do not use argv after |
---|
| 194 | + * this point. |
---|
| 195 | + */ |
---|
| 196 | + argv = NULL; |
---|
| 197 | + kdb_printf("btc: cpu status: "); |
---|
| 198 | + kdb_parse("cpu\n"); |
---|
| 199 | + for_each_online_cpu(cpu) { |
---|
| 200 | + kdb_bt_cpu(cpu); |
---|
| 201 | + touch_nmi_watchdog(); |
---|
181 | 202 | } |
---|
182 | | - sprintf(buf, "btt 0x%px\n", KDB_TSK(cpu)); |
---|
183 | | - kdb_parse(buf); |
---|
184 | | - return 0; |
---|
185 | 203 | } |
---|
186 | | - kdb_printf("btc: cpu status: "); |
---|
187 | | - kdb_parse("cpu\n"); |
---|
188 | | - for_each_online_cpu(cpu) { |
---|
189 | | - void *kdb_tsk = KDB_TSK(cpu); |
---|
190 | | - |
---|
191 | | - /* If a CPU failed to round up we could be here */ |
---|
192 | | - if (!kdb_tsk) { |
---|
193 | | - kdb_printf("WARNING: no task for cpu %ld\n", |
---|
194 | | - cpu); |
---|
195 | | - continue; |
---|
196 | | - } |
---|
197 | | - |
---|
198 | | - sprintf(buf, "btt 0x%px\n", kdb_tsk); |
---|
199 | | - kdb_parse(buf); |
---|
200 | | - touch_nmi_watchdog(); |
---|
201 | | - } |
---|
202 | | - kdb_set_current_task(save_current_task); |
---|
203 | 204 | return 0; |
---|
204 | 205 | } else { |
---|
205 | 206 | if (argc) { |
---|
.. | .. |
---|
211 | 212 | kdb_show_stack(kdb_current_task, (void *)addr); |
---|
212 | 213 | return 0; |
---|
213 | 214 | } else { |
---|
214 | | - return kdb_bt1(kdb_current_task, ~0UL, argcount, 0); |
---|
| 215 | + return kdb_bt1(kdb_current_task, ~0UL, false); |
---|
215 | 216 | } |
---|
216 | 217 | } |
---|
217 | 218 | |
---|