|
@@ -258,6 +258,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
|
|
|
case KVM_CAP_S390_VECTOR_REGISTERS:
|
|
|
r = MACHINE_HAS_VX;
|
|
|
break;
|
|
|
+ case KVM_CAP_S390_RI:
|
|
|
+ r = test_facility(64);
|
|
|
+ break;
|
|
|
default:
|
|
|
r = 0;
|
|
|
}
|
|
@@ -358,6 +361,20 @@ static int kvm_vm_ioctl_enable_cap(struct kvm *kvm, struct kvm_enable_cap *cap)
|
|
|
VM_EVENT(kvm, 3, "ENABLE: CAP_S390_VECTOR_REGISTERS %s",
|
|
|
r ? "(not available)" : "(success)");
|
|
|
break;
|
|
|
+ case KVM_CAP_S390_RI:
|
|
|
+ r = -EINVAL;
|
|
|
+ mutex_lock(&kvm->lock);
|
|
|
+ if (atomic_read(&kvm->online_vcpus)) {
|
|
|
+ r = -EBUSY;
|
|
|
+ } else if (test_facility(64)) {
|
|
|
+ set_kvm_facility(kvm->arch.model.fac->mask, 64);
|
|
|
+ set_kvm_facility(kvm->arch.model.fac->list, 64);
|
|
|
+ r = 0;
|
|
|
+ }
|
|
|
+ mutex_unlock(&kvm->lock);
|
|
|
+ VM_EVENT(kvm, 3, "ENABLE: CAP_S390_RI %s",
|
|
|
+ r ? "(not available)" : "(success)");
|
|
|
+ break;
|
|
|
case KVM_CAP_S390_USER_STSI:
|
|
|
VM_EVENT(kvm, 3, "%s", "ENABLE: CAP_S390_USER_STSI");
|
|
|
kvm->arch.user_stsi = 1;
|
|
@@ -1395,6 +1412,8 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
|
|
|
KVM_SYNC_CRS |
|
|
|
KVM_SYNC_ARCH0 |
|
|
|
KVM_SYNC_PFAULT;
|
|
|
+ if (test_kvm_facility(vcpu->kvm, 64))
|
|
|
+ vcpu->run->kvm_valid_regs |= KVM_SYNC_RICCB;
|
|
|
if (test_kvm_facility(vcpu->kvm, 129))
|
|
|
vcpu->run->kvm_valid_regs |= KVM_SYNC_VRS;
|
|
|
|
|
@@ -1578,10 +1597,13 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
|
|
|
vcpu->arch.sie_block->eca |= 1;
|
|
|
if (sclp.has_sigpif)
|
|
|
vcpu->arch.sie_block->eca |= 0x10000000U;
|
|
|
+ if (test_kvm_facility(vcpu->kvm, 64))
|
|
|
+ vcpu->arch.sie_block->ecb3 |= 0x01;
|
|
|
if (test_kvm_facility(vcpu->kvm, 129)) {
|
|
|
vcpu->arch.sie_block->eca |= 0x00020000;
|
|
|
vcpu->arch.sie_block->ecd |= 0x20000000;
|
|
|
}
|
|
|
+ vcpu->arch.sie_block->riccbd = (unsigned long) &vcpu->run->s.regs.riccb;
|
|
|
vcpu->arch.sie_block->ictl |= ICTL_ISKE | ICTL_SSKE | ICTL_RRBE;
|
|
|
|
|
|
if (vcpu->kvm->arch.use_cmma) {
|