dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

KVM: Push rmap into kvm_arch_memory_slot 

Two reasons:
 - x86 can integrate rmap and rmap_pde and remove heuristics in
   __gfn_to_rmap().
 - Some architectures do not need rmap.

Since rmap is one of the most memory consuming stuff in KVM, ppc'd
better restrict the allocation to Book3S HV.

Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Takuya Yoshikawa 2012-08-01 18:03:28 +09:00 committed by Avi Kivity
parent 65fbe37c42
commit d89cc617b9
9 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/include/asm/kvm_host.h
View File

@ -221,6 +221,7 @@ struct revmap_entry {
#define KVMPPC_GOT_PAGE 0x80 #define KVMPPC_GOT_PAGE 0x80
struct kvm_arch_memory_slot { struct kvm_arch_memory_slot {
unsigned long *rmap;
}; };
struct kvm_arch { struct kvm_arch {

6
arch/powerpc/kvm/book3s_64_mmu_hv.c
View File

@ -705,7 +705,7 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,
goto out_unlock; goto out_unlock;
hpte[0] = (hpte[0] & ~HPTE_V_ABSENT) | HPTE_V_VALID; hpte[0] = (hpte[0] & ~HPTE_V_ABSENT) | HPTE_V_VALID;
rmap = &memslot->rmap[gfn - memslot->base_gfn]; rmap = &memslot->arch.rmap[gfn - memslot->base_gfn];
lock_rmap(rmap); lock_rmap(rmap);
/* Check if we might have been invalidated; let the guest retry if so */ /* Check if we might have been invalidated; let the guest retry if so */
@ -788,7 +788,7 @@ static int kvm_handle_hva_range(struct kvm *kvm,
for (; gfn < gfn_end; ++gfn) { for (; gfn < gfn_end; ++gfn) {
gfn_t gfn_offset = gfn - memslot->base_gfn; gfn_t gfn_offset = gfn - memslot->base_gfn;
ret = handler(kvm, &memslot->rmap[gfn_offset], gfn); ret = handler(kvm, &memslot->arch.rmap[gfn_offset], gfn);
retval |= ret; retval |= ret;
} }
} }
@ -1036,7 +1036,7 @@ long kvmppc_hv_get_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot)
unsigned long *rmapp, *map; unsigned long *rmapp, *map;
preempt_disable(); preempt_disable();
rmapp = memslot->rmap; rmapp = memslot->arch.rmap;
map = memslot->dirty_bitmap; map = memslot->dirty_bitmap;
for (i = 0; i < memslot->npages; ++i) { for (i = 0; i < memslot->npages; ++i) {
if (kvm_test_clear_dirty(kvm, rmapp)) if (kvm_test_clear_dirty(kvm, rmapp))

4
arch/powerpc/kvm/book3s_hv_rm_mmu.c
View File

@ -84,7 +84,7 @@ static void remove_revmap_chain(struct kvm *kvm, long pte_index,
if (!memslot || (memslot->flags & KVM_MEMSLOT_INVALID)) if (!memslot || (memslot->flags & KVM_MEMSLOT_INVALID))
return; return;
rmap = real_vmalloc_addr(&memslot->rmap[gfn - memslot->base_gfn]); rmap = real_vmalloc_addr(&memslot->arch.rmap[gfn - memslot->base_gfn]);
lock_rmap(rmap); lock_rmap(rmap);
head = *rmap & KVMPPC_RMAP_INDEX; head = *rmap & KVMPPC_RMAP_INDEX;
@ -180,7 +180,7 @@ long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags,
if (!slot_is_aligned(memslot, psize)) if (!slot_is_aligned(memslot, psize))
return H_PARAMETER; return H_PARAMETER;
slot_fn = gfn - memslot->base_gfn; slot_fn = gfn - memslot->base_gfn;
rmap = &memslot->rmap[slot_fn]; rmap = &memslot->arch.rmap[slot_fn];
if (!kvm->arch.using_mmu_notifiers) { if (!kvm->arch.using_mmu_notifiers) {
physp = kvm->arch.slot_phys[memslot->id]; physp = kvm->arch.slot_phys[memslot->id];

8
arch/powerpc/kvm/powerpc.c
View File

@ -302,10 +302,18 @@ long kvm_arch_dev_ioctl(struct file *filp,
void kvm_arch_free_memslot(struct kvm_memory_slot *free, void kvm_arch_free_memslot(struct kvm_memory_slot *free,
struct kvm_memory_slot *dont) struct kvm_memory_slot *dont)
{ {
if (!dont || free->arch.rmap != dont->arch.rmap) {
vfree(free->arch.rmap);
free->arch.rmap = NULL;
}
} }
int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages) int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages)
{ {
slot->arch.rmap = vzalloc(npages * sizeof(*slot->arch.rmap));
if (!slot->arch.rmap)
return -ENOMEM;
return 0; return 0;
} }

2
arch/x86/include/asm/kvm_host.h
View File

@ -504,7 +504,7 @@ struct kvm_lpage_info {
}; };
struct kvm_arch_memory_slot { struct kvm_arch_memory_slot {
unsigned long *rmap_pde[KVM_NR_PAGE_SIZES - 1]; unsigned long *rmap[KVM_NR_PAGE_SIZES];
struct kvm_lpage_info *lpage_info[KVM_NR_PAGE_SIZES - 1]; struct kvm_lpage_info *lpage_info[KVM_NR_PAGE_SIZES - 1];
}; };

5
arch/x86/kvm/mmu.c
View File

@ -970,11 +970,8 @@ static unsigned long *__gfn_to_rmap(gfn_t gfn, int level,
{ {
unsigned long idx; unsigned long idx;
if (likely(level == PT_PAGE_TABLE_LEVEL))
return &slot->rmap[gfn - slot->base_gfn];
idx = gfn_to_index(gfn, slot->base_gfn, level); idx = gfn_to_index(gfn, slot->base_gfn, level);
return &slot->arch.rmap_pde[level - PT_DIRECTORY_LEVEL][idx]; return &slot->arch.rmap[level - PT_PAGE_TABLE_LEVEL][idx];
} }
/* /*

55
arch/x86/kvm/x86.c
View File

@ -6303,14 +6303,18 @@ void kvm_arch_free_memslot(struct kvm_memory_slot *free,
{ {
int i; int i;
for (i = 0; i < KVM_NR_PAGE_SIZES - 1; ++i) { for (i = 0; i < KVM_NR_PAGE_SIZES; ++i) {
if (!dont || free->arch.rmap_pde[i] != dont->arch.rmap_pde[i]) { if (!dont || free->arch.rmap[i] != dont->arch.rmap[i]) {
kvm_kvfree(free->arch.rmap_pde[i]); kvm_kvfree(free->arch.rmap[i]);
free->arch.rmap_pde[i] = NULL; free->arch.rmap[i] = NULL;
} }
if (!dont || free->arch.lpage_info[i] != dont->arch.lpage_info[i]) { if (i == 0)
kvm_kvfree(free->arch.lpage_info[i]); continue;
free->arch.lpage_info[i] = NULL;
if (!dont || free->arch.lpage_info[i - 1] !=
dont->arch.lpage_info[i - 1]) {
kvm_kvfree(free->arch.lpage_info[i - 1]);
free->arch.lpage_info[i - 1] = NULL;
} }
} }
} }
@ -6319,28 +6323,30 @@ int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages)
{ {
int i; int i;
for (i = 0; i < KVM_NR_PAGE_SIZES - 1; ++i) { for (i = 0; i < KVM_NR_PAGE_SIZES; ++i) {
unsigned long ugfn; unsigned long ugfn;
int lpages; int lpages;
int level = i + 2; int level = i + 1;
lpages = gfn_to_index(slot->base_gfn + npages - 1, lpages = gfn_to_index(slot->base_gfn + npages - 1,
slot->base_gfn, level) + 1; slot->base_gfn, level) + 1;
slot->arch.rmap_pde[i] = slot->arch.rmap[i] =
kvm_kvzalloc(lpages * sizeof(*slot->arch.rmap_pde[i])); kvm_kvzalloc(lpages * sizeof(*slot->arch.rmap[i]));
if (!slot->arch.rmap_pde[i]) if (!slot->arch.rmap[i])
goto out_free; goto out_free;
if (i == 0)
continue;
slot->arch.lpage_info[i] = slot->arch.lpage_info[i - 1] = kvm_kvzalloc(lpages *
kvm_kvzalloc(lpages * sizeof(*slot->arch.lpage_info[i])); sizeof(*slot->arch.lpage_info[i - 1]));
if (!slot->arch.lpage_info[i]) if (!slot->arch.lpage_info[i - 1])
goto out_free; goto out_free;
if (slot->base_gfn & (KVM_PAGES_PER_HPAGE(level) - 1)) if (slot->base_gfn & (KVM_PAGES_PER_HPAGE(level) - 1))
slot->arch.lpage_info[i][0].write_count = 1; slot->arch.lpage_info[i - 1][0].write_count = 1;
if ((slot->base_gfn + npages) & (KVM_PAGES_PER_HPAGE(level) - 1)) if ((slot->base_gfn + npages) & (KVM_PAGES_PER_HPAGE(level) - 1))
slot->arch.lpage_info[i][lpages - 1].write_count = 1; slot->arch.lpage_info[i - 1][lpages - 1].write_count = 1;
ugfn = slot->userspace_addr >> PAGE_SHIFT; ugfn = slot->userspace_addr >> PAGE_SHIFT;
/* /*
* If the gfn and userspace address are not aligned wrt each * If the gfn and userspace address are not aligned wrt each
@ -6352,18 +6358,21 @@ int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages)
unsigned long j; unsigned long j;
for (j = 0; j < lpages; ++j) for (j = 0; j < lpages; ++j)
slot->arch.lpage_info[i][j].write_count = 1; slot->arch.lpage_info[i - 1][j].write_count = 1;
} }
} }
return 0; return 0;
out_free: out_free:
for (i = 0; i < KVM_NR_PAGE_SIZES - 1; ++i) { for (i = 0; i < KVM_NR_PAGE_SIZES; ++i) {
kvm_kvfree(slot->arch.rmap_pde[i]); kvm_kvfree(slot->arch.rmap[i]);
kvm_kvfree(slot->arch.lpage_info[i]); slot->arch.rmap[i] = NULL;
slot->arch.rmap_pde[i] = NULL; if (i == 0)
slot->arch.lpage_info[i] = NULL; continue;
kvm_kvfree(slot->arch.lpage_info[i - 1]);
slot->arch.lpage_info[i - 1] = NULL;
} }
return -ENOMEM; return -ENOMEM;
} }

1
include/linux/kvm_host.h
View File

@ -213,7 +213,6 @@ struct kvm_memory_slot {
gfn_t base_gfn; gfn_t base_gfn;
unsigned long npages; unsigned long npages;
unsigned long flags; unsigned long flags;
unsigned long *rmap;
unsigned long *dirty_bitmap; unsigned long *dirty_bitmap;
struct kvm_arch_memory_slot arch; struct kvm_arch_memory_slot arch;
unsigned long userspace_addr; unsigned long userspace_addr;

11
virt/kvm/kvm_main.c
View File

@ -550,16 +550,12 @@ static void kvm_destroy_dirty_bitmap(struct kvm_memory_slot *memslot)
static void kvm_free_physmem_slot(struct kvm_memory_slot *free, static void kvm_free_physmem_slot(struct kvm_memory_slot *free,
struct kvm_memory_slot *dont) struct kvm_memory_slot *dont)
{ {
if (!dont || free->rmap != dont->rmap)
vfree(free->rmap);
if (!dont || free->dirty_bitmap != dont->dirty_bitmap) if (!dont || free->dirty_bitmap != dont->dirty_bitmap)
kvm_destroy_dirty_bitmap(free); kvm_destroy_dirty_bitmap(free);
kvm_arch_free_memslot(free, dont); kvm_arch_free_memslot(free, dont);
free->npages = 0; free->npages = 0;
free->rmap = NULL;
} }
void kvm_free_physmem(struct kvm *kvm) void kvm_free_physmem(struct kvm *kvm)
@ -768,11 +764,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
if (npages && !old.npages) { if (npages && !old.npages) {
new.user_alloc = user_alloc; new.user_alloc = user_alloc;
new.userspace_addr = mem->userspace_addr; new.userspace_addr = mem->userspace_addr;
#ifndef CONFIG_S390
new.rmap = vzalloc(npages * sizeof(*new.rmap));
if (!new.rmap)
goto out_free;
#endif /* not defined CONFIG_S390 */
if (kvm_arch_create_memslot(&new, npages)) if (kvm_arch_create_memslot(&new, npages))
goto out_free; goto out_free;
} }
@ -831,7 +823,6 @@ int __kvm_set_memory_region(struct kvm *kvm,
/* actual memory is freed via old in kvm_free_physmem_slot below */ /* actual memory is freed via old in kvm_free_physmem_slot below */
if (!npages) { if (!npages) {
new.rmap = NULL;
new.dirty_bitmap = NULL; new.dirty_bitmap = NULL;
memset(&new.arch, 0, sizeof(new.arch)); memset(&new.arch, 0, sizeof(new.arch));
} }