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

Commit 2c8180e8 authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

KVM: s390: vsie: simplify < 8k address checks 



This makes it certainly more readable.

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Signed-off-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 6302a13f

arch/s390/kvm/vsie.c

+5 −5
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ static int pin_blocks(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 
	if (test_kvm_cpu_feat(vcpu->kvm, KVM_S390_VM_CPU_FEAT_64BSCAO))

		gpa |= (u64) READ_ONCE(scb_o->scaoh) << 32;

	if (gpa) {

		if (!(gpa & ~0x1fffUL))

		if (gpa < 2 * PAGE_SIZE)

			rc = set_validity_icpt(scb_s, 0x0038U);

		else if ((gpa & ~0x1fffUL) == kvm_s390_get_prefix(vcpu))

			rc = set_validity_icpt(scb_s, 0x0011U);
@@ -578,7 +578,7 @@ static int pin_blocks(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 


	gpa = READ_ONCE(scb_o->itdba) & ~0xffUL;

	if (gpa && (scb_s->ecb & ECB_TE)) {

		if (!(gpa & ~0x1fffUL)) {

		if (gpa < 2 * PAGE_SIZE) {

			rc = set_validity_icpt(scb_s, 0x0080U);

			goto unpin;

		}
@@ -594,7 +594,7 @@ static int pin_blocks(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 


	gpa = READ_ONCE(scb_o->gvrd) & ~0x1ffUL;

	if (gpa && (scb_s->eca & ECA_VX) && !(scb_s->ecd & ECD_HOSTREGMGMT)) {

		if (!(gpa & ~0x1fffUL)) {

		if (gpa < 2 * PAGE_SIZE) {

			rc = set_validity_icpt(scb_s, 0x1310U);

			goto unpin;

		}
@@ -613,7 +613,7 @@ static int pin_blocks(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 


	gpa = READ_ONCE(scb_o->riccbd) & ~0x3fUL;

	if (gpa && (scb_s->ecb3 & ECB3_RI)) {

		if (!(gpa & ~0x1fffUL)) {

		if (gpa < 2 * PAGE_SIZE) {

			rc = set_validity_icpt(scb_s, 0x0043U);

			goto unpin;

		}
@@ -632,7 +632,7 @@ static int pin_blocks(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 


		gpa = READ_ONCE(scb_o->sdnxo) & ~0xfUL;

		sdnxc = READ_ONCE(scb_o->sdnxo) & 0xfUL;

		if (!gpa || !(gpa & ~0x1fffUL)) {

		if (!gpa || gpa < 2 * PAGE_SIZE) {

			rc = set_validity_icpt(scb_s, 0x10b0U);

			goto unpin;

		}