KVM: s390: protvirt: Write sthyi data to instruction data area (22d768c3) · Commits · 戴 / test

STHYI data has to go through the bounce buffer. Signed-off-by:

Cornelia Huck <cohuck@redhat.com> [borntraeger@de.ibm.com: patch merging, splitting, fixing] Signed-off-by:

arch/s390/kvm/intercept.c

+10 −5

Original line number	Diff line number	Diff line
		@@ -392,7 +392,7 @@ int handle_sthyi(struct kvm_vcpu *vcpu)
		goto out;
		}

		if (addr & ~PAGE_MASK)
		if (!kvm_s390_pv_cpu_is_protected(vcpu) && (addr & ~PAGE_MASK))
		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

		sctns = (void *)get_zeroed_page(GFP_KERNEL);
		@@ -403,12 +403,17 @@ int handle_sthyi(struct kvm_vcpu *vcpu)

		out:
		if (!cc) {
		if (kvm_s390_pv_cpu_is_protected(vcpu)) {
		memcpy((void *)(sida_origin(vcpu->arch.sie_block)),
		sctns, PAGE_SIZE);
		} else {
		r = write_guest(vcpu, addr, reg2, sctns, PAGE_SIZE);
		if (r) {
		free_page((unsigned long)sctns);
		return kvm_s390_inject_prog_cond(vcpu, r);
		}
		}
		}

		free_page((unsigned long)sctns);
		vcpu->run->s.regs.gprs[reg2 + 1] = rc;