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

Commit 5b1c1493 authored by Carsten Otte's avatar Carsten Otte Committed by Avi Kivity
Browse files

KVM: s390: ucontrol: export SIE control block to user 



This patch exports the s390 SIE hardware control block to userspace
via the mapping of the vcpu file descriptor. In order to do so,
a new arch callback named kvm_arch_vcpu_fault  is introduced for all
architectures. It allows to map architecture specific pages.

Signed-off-by: default avatarCarsten Otte <cotte@de.ibm.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent e168bf8d

Documentation/virtual/kvm/api.txt

+5 −0
Original line number Diff line number Diff line
@@ -218,6 +218,11 @@ allocation of vcpu ids. For example, if userspace wants 
single-threaded guest vcpus, it should make all vcpu ids be a multiple

of the number of vcpus per vcore.



For virtual cpus that have been created with S390 user controlled virtual

machines, the resulting vcpu fd can be memory mapped at page offset

KVM_S390_SIE_PAGE_OFFSET in order to obtain a memory map of the virtual

cpu's hardware control block.



4.8 KVM_GET_DIRTY_LOG (vm ioctl)



Capability: basic

arch/ia64/kvm/kvm-ia64.c

+5 −0
Original line number Diff line number Diff line
@@ -1566,6 +1566,11 @@ out: 
	return r;

}



int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)

{

	return VM_FAULT_SIGBUS;

}



int kvm_arch_prepare_memory_region(struct kvm *kvm,

		struct kvm_memory_slot *memslot,

		struct kvm_memory_slot old,

arch/powerpc/kvm/powerpc.c

+5 −0
Original line number Diff line number Diff line
@@ -659,6 +659,11 @@ out: 
	return r;

}



int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)

{

	return VM_FAULT_SIGBUS;

}



static int kvm_vm_ioctl_get_pvinfo(struct kvm_ppc_pvinfo *pvinfo)

{

	u32 inst_lis = 0x3c000000;

arch/s390/kvm/kvm-s390.c

+13 −0
Original line number Diff line number Diff line
@@ -763,6 +763,19 @@ long kvm_arch_vcpu_ioctl(struct file *filp, 
	return r;

}



int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)

{

#ifdef CONFIG_KVM_S390_UCONTROL

	if ((vmf->pgoff == KVM_S390_SIE_PAGE_OFFSET)

		 && (kvm_is_ucontrol(vcpu->kvm))) {

		vmf->page = virt_to_page(vcpu->arch.sie_block);

		get_page(vmf->page);

		return 0;

	}

#endif

	return VM_FAULT_SIGBUS;

}



/* Section: memory related */

int kvm_arch_prepare_memory_region(struct kvm *kvm,

				   struct kvm_memory_slot *memslot,

arch/x86/kvm/x86.c

+5 −0
Original line number Diff line number Diff line
@@ -2814,6 +2814,11 @@ out: 
	return r;

}



int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)

{

	return VM_FAULT_SIGBUS;

}



static int kvm_vm_ioctl_set_tss_addr(struct kvm *kvm, unsigned long addr)

{

	int ret;