diff options
| author | Christian Borntraeger | 2018-03-08 17:08:49 +0100 |
|---|---|---|
| committer | Christian Borntraeger | 2018-07-19 12:59:36 +0200 |
| commit | a3da7b4a3be51f37f434f14e11e60491f098b6ea (patch) | |
| tree | 1b68582e0b6c6a215e55050455f64859a6cac290 /arch/s390/kvm/vsie.c | |
| parent | KVM: s390/vsie: avoid sparse warning (diff) | |
| download | kernel-qcow2-linux-a3da7b4a3be51f37f434f14e11e60491f098b6ea.tar.gz kernel-qcow2-linux-a3da7b4a3be51f37f434f14e11e60491f098b6ea.tar.xz kernel-qcow2-linux-a3da7b4a3be51f37f434f14e11e60491f098b6ea.zip | |
KVM: s390: add etoken support for guests
We want to provide facility 156 (etoken facility) to our
guests. This includes migration support (via sync regs) and
VSIE changes. The tokens are being reset on clear reset. This
has to be implemented by userspace (via sync regs).
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'arch/s390/kvm/vsie.c')
| -rw-r--r-- | arch/s390/kvm/vsie.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index 5539df037f91..63844b95c22c 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -2,7 +2,7 @@ /* * kvm nested virtualization support for s390x * - * Copyright IBM Corp. 2016 + * Copyright IBM Corp. 2016, 2018 * * Author(s): David Hildenbrand <dahi@linux.vnet.ibm.com> */ @@ -378,6 +378,10 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) if (test_kvm_facility(vcpu->kvm, 139)) scb_s->ecd |= scb_o->ecd & ECD_MEF; + /* etoken */ + if (test_kvm_facility(vcpu->kvm, 156)) + scb_s->ecd |= scb_o->ecd & ECD_ETOKENF; + prepare_ibc(vcpu, vsie_page); rc = shadow_crycb(vcpu, vsie_page); out: @@ -627,7 +631,8 @@ static int pin_blocks(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) vsie_page->riccbd_gpa = gpa; scb_s->riccbd = hpa; } - if ((scb_s->ecb & ECB_GS) && !(scb_s->ecd & ECD_HOSTREGMGMT)) { + if (((scb_s->ecb & ECB_GS) && !(scb_s->ecd & ECD_HOSTREGMGMT)) || + (scb_s->ecd & ECD_ETOKENF)) { unsigned long sdnxc; gpa = READ_ONCE(scb_o->sdnxo) & ~0xfUL; |