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

Commit bb59c2da authored by Alice Frosi's avatar Alice Frosi Committed by Martin Schwidefsky
Browse files

s390/runtime_instrumentation: clean up struct runtime_instr_cb 



Update runtime_instr_cb structure to be consistent with the runtime
instrumentation documentation.

Signed-off-by: default avatarAlice Frosi <alice@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 79962038

arch/s390/include/asm/runtime_instr.h

+41 −41
Original line number Diff line number Diff line
@@ -5,55 +5,55 @@ 
#define S390_RUNTIME_INSTR_STOP		0x2



struct runtime_instr_cb {

	__u64 buf_current;

	__u64 buf_origin;

	__u64 buf_limit;

	__u64 rca;

	__u64 roa;

	__u64 rla;



	__u32 valid		: 1;

	__u32 pstate		: 1;

	__u32 pstate_set_buf	: 1;

	__u32 home_space	: 1;

	__u32 altered		: 1;

	__u32			: 3;

	__u32 pstate_sample	: 1;

	__u32 sstate_sample	: 1;

	__u32 pstate_collect	: 1;

	__u32 sstate_collect	: 1;

	__u32			: 1;

	__u32 halted_int	: 1;

	__u32 int_requested	: 1;

	__u32 buffer_full_int	: 1;

	__u32 v			: 1;

	__u32 s			: 1;

	__u32 k			: 1;

	__u32 h			: 1;

	__u32 a			: 1;

	__u32 reserved1		: 3;

	__u32 ps		: 1;

	__u32 qs		: 1;

	__u32 pc		: 1;

	__u32 qc		: 1;

	__u32 reserved2		: 1;

	__u32 g			: 1;

	__u32 u			: 1;

	__u32 l			: 1;

	__u32 key		: 4;

	__u32			: 9;

	__u32 reserved3		: 8;

	__u32 t			: 1;

	__u32 rgs		: 3;



	__u32 mode		: 4;

	__u32 next		: 1;

	__u32 m			: 4;

	__u32 n			: 1;

	__u32 mae		: 1;

	__u32			: 2;

	__u32 call_type_br	: 1;

	__u32 return_type_br	: 1;

	__u32 other_type_br	: 1;

	__u32 bc_other_type	: 1;

	__u32 emit		: 1;

	__u32 tx_abort		: 1;

	__u32			: 2;

	__u32 bp_xn		: 1;

	__u32 bp_xt		: 1;

	__u32 bp_ti		: 1;

	__u32 bp_ni		: 1;

	__u32 suppr_y		: 1;

	__u32 suppr_z		: 1;

	__u32 reserved4		: 2;

	__u32 c			: 1;

	__u32 r			: 1;

	__u32 b			: 1;

	__u32 j			: 1;

	__u32 e			: 1;

	__u32 x			: 1;

	__u32 reserved5		: 2;

	__u32 bpxn		: 1;

	__u32 bpxt		: 1;

	__u32 bpti		: 1;

	__u32 bpni		: 1;

	__u32 reserved6		: 2;



	__u32 dc_miss_extra	: 1;

	__u32 lat_lev_ignore	: 1;

	__u32 ic_lat_lev	: 4;

	__u32 dc_lat_lev	: 4;

	__u32 d			: 1;

	__u32 f			: 1;

	__u32 ic		: 4;

	__u32 dc		: 4;



	__u64 reserved1;

	__u64 scaling_factor;

	__u64 reserved7;

	__u64 sf;

	__u64 rsic;

	__u64 reserved2;

	__u64 reserved8;

} __packed __aligned(8);



extern struct runtime_instr_cb runtime_instr_empty_cb;

arch/s390/kernel/runtime_instr.c

+6 −6
Original line number Diff line number Diff line
@@ -49,13 +49,13 @@ static void disable_runtime_instr(void) 


static void init_runtime_instr_cb(struct runtime_instr_cb *cb)

{

	cb->buf_limit = 0xfff;

	cb->pstate = 1;

	cb->pstate_set_buf = 1;

	cb->pstate_sample = 1;

	cb->pstate_collect = 1;

	cb->rla = 0xfff;

	cb->s = 1;

	cb->k = 1;

	cb->ps = 1;

	cb->pc = 1;

	cb->key = PAGE_DEFAULT_KEY;

	cb->valid = 1;

	cb->v = 1;

}



SYSCALL_DEFINE1(s390_runtime_instr, int, command)

arch/s390/kvm/kvm-s390.c

+1 −1
Original line number Diff line number Diff line
@@ -3283,7 +3283,7 @@ static void sync_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	 */

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

	    test_kvm_facility(vcpu->kvm, 64) &&

	    riccb->valid &&

	    riccb->v &&

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

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

		vcpu->arch.sie_block->ecb3 |= ECB3_RI;