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

Commit 9fbd8082 authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

KVM: s390: clear the pfault queue if user space sets the invalid token 



We need a way to clear the async pfault queue from user space (e.g.
for resets and SIGP SET ARCHITECTURE).

This patch simply clears the queue as soon as user space sets the
invalid pfault token. The definition of the invalid token is moved
to uapi.

Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent ea5f4969

arch/s390/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -469,7 +469,6 @@ struct kvm_vcpu_arch { 
	};

	struct gmap *gmap;

	struct kvm_guestdbg_info_arch guestdbg;

#define KVM_S390_PFAULT_TOKEN_INVALID	(-1UL)

	unsigned long pfault_token;

	unsigned long pfault_select;

	unsigned long pfault_compare;

arch/s390/include/uapi/asm/kvm.h

+3 −0
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ struct kvm_guest_debug_arch { 
	struct kvm_hw_breakpoint __user *hw_bp;

};



/* for KVM_SYNC_PFAULT and KVM_REG_S390_PFTOKEN */

#define KVM_S390_PFAULT_TOKEN_INVALID	0xffffffffffffffffULL



#define KVM_SYNC_PREFIX (1UL << 0)

#define KVM_SYNC_GPRS   (1UL << 1)

#define KVM_SYNC_ACRS   (1UL << 2)

arch/s390/kvm/kvm-s390.c

+4 −0
Original line number Diff line number Diff line
@@ -936,6 +936,8 @@ static int kvm_arch_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu, 
	case KVM_REG_S390_PFTOKEN:

		r = get_user(vcpu->arch.pfault_token,

			     (u64 __user *)reg->addr);

		if (vcpu->arch.pfault_token == KVM_S390_PFAULT_TOKEN_INVALID)

			kvm_clear_async_pf_completion_queue(vcpu);

		break;

	case KVM_REG_S390_PFCOMPARE:

		r = get_user(vcpu->arch.pfault_compare,
@@ -1408,6 +1410,8 @@ static void sync_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
		vcpu->arch.pfault_token = kvm_run->s.regs.pft;

		vcpu->arch.pfault_select = kvm_run->s.regs.pfs;

		vcpu->arch.pfault_compare = kvm_run->s.regs.pfc;

		if (vcpu->arch.pfault_token == KVM_S390_PFAULT_TOKEN_INVALID)

			kvm_clear_async_pf_completion_queue(vcpu);

	}

	kvm_run->kvm_dirty_regs = 0;

}