Commit 5786fffa authored by Cornelia Huck's avatar Cornelia Huck Committed by Avi Kivity
Browse files

KVM: s390: Add architectural trace events 



Add trace events for several s390 architecture specifics:

- SIE entry/exit
- common intercepts
- common instructions (sigp/diagnose)

Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 9b7fb990

arch/s390/kvm/diag.c

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/kvm.h>

#include <linux/kvm_host.h>

#include "kvm-s390.h"

#include "trace.h"



static int diag_release_pages(struct kvm_vcpu *vcpu)

{
@@ -105,6 +106,7 @@ int kvm_s390_handle_diag(struct kvm_vcpu *vcpu) 
{

	int code = (vcpu->arch.sie_block->ipb & 0xfff0000) >> 16;



	trace_kvm_s390_handle_diag(vcpu, code);

	switch (code) {

	case 0x10:

		return diag_release_pages(vcpu);

arch/s390/kvm/intercept.c

+8 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include "kvm-s390.h"

#include "gaccess.h"

#include "trace.h"



static int handle_lctlg(struct kvm_vcpu *vcpu)

{
@@ -45,6 +46,7 @@ static int handle_lctlg(struct kvm_vcpu *vcpu) 


	VCPU_EVENT(vcpu, 5, "lctlg r1:%x, r3:%x,b2:%x,d2:%x", reg1, reg3, base2,

		   disp2);

	trace_kvm_s390_handle_lctl(vcpu, 1, reg1, reg3, useraddr);



	do {

		rc = get_guest_u64(vcpu, useraddr,
@@ -82,6 +84,7 @@ static int handle_lctl(struct kvm_vcpu *vcpu) 


	VCPU_EVENT(vcpu, 5, "lctl r1:%x, r3:%x,b2:%x,d2:%x", reg1, reg3, base2,

		   disp2);

	trace_kvm_s390_handle_lctl(vcpu, 0, reg1, reg3, useraddr);



	reg = reg1;

	do {
@@ -171,6 +174,7 @@ static int handle_validity(struct kvm_vcpu *vcpu) 
	int rc;



	vcpu->stat.exit_validity++;

	trace_kvm_s390_intercept_validity(vcpu, viwhy);

	if (viwhy == 0x37) {

		vmaddr = gmap_fault(vcpu->arch.sie_block->prefix,

				    vcpu->arch.gmap);
@@ -213,6 +217,9 @@ static int handle_instruction(struct kvm_vcpu *vcpu) 
	intercept_handler_t handler;



	vcpu->stat.exit_instruction++;

	trace_kvm_s390_intercept_instruction(vcpu,

					     vcpu->arch.sie_block->ipa,

					     vcpu->arch.sie_block->ipb);

	handler = instruction_handlers[vcpu->arch.sie_block->ipa >> 8];

	if (handler)

		return handler(vcpu);
@@ -222,6 +229,7 @@ static int handle_instruction(struct kvm_vcpu *vcpu) 
static int handle_prog(struct kvm_vcpu *vcpu)

{

	vcpu->stat.exit_program_interruption++;

	trace_kvm_s390_intercept_prog(vcpu, vcpu->arch.sie_block->iprcc);

	return kvm_s390_inject_program_int(vcpu, vcpu->arch.sie_block->iprcc);

}

arch/s390/kvm/kvm-s390.c

+7 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ 
#include "kvm-s390.h"

#include "gaccess.h"



#define CREATE_TRACE_POINTS

#include "trace.h"



#define VCPU_STAT(x) offsetof(struct kvm_vcpu, stat.x), KVM_STAT_VCPU



struct kvm_stats_debugfs_item debugfs_entries[] = {
@@ -607,18 +610,22 @@ static int __vcpu_run(struct kvm_vcpu *vcpu) 
	local_irq_enable();

	VCPU_EVENT(vcpu, 6, "entering sie flags %x",

		   atomic_read(&vcpu->arch.sie_block->cpuflags));

	trace_kvm_s390_sie_enter(vcpu,

				 atomic_read(&vcpu->arch.sie_block->cpuflags));

	rc = sie64a(vcpu->arch.sie_block, vcpu->run->s.regs.gprs);

	if (rc) {

		if (kvm_is_ucontrol(vcpu->kvm)) {

			rc = SIE_INTERCEPT_UCONTROL;

		} else {

			VCPU_EVENT(vcpu, 3, "%s", "fault in sie instruction");

			trace_kvm_s390_sie_fault(vcpu);

			kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);

			rc = 0;

		}

	}

	VCPU_EVENT(vcpu, 6, "exit sie icptcode %d",

		   vcpu->arch.sie_block->icptcode);

	trace_kvm_s390_sie_exit(vcpu, vcpu->arch.sie_block->icptcode);

	local_irq_disable();

	kvm_guest_exit();

	local_irq_enable();

arch/s390/kvm/priv.c

+8 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <asm/sysinfo.h>

#include "gaccess.h"

#include "kvm-s390.h"

#include "trace.h"



static int handle_set_prefix(struct kvm_vcpu *vcpu)

{
@@ -59,6 +60,7 @@ static int handle_set_prefix(struct kvm_vcpu *vcpu) 
	kvm_s390_set_prefix(vcpu, address);



	VCPU_EVENT(vcpu, 5, "setting prefix to %x", address);

	trace_kvm_s390_handle_prefix(vcpu, 1, address);

out:

	return 0;

}
@@ -91,6 +93,7 @@ static int handle_store_prefix(struct kvm_vcpu *vcpu) 
	}



	VCPU_EVENT(vcpu, 5, "storing prefix to %x", address);

	trace_kvm_s390_handle_prefix(vcpu, 0, address);

out:

	return 0;

}
@@ -119,6 +122,7 @@ static int handle_store_cpu_address(struct kvm_vcpu *vcpu) 
	}



	VCPU_EVENT(vcpu, 5, "storing cpu address to %llx", useraddr);

	trace_kvm_s390_handle_stap(vcpu, useraddr);

out:

	return 0;

}
@@ -164,9 +168,11 @@ static int handle_stfl(struct kvm_vcpu *vcpu) 
			   &facility_list, sizeof(facility_list));

	if (rc == -EFAULT)

		kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);

	else

	else {

		VCPU_EVENT(vcpu, 5, "store facility list value %x",

			   facility_list);

		trace_kvm_s390_handle_stfl(vcpu, facility_list);

	}

	return 0;

}
@@ -278,6 +284,7 @@ static int handle_stsi(struct kvm_vcpu *vcpu) 
		kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);

		goto out_mem;

	}

	trace_kvm_s390_handle_stsi(vcpu, fc, sel1, sel2, operand2);

	free_page(mem);

	vcpu->arch.sie_block->gpsw.mask &= ~(3ul << 44);

	vcpu->run->s.regs.gprs[0] = 0;

arch/s390/kvm/sigp.c

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <asm/sigp.h>

#include "gaccess.h"

#include "kvm-s390.h"

#include "trace.h"



static int __sigp_sense(struct kvm_vcpu *vcpu, u16 cpu_addr,

			u64 *reg)
@@ -344,6 +345,7 @@ int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu) 
	else

		parameter = vcpu->run->s.regs.gprs[r1 + 1];



	trace_kvm_s390_handle_sigp(vcpu, order_code, cpu_addr, parameter);

	switch (order_code) {

	case SIGP_SENSE:

		vcpu->stat.instruction_sigp_sense++;