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

Commit 4d5f2c04 authored by Christian Borntraeger's avatar Christian Borntraeger
Browse files

KVM: s390: log runtime instrumentation enablement 



We handle runtime instrumentation enablement either lazy or via
sync_regs on migration. Make sure to add a debug log entry for that
per CPU on the first occurrence.

Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 4495c08e

arch/s390/kvm/kvm-s390.c

+8 −6
Original line number Diff line number Diff line
@@ -2719,6 +2719,9 @@ static int __vcpu_run(struct kvm_vcpu *vcpu) 


static void sync_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)

{

	struct runtime_instr_cb *riccb;



	riccb = (struct runtime_instr_cb *) &kvm_run->s.regs.riccb;

	vcpu->arch.sie_block->gpsw.mask = kvm_run->psw_mask;

	vcpu->arch.sie_block->gpsw.addr = kvm_run->psw_addr;

	if (kvm_run->kvm_dirty_regs & KVM_SYNC_PREFIX)
@@ -2747,11 +2750,10 @@ static void sync_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	 * we should enable RI here instead of doing the lazy enablement.

	 */

	if ((kvm_run->kvm_dirty_regs & KVM_SYNC_RICCB) &&

	    test_kvm_facility(vcpu->kvm, 64)) {

		struct runtime_instr_cb *riccb =

			(struct runtime_instr_cb *) &kvm_run->s.regs.riccb;



		if (riccb->valid)

	    test_kvm_facility(vcpu->kvm, 64) &&

	    riccb->valid &&

	    !(vcpu->arch.sie_block->ecb3 & 0x01)) {

		VCPU_EVENT(vcpu, 3, "%s", "ENABLE: RI (sync_regs)");

		vcpu->arch.sie_block->ecb3 |= 0x01;

	}

	save_access_regs(vcpu->arch.host_acrs);

arch/s390/kvm/priv.c

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
static int handle_ri(struct kvm_vcpu *vcpu)

{

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

		VCPU_EVENT(vcpu, 3, "%s", "ENABLE: RI (lazy)");

		vcpu->arch.sie_block->ecb3 |= 0x01;

		kvm_s390_retry_instr(vcpu);

		return 0;