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

Commit bc17de7c authored by Eric Farman's avatar Eric Farman Committed by Christian Borntraeger
Browse files

KVM: s390: Machine Check 



Store additional status in the machine check handler, in order to
collect status (such as vector registers) that is not defined by
store status.

Signed-off-by: default avatarEric Farman <farman@linux.vnet.ibm.com>
Reviewed-by: default avatarThomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent cd7b4b61

arch/s390/kernel/asm-offsets.c

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ int main(void) 
#else /* CONFIG_32BIT */

	DEFINE(__LC_DATA_EXC_CODE, offsetof(struct _lowcore, data_exc_code));

	DEFINE(__LC_MCCK_FAIL_STOR_ADDR, offsetof(struct _lowcore, failing_storage_address));

	DEFINE(__LC_VX_SAVE_AREA_ADDR, offsetof(struct _lowcore, vector_save_area_addr));

	DEFINE(__LC_EXT_PARAMS2, offsetof(struct _lowcore, ext_params2));

	DEFINE(SAVE_AREA_BASE, offsetof(struct _lowcore, floating_pt_save_area));

	DEFINE(__LC_PASTE, offsetof(struct _lowcore, paste));

arch/s390/kvm/interrupt.c

+4 −0
Original line number Diff line number Diff line
@@ -351,6 +351,7 @@ static int __must_check __deliver_machine_check(struct kvm_vcpu *vcpu) 
{

	struct kvm_s390_local_interrupt *li = &vcpu->arch.local_int;

	struct kvm_s390_mchk_info mchk;

	unsigned long adtl_status_addr;

	int rc;



	spin_lock(&li->lock);
@@ -371,6 +372,9 @@ static int __must_check __deliver_machine_check(struct kvm_vcpu *vcpu) 
					 mchk.cr14, mchk.mcic);



	rc  = kvm_s390_vcpu_store_status(vcpu, KVM_S390_STORE_STATUS_PREFIXED);

	rc |= read_guest_lc(vcpu, __LC_VX_SAVE_AREA_ADDR,

			    &adtl_status_addr, sizeof(unsigned long));

	rc |= kvm_s390_vcpu_store_adtl_status(vcpu, adtl_status_addr);

	rc |= put_guest_lc(vcpu, mchk.mcic,

			   (u64 __user *) __LC_MCCK_CODE);

	rc |= put_guest_lc(vcpu, mchk.failing_storage_address,

arch/s390/kvm/kvm-s390.c

+29 −0
Original line number Diff line number Diff line
@@ -2031,6 +2031,35 @@ int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr) 
	return kvm_s390_store_status_unloaded(vcpu, addr);

}



/*

 * store additional status at address

 */

int kvm_s390_store_adtl_status_unloaded(struct kvm_vcpu *vcpu,

					unsigned long gpa)

{

	/* Only bits 0-53 are used for address formation */

	if (!(gpa & ~0x3ff))

		return 0;



	return write_guest_abs(vcpu, gpa & ~0x3ff,

			       (void *)&vcpu->run->s.regs.vrs, 512);

}



int kvm_s390_vcpu_store_adtl_status(struct kvm_vcpu *vcpu, unsigned long addr)

{

	if (!test_kvm_facility(vcpu->kvm, 129))

		return 0;



	/*

	 * The guest VXRS are in the host VXRs due to the lazy

	 * copying in vcpu load/put. Let's update our copies before we save

	 * it into the save area.

	 */

	save_vx_regs((__vector128 *)&vcpu->run->s.regs.vrs);



	return kvm_s390_store_adtl_status_unloaded(vcpu, addr);

}



static void __disable_ibs_on_vcpu(struct kvm_vcpu *vcpu)

{

	kvm_check_request(KVM_REQ_ENABLE_IBS, vcpu);

arch/s390/kvm/kvm-s390.h

+3 −0
Original line number Diff line number Diff line
@@ -177,7 +177,10 @@ int kvm_s390_handle_sigp_pei(struct kvm_vcpu *vcpu); 
/* implemented in kvm-s390.c */

long kvm_arch_fault_in_page(struct kvm_vcpu *vcpu, gpa_t gpa, int writable);

int kvm_s390_store_status_unloaded(struct kvm_vcpu *vcpu, unsigned long addr);

int kvm_s390_store_adtl_status_unloaded(struct kvm_vcpu *vcpu,

					unsigned long addr);

int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr);

int kvm_s390_vcpu_store_adtl_status(struct kvm_vcpu *vcpu, unsigned long addr);

void kvm_s390_vcpu_start(struct kvm_vcpu *vcpu);

void kvm_s390_vcpu_stop(struct kvm_vcpu *vcpu);

void s390_vcpu_block(struct kvm_vcpu *vcpu);