lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Browse Source 
* 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: Perform hardware_enable in CPU_STARTING callback
  KVM: i8259: fix migration
  KVM: fix i8259 oops when no vcpus are online
  KVM: x86 emulator: fix regression with cmpxchg8b on i386 hosts
This commit is contained in:
Linus Torvalds
2010-09-10 08:02:45 -07:00
parent f2955b490b da908f2fb4
commit be6200aac9
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/x86/include/asm/kvm_emulate.h
View File

@@ -152,9 +152,14 @@ struct x86_emulate_ops {
struct operand { struct operand {
enum { OP_REG, OP_MEM, OP_IMM, OP_NONE } type; enum { OP_REG, OP_MEM, OP_IMM, OP_NONE } type;
unsigned int bytes; unsigned int bytes;
unsigned long orig_val, *ptr; union {
unsigned long orig_val;
u64 orig_val64;
};
unsigned long *ptr;
union { union {
unsigned long val; unsigned long val;
u64 val64;
char valptr[sizeof(unsigned long) + 2]; char valptr[sizeof(unsigned long) + 2];
}; };
}; };

7
arch/x86/kvm/emulate.c
View File

@@ -1870,16 +1870,15 @@ static inline int emulate_grp9(struct x86_emulate_ctxt *ctxt,
struct x86_emulate_ops *ops) struct x86_emulate_ops *ops)
{ {
struct decode_cache *c = &ctxt->decode; struct decode_cache *c = &ctxt->decode;
u64 old = c->dst.orig_val; u64 old = c->dst.orig_val64;
if (((u32) (old >> 0) != (u32) c->regs[VCPU_REGS_RAX]) || if (((u32) (old >> 0) != (u32) c->regs[VCPU_REGS_RAX]) ||
((u32) (old >> 32) != (u32) c->regs[VCPU_REGS_RDX])) { ((u32) (old >> 32) != (u32) c->regs[VCPU_REGS_RDX])) {
c->regs[VCPU_REGS_RAX] = (u32) (old >> 0); c->regs[VCPU_REGS_RAX] = (u32) (old >> 0);
c->regs[VCPU_REGS_RDX] = (u32) (old >> 32); c->regs[VCPU_REGS_RDX] = (u32) (old >> 32);
ctxt->eflags &= ~EFLG_ZF; ctxt->eflags &= ~EFLG_ZF;
} else { } else {
c->dst.val = ((u64)c->regs[VCPU_REGS_RCX] << 32) | c->dst.val64 = ((u64)c->regs[VCPU_REGS_RCX] << 32) |
(u32) c->regs[VCPU_REGS_RBX]; (u32) c->regs[VCPU_REGS_RBX];
ctxt->eflags |= EFLG_ZF; ctxt->eflags |= EFLG_ZF;
@@ -2616,7 +2615,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
c->src.valptr, c->src.bytes); c->src.valptr, c->src.bytes);
if (rc != X86EMUL_CONTINUE) if (rc != X86EMUL_CONTINUE)
goto done; goto done;
c->src.orig_val = c->src.val; c->src.orig_val64 = c->src.val64;
} }
if (c->src2.type == OP_MEM) { if (c->src2.type == OP_MEM) {

3
arch/x86/kvm/i8259.c
View File

@@ -64,6 +64,9 @@ static void pic_unlock(struct kvm_pic *s)
if (!found) if (!found)
found = s->kvm->bsp_vcpu; found = s->kvm->bsp_vcpu;
if (!found)
return;
kvm_vcpu_kick(found); kvm_vcpu_kick(found);
} }
} }

2
arch/x86/kvm/irq.h
View File

@@ -43,7 +43,6 @@ struct kvm_kpic_state {
u8 irr; /* interrupt request register */ u8 irr; /* interrupt request register */
u8 imr; /* interrupt mask register */ u8 imr; /* interrupt mask register */
u8 isr; /* interrupt service register */ u8 isr; /* interrupt service register */
u8 isr_ack; /* interrupt ack detection */
u8 priority_add; /* highest irq priority */ u8 priority_add; /* highest irq priority */
u8 irq_base; u8 irq_base;
u8 read_reg_select; u8 read_reg_select;
@@ -56,6 +55,7 @@ struct kvm_kpic_state {
u8 init4; /* true if 4 byte init */ u8 init4; /* true if 4 byte init */
u8 elcr; /* PIIX edge/trigger selection */ u8 elcr; /* PIIX edge/trigger selection */
u8 elcr_mask; u8 elcr_mask;
u8 isr_ack; /* interrupt ack detection */
struct kvm_pic *pics_state; struct kvm_pic *pics_state;
}; };

5
virt/kvm/kvm_main.c
View File

@@ -1958,10 +1958,10 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val,
cpu); cpu);
hardware_disable(NULL); hardware_disable(NULL);
break; break;
case CPU_ONLINE: case CPU_STARTING:
printk(KERN_INFO "kvm: enabling virtualization on CPU%d\n", printk(KERN_INFO "kvm: enabling virtualization on CPU%d\n",
cpu); cpu);
smp_call_function_single(cpu, hardware_enable, NULL, 1); hardware_enable(NULL);
break; break;
} }
return NOTIFY_OK; return NOTIFY_OK;
@@ -2096,7 +2096,6 @@ int kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx,
static struct notifier_block kvm_cpu_notifier = { static struct notifier_block kvm_cpu_notifier = {
.notifier_call = kvm_cpu_hotplug, .notifier_call = kvm_cpu_hotplug,
.priority = 20, /* must be > scheduler priority */
}; };
static int vm_stat_get(void *_offset, u64 *val) static int vm_stat_get(void *_offset, u64 *val)