Commit 3fdd0459 authored by Oliver Upton's avatar Oliver Upton Committed by Marc Zyngier

KVM: arm64: Return a value from check_vcpu_requests()

A subsequent change to KVM will introduce a vCPU request that could
result in an exit to userspace. Change check_vcpu_requests() to return a
value and document the function. Unconditionally return 1 for now.
Signed-off-by: default avatarOliver Upton <oupton@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20220504032446.4133305-6-oupton@google.com
parent 1c6219e3
...@@ -648,7 +648,16 @@ void kvm_vcpu_wfi(struct kvm_vcpu *vcpu) ...@@ -648,7 +648,16 @@ void kvm_vcpu_wfi(struct kvm_vcpu *vcpu)
preempt_enable(); preempt_enable();
} }
static void check_vcpu_requests(struct kvm_vcpu *vcpu) /**
* check_vcpu_requests - check and handle pending vCPU requests
* @vcpu: the VCPU pointer
*
* Return: 1 if we should enter the guest
* 0 if we should exit to userspace
* < 0 if we should exit to userspace, where the return value indicates
* an error
*/
static int check_vcpu_requests(struct kvm_vcpu *vcpu)
{ {
if (kvm_request_pending(vcpu)) { if (kvm_request_pending(vcpu)) {
if (kvm_check_request(KVM_REQ_SLEEP, vcpu)) if (kvm_check_request(KVM_REQ_SLEEP, vcpu))
...@@ -678,6 +687,8 @@ static void check_vcpu_requests(struct kvm_vcpu *vcpu) ...@@ -678,6 +687,8 @@ static void check_vcpu_requests(struct kvm_vcpu *vcpu)
kvm_pmu_handle_pmcr(vcpu, kvm_pmu_handle_pmcr(vcpu,
__vcpu_sys_reg(vcpu, PMCR_EL0)); __vcpu_sys_reg(vcpu, PMCR_EL0));
} }
return 1;
} }
static bool vcpu_mode_is_bad_32bit(struct kvm_vcpu *vcpu) static bool vcpu_mode_is_bad_32bit(struct kvm_vcpu *vcpu)
...@@ -793,7 +804,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) ...@@ -793,7 +804,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
if (!ret) if (!ret)
ret = 1; ret = 1;
check_vcpu_requests(vcpu); if (ret > 0)
ret = check_vcpu_requests(vcpu);
/* /*
* Preparing the interrupts to be injected also * Preparing the interrupts to be injected also
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment