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

Commit bf640876 authored by Dominik Dingel's avatar Dominik Dingel Committed by Paolo Bonzini
Browse files

KVM: s390: Make KVM_HVA_ERR_BAD usable on s390 



Current common code uses PAGE_OFFSET to indicate a bad host virtual address.
As this check won't work on architectures that don't map kernel and user memory
into the same address space (e.g. s390), such architectures can now provide
their own KVM_HVA_ERR_BAD defines.

Signed-off-by: default avatarDominik Dingel <dingel@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ea828ebf

arch/s390/include/asm/kvm_host.h

+8 −0
Original line number Diff line number Diff line
@@ -274,6 +274,14 @@ struct kvm_arch{ 
	int css_support;

};



#define KVM_HVA_ERR_BAD		(-1UL)

#define KVM_HVA_ERR_RO_BAD	(-2UL)



static inline bool kvm_is_error_hva(unsigned long addr)

{

	return IS_ERR_VALUE(addr);

}



extern int sie64a(struct kvm_s390_sie_block *, u64 *);

extern char sie_exit;

#endif

include/linux/kvm_host.h

+8 −0
Original line number Diff line number Diff line
@@ -85,6 +85,12 @@ static inline bool is_noslot_pfn(pfn_t pfn) 
	return pfn == KVM_PFN_NOSLOT;

}



/*

 * architectures with KVM_HVA_ERR_BAD other than PAGE_OFFSET (e.g. s390)

 * provide own defines and kvm_is_error_hva

 */

#ifndef KVM_HVA_ERR_BAD



#define KVM_HVA_ERR_BAD		(PAGE_OFFSET)

#define KVM_HVA_ERR_RO_BAD	(PAGE_OFFSET + PAGE_SIZE)
@@ -93,6 +99,8 @@ static inline bool kvm_is_error_hva(unsigned long addr) 
	return addr >= PAGE_OFFSET;

}



#endif



#define KVM_ERR_PTR_BAD_PAGE	(ERR_PTR(-ENOENT))



static inline bool is_error_page(struct page *page)