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

Commit 6d9d41e5 authored by Christoffer Dall's avatar Christoffer Dall Committed by Gleb Natapov
Browse files

KVM: Move gfn_to_index to x86 specific code 



The gfn_to_index function relies on huge page defines which either may
not make sense on systems that don't support huge pages or are defined
in an unconvenient way for other architectures.  Since this is
x86-specific, move the function to arch/x86/include/asm/kvm_host.h.

Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
parent 7854cbca

arch/x86/include/asm/kvm_host.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -79,6 +79,13 @@ 
#define KVM_HPAGE_MASK(x)	(~(KVM_HPAGE_SIZE(x) - 1))

#define KVM_HPAGE_MASK(x)	(~(KVM_HPAGE_SIZE(x) - 1))

#define KVM_PAGES_PER_HPAGE(x)	(KVM_HPAGE_SIZE(x) / PAGE_SIZE)

#define KVM_PAGES_PER_HPAGE(x)	(KVM_HPAGE_SIZE(x) / PAGE_SIZE)





static inline gfn_t gfn_to_index(gfn_t gfn, gfn_t base_gfn, int level)

{

	/* KVM_HPAGE_GFN_SHIFT(PT_PAGE_TABLE_LEVEL) must be 0. */

	return (gfn >> KVM_HPAGE_GFN_SHIFT(level)) -

		(base_gfn >> KVM_HPAGE_GFN_SHIFT(level));

}



#define SELECTOR_TI_MASK (1 << 2)

#define SELECTOR_TI_MASK (1 << 2)

#define SELECTOR_RPL_MASK 0x03

#define SELECTOR_RPL_MASK 0x03

include/linux/kvm_host.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -841,13 +841,6 @@ static inline int memslot_id(struct kvm *kvm, gfn_t gfn) 
	return gfn_to_memslot(kvm, gfn)->id;

	return gfn_to_memslot(kvm, gfn)->id;

}

}





static inline gfn_t gfn_to_index(gfn_t gfn, gfn_t base_gfn, int level)

{

	/* KVM_HPAGE_GFN_SHIFT(PT_PAGE_TABLE_LEVEL) must be 0. */

	return (gfn >> KVM_HPAGE_GFN_SHIFT(level)) -

		(base_gfn >> KVM_HPAGE_GFN_SHIFT(level));

}



static inline gfn_t

static inline gfn_t

hva_to_gfn_memslot(unsigned long hva, struct kvm_memory_slot *slot)

hva_to_gfn_memslot(unsigned long hva, struct kvm_memory_slot *slot)

{

{