Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5689cc53 authored by Joerg Roedel's avatar Joerg Roedel Committed by Avi Kivity
Browse files

KVM: Use u64 for frame data types 



For 32bit machines where the physical address width is
larger than the virtual address width the frame number types
in KVM may overflow. Fix this by changing them to u64.

[sfr: fix build on 32-bit ppc]

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 82855413

arch/powerpc/kvm/44x_tlb.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -316,7 +316,8 @@ void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gpa_t gpaddr, 
	gfn = gpaddr >> PAGE_SHIFT;

	gfn = gpaddr >> PAGE_SHIFT;

	new_page = gfn_to_page(vcpu->kvm, gfn);

	new_page = gfn_to_page(vcpu->kvm, gfn);

	if (is_error_page(new_page)) {

	if (is_error_page(new_page)) {

		printk(KERN_ERR "Couldn't get guest page for gfn %lx!\n", gfn);

		printk(KERN_ERR "Couldn't get guest page for gfn %llx!\n",

			(unsigned long long)gfn);

		kvm_release_page_clean(new_page);

		kvm_release_page_clean(new_page);

		return;

		return;

	}

	}

include/linux/kvm_types.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -32,11 +32,11 @@ 




typedef unsigned long  gva_t;

typedef unsigned long  gva_t;

typedef u64            gpa_t;

typedef u64            gpa_t;

typedef unsigned long  gfn_t;

typedef u64            gfn_t;





typedef unsigned long  hva_t;

typedef unsigned long  hva_t;

typedef u64            hpa_t;

typedef u64            hpa_t;

typedef unsigned long  hfn_t;

typedef u64            hfn_t;





typedef hfn_t pfn_t;

typedef hfn_t pfn_t;

virt/kvm/iommu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -108,7 +108,7 @@ int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot) 
			      get_order(page_size), flags);

			      get_order(page_size), flags);

		if (r) {

		if (r) {

			printk(KERN_ERR "kvm_iommu_map_address:"

			printk(KERN_ERR "kvm_iommu_map_address:"

			       "iommu failed to map pfn=%lx\n", pfn);

			       "iommu failed to map pfn=%llx\n", pfn);

			goto unmap_pages;

			goto unmap_pages;

		}

		}