[PATCH 2/2] kvm: set new alias directly when old one is not valid
in [Kernel]
|
Prev: [PATCH 1/2] kvm: simplify kvm_vm_ioctl_set_memory_alias
Next: ipc semaphores: order wakeups based on waiter CPU
From: Lai Jiangshan on 17 Apr 2010 05:30 When old one is not valid, we don't need set the flags KVM_ALIAS_INVALID. Because no one {will use}/{be using} it. Signed-off-by: Lai Jiangshan <laijs(a)cn.fujitsu.com> --- diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index db8d7fe..6120e33 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2474,6 +2474,9 @@ static int kvm_vm_ioctl_set_memory_alias(struct kvm *kvm, /* invalidate any gfn reference in case of deletion/shrinking */ memcpy(aliases, kvm->arch.aliases, sizeof(struct kvm_mem_aliases)); + if (!aliases->aliases[alias->slot].npages) + goto set_new_alias; + aliases->aliases[alias->slot].flags |= KVM_ALIAS_INVALID; old_aliases = kvm->arch.aliases; rcu_assign_pointer(kvm->arch.aliases, aliases); @@ -2481,6 +2484,8 @@ static int kvm_vm_ioctl_set_memory_alias(struct kvm *kvm, kvm_mmu_zap_all(kvm); aliases = old_aliases; + +set_new_alias: p = &aliases->aliases[alias->slot]; p->base_gfn = alias->guest_phys_addr >> PAGE_SHIFT; p->npages = alias->memory_size >> PAGE_SHIFT; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |