Skip to content

Commit

Permalink
um: Move uml_postsetup in the init_thread stack
Browse files Browse the repository at this point in the history
atomic_notifier_chain_register() and uml_postsetup() do call kernel code
that rely on the "current" kernel macro and a valid task_struct resp.
thread_info struct. Give those functions a valid stack by moving
uml_postsetup() in the init_thread stack. This moves enables a panic()
call in this early code to generate a valid stacktrace, instead of
crashing.
E.g. when an UML kernel is started with an initrd but too few physical
memory the panic() call get's actually processed.

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Richard Weinberger <richard@nod.at>
  • Loading branch information
Thomas Meyer authored and Richard Weinberger committed Apr 13, 2015
1 parent 04a4184 commit 33bbc30
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
1 change: 1 addition & 0 deletions arch/um/include/shared/as-layout.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ extern unsigned long brk_start;
extern unsigned long host_task_size;

extern int linux_main(int argc, char **argv);
extern void uml_finishsetup(void);

struct siginfo;
extern void (*sig_info[])(int, struct siginfo *si, struct uml_pt_regs *);
Expand Down
15 changes: 10 additions & 5 deletions arch/um/kernel/um_arch.c
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,16 @@ static struct notifier_block panic_exit_notifier = {
.priority = 0
};

void uml_finishsetup(void)
{
atomic_notifier_chain_register(&panic_notifier_list,
&panic_exit_notifier);

uml_postsetup();

new_thread_handler();
}

/* Set during early boot */
unsigned long task_size;
EXPORT_SYMBOL(task_size);
Expand Down Expand Up @@ -326,11 +336,6 @@ int __init linux_main(int argc, char **argv)
printf("Kernel virtual memory size shrunk to %lu bytes\n",
virtmem_size);

atomic_notifier_chain_register(&panic_notifier_list,
&panic_exit_notifier);

uml_postsetup();

stack_protections((unsigned long) &init_thread_info);
os_flush_stdout();

Expand Down
2 changes: 1 addition & 1 deletion arch/um/os-Linux/skas/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ int start_idle_thread(void *stack, jmp_buf *switch_buf)
n = setjmp(initial_jmpbuf);
switch (n) {
case INIT_JMP_NEW_THREAD:
(*switch_buf)[0].JB_IP = (unsigned long) new_thread_handler;
(*switch_buf)[0].JB_IP = (unsigned long) uml_finishsetup;
(*switch_buf)[0].JB_SP = (unsigned long) stack +
UM_THREAD_SIZE - sizeof(void *);
break;
Expand Down

0 comments on commit 33bbc30

Please sign in to comment.