[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v13 37/60] hw/xen: Implement EVTCHNOP_bind_vcpu
From: |
David Woodhouse |
Subject: |
[PATCH v13 37/60] hw/xen: Implement EVTCHNOP_bind_vcpu |
Date: |
Thu, 23 Feb 2023 12:45:50 +0000 |
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
---
hw/i386/kvm/xen_evtchn.c | 40 +++++++++++++++++++++++++++++++++++++++
hw/i386/kvm/xen_evtchn.h | 2 ++
target/i386/kvm/xen-emu.c | 12 ++++++++++++
3 files changed, 54 insertions(+)
diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c
index 3e6f7afcbc..f87b6a3b23 100644
--- a/hw/i386/kvm/xen_evtchn.c
+++ b/hw/i386/kvm/xen_evtchn.c
@@ -789,6 +789,46 @@ int xen_evtchn_unmask_op(struct evtchn_unmask *unmask)
return ret;
}
+int xen_evtchn_bind_vcpu_op(struct evtchn_bind_vcpu *vcpu)
+{
+ XenEvtchnState *s = xen_evtchn_singleton;
+ XenEvtchnPort *p;
+ int ret = -EINVAL;
+
+ if (!s) {
+ return -ENOTSUP;
+ }
+
+ if (!valid_port(vcpu->port)) {
+ return -EINVAL;
+ }
+
+ if (!valid_vcpu(vcpu->vcpu)) {
+ return -ENOENT;
+ }
+
+ qemu_mutex_lock(&s->port_lock);
+
+ p = &s->port_table[vcpu->port];
+
+ if (p->type == EVTCHNSTAT_interdomain ||
+ p->type == EVTCHNSTAT_unbound ||
+ p->type == EVTCHNSTAT_pirq ||
+ (p->type == EVTCHNSTAT_virq && virq_is_global(p->type_val))) {
+ /*
+ * unmask_port() with do_unmask==false will just raise the event
+ * on the new vCPU if the port was already pending.
+ */
+ p->vcpu = vcpu->vcpu;
+ unmask_port(s, vcpu->port, false);
+ ret = 0;
+ }
+
+ qemu_mutex_unlock(&s->port_lock);
+
+ return ret;
+}
+
int xen_evtchn_bind_virq_op(struct evtchn_bind_virq *virq)
{
XenEvtchnState *s = xen_evtchn_singleton;
diff --git a/hw/i386/kvm/xen_evtchn.h b/hw/i386/kvm/xen_evtchn.h
index 1ebc7580eb..486b031c82 100644
--- a/hw/i386/kvm/xen_evtchn.h
+++ b/hw/i386/kvm/xen_evtchn.h
@@ -23,6 +23,7 @@ struct evtchn_bind_ipi;
struct evtchn_send;
struct evtchn_alloc_unbound;
struct evtchn_bind_interdomain;
+struct evtchn_bind_vcpu;
int xen_evtchn_status_op(struct evtchn_status *status);
int xen_evtchn_close_op(struct evtchn_close *close);
int xen_evtchn_unmask_op(struct evtchn_unmask *unmask);
@@ -31,5 +32,6 @@ int xen_evtchn_bind_ipi_op(struct evtchn_bind_ipi *ipi);
int xen_evtchn_send_op(struct evtchn_send *send);
int xen_evtchn_alloc_unbound_op(struct evtchn_alloc_unbound *alloc);
int xen_evtchn_bind_interdomain_op(struct evtchn_bind_interdomain
*interdomain);
+int xen_evtchn_bind_vcpu_op(struct evtchn_bind_vcpu *vcpu);
#endif /* QEMU_XEN_EVTCHN_H */
diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c
index a07d1d39f3..ec7aefadfc 100644
--- a/target/i386/kvm/xen-emu.c
+++ b/target/i386/kvm/xen-emu.c
@@ -949,6 +949,18 @@ static bool kvm_xen_hcall_evtchn_op(struct kvm_xen_exit
*exit, X86CPU *cpu,
}
break;
}
+ case EVTCHNOP_bind_vcpu: {
+ struct evtchn_bind_vcpu vcpu;
+
+ qemu_build_assert(sizeof(vcpu) == 8);
+ if (kvm_copy_from_gva(cs, arg, &vcpu, sizeof(vcpu))) {
+ err = -EFAULT;
+ break;
+ }
+
+ err = xen_evtchn_bind_vcpu_op(&vcpu);
+ break;
+ }
default:
return false;
}
--
2.39.0
- [PATCH v13 00/60] Xen HVM support under KVM, David Woodhouse, 2023/02/23
- [PATCH v13 05/60] i386/kvm: handle Xen HVM cpuid leaves, David Woodhouse, 2023/02/23
- [PATCH v13 53/60] hw/xen: Automatically add xen-platform PCI device for emulated Xen guests, David Woodhouse, 2023/02/23
- [PATCH v13 10/60] i386/xen: implement HYPERVISOR_xen_version, David Woodhouse, 2023/02/23
- [PATCH v13 47/60] i386/xen: handle PV timer hypercalls, David Woodhouse, 2023/02/23
- [PATCH v13 22/60] i386/xen: handle VCPUOP_register_vcpu_time_info, David Woodhouse, 2023/02/23
- [PATCH v13 20/60] i386/xen: implement HYPERVISOR_vcpu_op, David Woodhouse, 2023/02/23
- [PATCH v13 06/60] i386/kvm: Set Xen vCPU ID in KVM, David Woodhouse, 2023/02/23
- [PATCH v13 37/60] hw/xen: Implement EVTCHNOP_bind_vcpu,
David Woodhouse <=
- [PATCH v13 38/60] hw/xen: Implement EVTCHNOP_reset, David Woodhouse, 2023/02/23
- [PATCH v13 30/60] hw/xen: Implement EVTCHNOP_close, David Woodhouse, 2023/02/23
- [PATCH v13 09/60] i386/xen: handle guest hypercalls, David Woodhouse, 2023/02/23
- [PATCH v13 25/60] i386/xen: implement HVMOP_set_evtchn_upcall_vector, David Woodhouse, 2023/02/23
- [PATCH v13 35/60] hw/xen: Implement EVTCHNOP_alloc_unbound, David Woodhouse, 2023/02/23
- [PATCH v13 45/60] i386/xen: Implement HYPERVISOR_grant_table_op and GNTTABOP_[gs]et_verson, David Woodhouse, 2023/02/23
- [PATCH v13 08/60] xen-platform: allow its creation with XEN_EMULATE mode, David Woodhouse, 2023/02/23
- [PATCH v13 07/60] xen-platform: exclude vfio-pci from the PCI platform unplug, David Woodhouse, 2023/02/23
- [PATCH v13 42/60] kvm/i386: Add xen-gnttab-max-frames property, David Woodhouse, 2023/02/23
- [PATCH v13 31/60] hw/xen: Implement EVTCHNOP_unmask, David Woodhouse, 2023/02/23