summaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorCarsten Otte <cotte@de.ibm.com>2012-01-04 10:25:26 +0100
committerAvi Kivity <avi@redhat.com>2012-03-05 14:52:20 +0200
commitccc7910fe564d99415def7c041fa261e62a43011 (patch)
tree8895fd2463f7b4e48c4510284c37e84a1753ee0d /arch/s390
parentd6b6d166864fa97ca3b1ed1a5c62fd3b53d4606f (diff)
downloadlinux-3.10-ccc7910fe564d99415def7c041fa261e62a43011.tar.gz
linux-3.10-ccc7910fe564d99415def7c041fa261e62a43011.tar.bz2
linux-3.10-ccc7910fe564d99415def7c041fa261e62a43011.zip
KVM: s390: ucontrol: interface to inject faults on a vcpu page table
This patch allows the user to fault in pages on a virtual cpus address space for user controlled virtual machines. Typically this is superfluous because userspace can just create a mapping and let the kernel's page fault logic take are of it. There is one exception: SIE won't start if the lowcore is not present. Normally the kernel takes care of this [handle_validity() in arch/s390/kvm/intercept.c] but since the kernel does not handle intercepts for user controlled virtual machines, userspace needs to be able to handle this condition. Signed-off-by: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kvm/kvm-s390.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 5b5c28e471d..8489edf80c8 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -761,6 +761,12 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
break;
}
#endif
+ case KVM_S390_VCPU_FAULT: {
+ r = gmap_fault(arg, vcpu->arch.gmap);
+ if (!IS_ERR_VALUE(r))
+ r = 0;
+ break;
+ }
default:
r = -EINVAL;
}