On Sun, Oct 01, 2023, Nicolas Saenz Julienne wrote:
> diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
> index 9436dca9903b..7c12d44486e1 100644
> --- a/arch/x86/kvm/hyperv.c
> +++ b/arch/x86/kvm/hyperv.c
> @@ -63,6 +63,10 @@
> */
> #define HV_EXT_CALL_MAX (HV_EXT_CALL_QUERY_CAPABILITIES + 64)
>
> +#define HV_VTL_RETURN_POLL_MASK \
> + (BIT_ULL(KVM_REQ_UNBLOCK) | BIT_ULL(KVM_REQ_HV_STIMER) | \
> + BIT_ULL(KVM_REQ_EVENT))
> +
> void kvm_tdp_mmu_role_set_hv_bits(struct kvm_vcpu *vcpu, union kvm_mmu_page_role *role)
> {
> //role->vtl = to_kvm_hv(vcpu->kvm)->hv_enable_vsm ? get_active_vtl(vcpu) : 0;
> @@ -3504,6 +3508,7 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu)
> goto hypercall_userspace_exit;
> case HVCALL_VTL_RETURN:
> vcpu->dump_state_on_run = true;
> + vcpu->poll_mask = HV_VTL_RETURN_POLL_MASK;
> goto hypercall_userspace_exit;
> case HVCALL_TRANSLATE_VIRTUAL_ADDRESS:
> if (unlikely(hc.rep_cnt)) {
...
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index db106f2e16d8..2985e462ef56 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -238,7 +238,7 @@ static bool kvm_request_needs_ipi(struct kvm_vcpu *vcpu, unsigned req)
> * READING_SHADOW_PAGE_TABLES mode.
> */
> if (req & KVM_REQUEST_WAIT)
> - return mode != OUTSIDE_GUEST_MODE;
> + return !(mode == OUTSIDE_GUEST_MODE || mode == POLLING_FOR_EVENTS);
This won't work if the vCPU makes a self-request, because kvm_make_vcpu_request()
won't bother sending an IPI if the current pCPU is running the vCPU. Piggybacking
the IPI logic is unnecessarily convoluted and silly. More below.
> @@ -3996,6 +4002,39 @@ static int kvm_vcpu_mmap(struct file *file, struct vm_area_struct *vma)
> return 0;
> }
>
> +static __poll_t kvm_vcpu_poll(struct file *file, poll_table *wait)
> +{
> + struct kvm_vcpu *vcpu = file->private_data;
> +
> + if (!vcpu->poll_mask)
> + return EPOLLERR;
> +
> + switch (READ_ONCE(vcpu->mode)) {
> + case OUTSIDE_GUEST_MODE:
> + /*
> + * Make sure writes to vcpu->request are visible before the
> + * mode changes.
> + */
Huh? There are no writes to vcpu->request anywhere in here.
> + smp_store_mb(vcpu->mode, POLLING_FOR_EVENTS);
> + break;
> + case POLLING_FOR_EVENTS:
> + break;
> + default:
> + WARN_ONCE(true, "Trying to poll vCPU %d in mode %d\n",
> + vcpu->vcpu_id, vcpu->mode);
This is definitely a user-triggerable WARN.
> + return EPOLLERR;
> + }
> +
> + poll_wait(file, &vcpu->wqh, wait);
> +
> + if (READ_ONCE(vcpu->requests) & vcpu->poll_mask) {
This effectively makes requests ABI. The simple mask also means that this will
get false positives on unrelated requests.
In short, whatever mechanism controls the polling needs to be formal uAPI.
> + WRITE_ONCE(vcpu->mode, OUTSIDE_GUEST_MODE);
This does not look remotely safe on multiple fronts. For starters, I don't see
anything in the .poll() infrastructure that provides serialization, e.g. if there
are multiple tasks polling then this will be "interesting".
And there is zero chance this is race-free, e.g. nothing prevents the vCPU task
itself from changing vcpu->mode from POLLING_FOR_EVENTS to something else.
Why on earth is this mucking with vcpu->mode? Ignoring for the moment that using
vcpu->requests as the poll source is never going to happen, there's zero reason
to write vcpu->mode. From a correctness perspective, AFAICT there's no need for
any shenanigans at all, i.e. kvm_make_vcpu_request() could blindly and unconditionally
call wake_up_interruptible().
I suspect what you want is a fast way to track if there *may* be pollers. Keying
off and *writing* vcpu->mode makes no sense to me.
I think what you want is something like this, where kvm_vcpu_poll() could use
atomic_fetch_or() and atomic_fetch_andnot() to manipulate vcpu->poll_mask.
Or if we only want to support a single poller at a time, it could be a vanilla
u64. I suspect getting the poll_mask manipulation correct for multiple pollers
would be tricky, e.g. to avoid false negatives and leave a poller hanging.
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 486800a7024b..5a260fb3b248 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -259,6 +259,14 @@ static inline bool kvm_kick_many_cpus(struct cpumask *cpus, bool wait)
return true;
}
+static inline bool kvm_request_is_being_polled(struct kvm_vcpu *vcpu,
+ unsigned int req)
+{
+ u32 poll_mask = kvm_request_to_poll_mask(req);
+
+ return (atomic_read(vcpu->poll_mask) & poll_mask)
+}
+
static void kvm_make_vcpu_request(struct kvm_vcpu *vcpu, unsigned int req,
struct cpumask *tmp, int current_cpu)
{
@@ -285,6 +293,9 @@ static void kvm_make_vcpu_request(struct kvm_vcpu *vcpu, unsigned int req,
if (cpu != -1 && cpu != current_cpu)
__cpumask_set_cpu(cpu, tmp);
}
+
+ if (kvm_request_is_being_polled(vcpu, req))
+ wake_up_interruptible(...);
}
bool kvm_make_vcpus_request_mask(struct kvm *kvm, unsigned int req,
