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

Commit 72875d8a authored by Radim Krčmář's avatar Radim Krčmář Committed by Paolo Bonzini
Browse files

KVM: add kvm_{test,clear}_request to replace {test,clear}_bit 



Users were expected to use kvm_check_request() for testing and clearing,
but request have expanded their use since then and some users want to
only test or do a faster clear.

Make sure that requests are not directly accessed with bit operations.

Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent cf9bdd35

arch/mips/kvm/emulate.c

+1 −1
Original line number Diff line number Diff line
@@ -982,7 +982,7 @@ enum emulation_result kvm_mips_emul_wait(struct kvm_vcpu *vcpu) 
		 * check if any I/O interrupts are pending.

		 */

		if (kvm_check_request(KVM_REQ_UNHALT, vcpu)) {

			clear_bit(KVM_REQ_UNHALT, &vcpu->requests);

			kvm_clear_request(KVM_REQ_UNHALT, vcpu);

			vcpu->run->exit_reason = KVM_EXIT_IRQ_WINDOW_OPEN;

		}

	}

arch/powerpc/kvm/book3s_pr.c

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static void kvmppc_set_msr_pr(struct kvm_vcpu *vcpu, u64 msr) 
	if (msr & MSR_POW) {

		if (!vcpu->arch.pending_exceptions) {

			kvm_vcpu_block(vcpu);

			clear_bit(KVM_REQ_UNHALT, &vcpu->requests);

			kvm_clear_request(KVM_REQ_UNHALT, vcpu);

			vcpu->stat.halt_wakeup++;



			/* Unset POW bit after we woke up */

arch/powerpc/kvm/book3s_pr_papr.c

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd) 
	case H_CEDE:

		kvmppc_set_msr_fast(vcpu, kvmppc_get_msr(vcpu) | MSR_EE);

		kvm_vcpu_block(vcpu);

		clear_bit(KVM_REQ_UNHALT, &vcpu->requests);

		kvm_clear_request(KVM_REQ_UNHALT, vcpu);

		vcpu->stat.halt_wakeup++;

		return EMULATE_DONE;

	case H_LOGICAL_CI_LOAD:

arch/powerpc/kvm/booke.c

+2 −2
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ static void arm_next_watchdog(struct kvm_vcpu *vcpu) 
	 * userspace, so clear the KVM_REQ_WATCHDOG request.

	 */

	if ((vcpu->arch.tsr & (TSR_ENW | TSR_WIS)) != (TSR_ENW | TSR_WIS))

		clear_bit(KVM_REQ_WATCHDOG, &vcpu->requests);

		kvm_clear_request(KVM_REQ_WATCHDOG, vcpu);



	spin_lock_irqsave(&vcpu->arch.wdt_lock, flags);

	nr_jiffies = watchdog_next_timeout(vcpu);
@@ -695,7 +695,7 @@ int kvmppc_core_prepare_to_enter(struct kvm_vcpu *vcpu) 
	if (vcpu->arch.shared->msr & MSR_WE) {

		local_irq_enable();

		kvm_vcpu_block(vcpu);

		clear_bit(KVM_REQ_UNHALT, &vcpu->requests);

		kvm_clear_request(KVM_REQ_UNHALT, vcpu);

		hard_irq_disable();



		kvmppc_set_exit_type(vcpu, EMULATED_MTMSRWE_EXITS);

arch/powerpc/kvm/powerpc.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ int kvmppc_kvm_pv(struct kvm_vcpu *vcpu) 
	case EV_HCALL_TOKEN(EV_IDLE):

		r = EV_SUCCESS;

		kvm_vcpu_block(vcpu);

		clear_bit(KVM_REQ_UNHALT, &vcpu->requests);

		kvm_clear_request(KVM_REQ_UNHALT, vcpu);

		break;

	default:

		r = EV_UNIMPLEMENTED;