Commit 46a26bf5 authored by Marcelo Tosatti's avatar Marcelo Tosatti
Browse files

KVM: modify memslots layout in struct kvm 



Have a pointer to an allocated region inside struct kvm.

[alex: fix ppc book 3s]

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 2044892d

arch/ia64/kvm/kvm-ia64.c

+6 −4
Original line number Diff line number Diff line
@@ -1377,12 +1377,14 @@ static void free_kvm(struct kvm *kvm) 


static void kvm_release_vm_pages(struct kvm *kvm)

{

	struct kvm_memslots *slots;

	struct kvm_memory_slot *memslot;

	int i, j;

	unsigned long base_gfn;



	for (i = 0; i < kvm->nmemslots; i++) {

		memslot = &kvm->memslots[i];

	slots = kvm->memslots;

	for (i = 0; i < slots->nmemslots; i++) {

		memslot = &slots->memslots[i];

		base_gfn = memslot->base_gfn;



		for (j = 0; j < memslot->npages; j++) {
@@ -1802,7 +1804,7 @@ static int kvm_ia64_sync_dirty_log(struct kvm *kvm, 
	if (log->slot >= KVM_MEMORY_SLOTS)

		goto out;



	memslot = &kvm->memslots[log->slot];

	memslot = &kvm->memslots->memslots[log->slot];

	r = -ENOENT;

	if (!memslot->dirty_bitmap)

		goto out;
@@ -1840,7 +1842,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, 
	/* If nothing is dirty, don't bother messing with page tables. */

	if (is_dirty) {

		kvm_flush_remote_tlbs(kvm);

		memslot = &kvm->memslots[log->slot];

		memslot = &kvm->memslots->memslots[log->slot];

		n = ALIGN(memslot->npages, BITS_PER_LONG) / 8;

		memset(memslot->dirty_bitmap, 0, n);

	}

arch/powerpc/kvm/book3s.c

+1 −1
Original line number Diff line number Diff line
@@ -865,7 +865,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, 


	/* If nothing is dirty, don't bother messing with page tables. */

	if (is_dirty) {

		memslot = &kvm->memslots[log->slot];

		memslot = &kvm->memslots->memslots[log->slot];



		ga = memslot->base_gfn << PAGE_SHIFT;

		ga_end = ga + (memslot->npages << PAGE_SHIFT);

arch/x86/kvm/mmu.c

+6 −5
Original line number Diff line number Diff line
@@ -807,13 +807,14 @@ static int kvm_handle_hva(struct kvm *kvm, unsigned long hva, 
{

	int i, j;

	int retval = 0;

	struct kvm_memslots *slots = kvm->memslots;



	/*

	 * If mmap_sem isn't taken, we can look the memslots with only

	 * the mmu_lock by skipping over the slots with userspace_addr == 0.

	 */

	for (i = 0; i < kvm->nmemslots; i++) {

		struct kvm_memory_slot *memslot = &kvm->memslots[i];

	for (i = 0; i < slots->nmemslots; i++) {

		struct kvm_memory_slot *memslot = &slots->memslots[i];

		unsigned long start = memslot->userspace_addr;

		unsigned long end;
@@ -3021,8 +3022,8 @@ unsigned int kvm_mmu_calculate_mmu_pages(struct kvm *kvm) 
	unsigned int nr_mmu_pages;

	unsigned int  nr_pages = 0;



	for (i = 0; i < kvm->nmemslots; i++)

		nr_pages += kvm->memslots[i].npages;

	for (i = 0; i < kvm->memslots->nmemslots; i++)

		nr_pages += kvm->memslots->memslots[i].npages;



	nr_mmu_pages = nr_pages * KVM_PERMILLE_MMU_PAGES / 1000;

	nr_mmu_pages = max(nr_mmu_pages,
@@ -3295,7 +3296,7 @@ static int count_rmaps(struct kvm_vcpu *vcpu) 
	int i, j, k;



	for (i = 0; i < KVM_MEMORY_SLOTS; ++i) {

		struct kvm_memory_slot *m = &vcpu->kvm->memslots[i];

		struct kvm_memory_slot *m = &vcpu->kvm->memslots->memslots[i];

		struct kvm_rmap_desc *d;



		for (j = 0; j < m->npages; ++j) {

arch/x86/kvm/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -1503,8 +1503,8 @@ static void enter_pmode(struct kvm_vcpu *vcpu) 
static gva_t rmode_tss_base(struct kvm *kvm)

{

	if (!kvm->arch.tss_addr) {

		gfn_t base_gfn = kvm->memslots[0].base_gfn +

				 kvm->memslots[0].npages - 3;

		gfn_t base_gfn = kvm->memslots->memslots[0].base_gfn +

				 kvm->memslots->memslots[0].npages - 3;

		return base_gfn << PAGE_SHIFT;

	}

	return kvm->arch.tss_addr;

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -2427,7 +2427,7 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, 
		spin_lock(&kvm->mmu_lock);

		kvm_mmu_slot_remove_write_access(kvm, log->slot);

		spin_unlock(&kvm->mmu_lock);

		memslot = &kvm->memslots[log->slot];

		memslot = &kvm->memslots->memslots[log->slot];

		n = ALIGN(memslot->npages, BITS_PER_LONG) / 8;

		memset(memslot->dirty_bitmap, 0, n);

	}
@@ -5223,7 +5223,7 @@ int kvm_arch_set_memory_region(struct kvm *kvm, 
				int user_alloc)

{

	int npages = mem->memory_size >> PAGE_SHIFT;

	struct kvm_memory_slot *memslot = &kvm->memslots[mem->slot];

	struct kvm_memory_slot *memslot = &kvm->memslots->memslots[mem->slot];



	/*To keep backward compatibility with older userspace,

	 *x86 needs to hanlde !user_alloc case.