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

Commit 8953fb08 authored Aug 03, 2016 by David Hildenbrand Committed by Christian Borntraeger Sep 08, 2016

KVM: s390: write external damage code on machine checks



Let's also write the external damage code already provided by
struct kvm_s390_mchk_info.

Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

parent ff5dc149

arch/s390/kernel/asm-offsets.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -125,6 +125,7 @@ int main(void)
	OFFSET(__LC_STFL_FAC_LIST, lowcore, stfl_fac_list);		OFFSET(__LC_STFL_FAC_LIST, lowcore, stfl_fac_list);
	OFFSET(__LC_STFLE_FAC_LIST, lowcore, stfle_fac_list);		OFFSET(__LC_STFLE_FAC_LIST, lowcore, stfle_fac_list);
	OFFSET(__LC_MCCK_CODE, lowcore, mcck_interruption_code);		OFFSET(__LC_MCCK_CODE, lowcore, mcck_interruption_code);
			OFFSET(__LC_EXT_DAMAGE_CODE, lowcore, external_damage_code);
	OFFSET(__LC_MCCK_FAIL_STOR_ADDR, lowcore, failing_storage_address);		OFFSET(__LC_MCCK_FAIL_STOR_ADDR, lowcore, failing_storage_address);
	OFFSET(__LC_LAST_BREAK, lowcore, breaking_event_addr);		OFFSET(__LC_LAST_BREAK, lowcore, breaking_event_addr);
	OFFSET(__LC_RST_OLD_PSW, lowcore, restart_old_psw);		OFFSET(__LC_RST_OLD_PSW, lowcore, restart_old_psw);

arch/s390/kvm/interrupt.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -460,6 +460,8 @@ static int __write_machine_check(struct kvm_vcpu *vcpu,
	&vcpu->arch.sie_block->gcr, 128);		&vcpu->arch.sie_block->gcr, 128);

	/* Extended interruption information */		/* Extended interruption information */
			rc \|= put_guest_lc(vcpu, mchk->ext_damage_code,
			(u32 __user *) __LC_EXT_DAMAGE_CODE);
	rc \|= put_guest_lc(vcpu, mchk->failing_storage_address,		rc \|= put_guest_lc(vcpu, mchk->failing_storage_address,
	(u64 __user *) __LC_MCCK_FAIL_STOR_ADDR);		(u64 __user *) __LC_MCCK_FAIL_STOR_ADDR);
	rc \|= write_guest_lc(vcpu, __LC_PSW_SAVE_AREA, &mchk->fixed_logout,		rc \|= write_guest_lc(vcpu, __LC_PSW_SAVE_AREA, &mchk->fixed_logout,