Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] i386: paravirt unhandled fallthrough

Browse source 
The current code simply calls "start_kernel" directly if we're under a
hypervisor and no paravirt_ops backend wants us, because paravirt.c
registers that as a backend.

This was always a vain hope; start_kernel won't get far without setup.
It's also impossible for paravirt_ops backends which don't sit in the
arch/i386/kernel directory: they can't link before paravirt.o anyway.

Keep it simple: if we pass all the registered paravirt probes, BUG().

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andi Kleen <ak@suse.de>
This commit is contained in:
Rusty Russell 2007-02-13 13:26:26 +01:00 • committed by Andi Kleen
parent 9af3cf0546
commit 992af68147
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/i386/kernel/Makefile
View file

@ -41,8 +41,6 @@ obj-$(CONFIG_HPET_TIMER) += hpet.o
obj-$(CONFIG_K8_NB) += k8.o obj-$(CONFIG_K8_NB) += k8.o
obj-$(CONFIG_VMI) += vmi.o vmitime.o obj-$(CONFIG_VMI) += vmi.o vmitime.o
# Make sure this is linked after any other paravirt_ops structs: see head.S
obj-$(CONFIG_PARAVIRT) += paravirt.o obj-$(CONFIG_PARAVIRT) += paravirt.o
EXTRA_AFLAGS := -traditional EXTRA_AFLAGS := -traditional

7
arch/i386/kernel/head.S
View file

@ -513,10 +513,11 @@ startup_paravirt:
pushl %ecx pushl %ecx
pushl %eax pushl %eax
/* paravirt.o is last in link, and that probe fn never returns */
pushl $__start_paravirtprobe pushl $__start_paravirtprobe
1: 1:
movl 0(%esp), %eax movl 0(%esp), %eax
cmpl $__stop_paravirtprobe, %eax
je unhandled_paravirt
pushl (%eax) pushl (%eax)
movl 8(%esp), %eax movl 8(%esp), %eax
call *(%esp) call *(%esp)
@ -528,6 +529,10 @@ startup_paravirt:
addl $4, (%esp) addl $4, (%esp)
jmp 1b jmp 1b
unhandled_paravirt:
/* Nothing wanted us: we're screwed. */
ud2
#endif #endif
/* /*

3
arch/i386/kernel/paravirt.c
View file

@ -482,9 +482,6 @@ static int __init print_banner(void)
} }
core_initcall(print_banner); core_initcall(print_banner);
/* We simply declare start_kernel to be the paravirt probe of last resort. */
paravirt_probe(start_kernel);
struct paravirt_ops paravirt_ops = { struct paravirt_ops paravirt_ops = {
.name = "bare hardware", .name = "bare hardware",
.paravirt_enabled = 0, .paravirt_enabled = 0,