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

Commit 588438cb authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

KVM: s390: vsie: support run-time-instrumentation 



As soon as guest 2 is allowed to use run-time-instrumentation (indicated
via via STFLE), it can also enable it for guest 3.

Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent c9bc1eab

arch/s390/kvm/vsie.c

+26 −0
Original line number Diff line number Diff line
@@ -312,6 +312,9 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 
		scb_s->eca |= scb_o->eca & 0x00020000U;

		scb_s->ecd |= scb_o->ecd & 0x20000000U;

	}

	/* Run-time-Instrumentation */

	if (test_kvm_facility(vcpu->kvm, 64))

		scb_s->ecb3 |= scb_o->ecb3 & 0x01U;



	prepare_ibc(vcpu, vsie_page);

	rc = shadow_crycb(vcpu, vsie_page);
@@ -464,6 +467,13 @@ static void unpin_blocks(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 
		unpin_guest_page(vcpu->kvm, gpa, hpa);

		scb_s->gvrd = 0;

	}



	hpa = scb_s->riccbd;

	if (hpa) {

		gpa = scb_o->riccbd & ~0x3fUL;

		unpin_guest_page(vcpu->kvm, gpa, hpa);

		scb_s->riccbd = 0;

	}

}



/*
@@ -541,6 +551,22 @@ static int pin_blocks(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 
			goto unpin;

		scb_s->gvrd = hpa;

	}



	gpa = scb_o->riccbd & ~0x3fUL;

	if (gpa && (scb_s->ecb3 & 0x01U)) {

		if (!(gpa & ~0x1fffUL)) {

			rc = set_validity_icpt(scb_s, 0x0043U);

			goto unpin;

		}

		/* 64 bytes cannot cross page boundaries */

		rc = pin_guest_page(vcpu->kvm, gpa, &hpa);

		if (rc == -EINVAL)

			rc = set_validity_icpt(scb_s, 0x0043U);

		/* Validity 0x0044 will be checked by SIE */

		if (rc)

			goto unpin;

		scb_s->gvrd = hpa;

	}

	return 0;

unpin:

	unpin_blocks(vcpu, vsie_page);