|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] RE: [PATCH 3/5] x86/vmsi: use the newly introduced EOI callbacks
> -----Original Message-----
> From: Roger Pau Monne <roger.pau@xxxxxxxxxx>
> Sent: 12 August 2020 13:47
> To: xen-devel@xxxxxxxxxxxxxxxxxxxx
> Cc: Roger Pau Monne <roger.pau@xxxxxxxxxx>; Jan Beulich <jbeulich@xxxxxxxx>;
> Andrew Cooper
> <andrew.cooper3@xxxxxxxxxx>; Wei Liu <wl@xxxxxxx>; Paul Durrant <paul@xxxxxxx>
> Subject: [PATCH 3/5] x86/vmsi: use the newly introduced EOI callbacks
>
> Remove the unconditional call to hvm_dpci_msi_eoi in vlapic_handle_EOI
> and instead use the newly introduced EOI callback mechanism in order
> to register a callback for MSI vectors injected from passed through
> devices.
>
> Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
> ---
> xen/arch/x86/hvm/vlapic.c | 2 --
> xen/arch/x86/hvm/vmsi.c | 36 ++++++++++++++++++++++--------------
> xen/drivers/passthrough/io.c | 4 +++-
> xen/include/asm-x86/hvm/io.h | 2 +-
> 4 files changed, 26 insertions(+), 18 deletions(-)
>
> diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
> index 7369be468b..3b3b3d7621 100644
> --- a/xen/arch/x86/hvm/vlapic.c
> +++ b/xen/arch/x86/hvm/vlapic.c
> @@ -496,8 +496,6 @@ void vlapic_handle_EOI(struct vlapic *vlapic, u8 vector)
> else if ( has_viridian_synic(d) )
> viridian_synic_ack_sint(v, vector);
>
> - hvm_dpci_msi_eoi(d, vector);
> -
> spin_lock_irqsave(&vlapic->callback_lock, flags);
> callback = vlapic->callbacks[vector].callback;
> data = vlapic->callbacks[vector].data;
> diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c
> index 7ca19353ab..e192c4c6da 100644
> --- a/xen/arch/x86/hvm/vmsi.c
> +++ b/xen/arch/x86/hvm/vmsi.c
> @@ -44,11 +44,9 @@
> #include <asm/event.h>
> #include <asm/io_apic.h>
>
> -static void vmsi_inj_irq(
> - struct vlapic *target,
> - uint8_t vector,
> - uint8_t trig_mode,
> - uint8_t delivery_mode)
> +static void vmsi_inj_irq(struct vlapic *target, uint8_t vector,
> + uint8_t trig_mode, uint8_t delivery_mode,
> + vlapic_eoi_callback_t *callback, void *data)
> {
> HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "vmsi_inj_irq: vec %02x trig %d dm %d\n",
> vector, trig_mode, delivery_mode);
> @@ -57,17 +55,17 @@ static void vmsi_inj_irq(
> {
> case dest_Fixed:
> case dest_LowestPrio:
> - vlapic_set_irq(target, vector, trig_mode);
> + vlapic_set_irq_callback(target, vector, trig_mode, callback, data);
> break;
> default:
> BUG();
> }
> }
>
> -int vmsi_deliver(
> - struct domain *d, int vector,
> - uint8_t dest, uint8_t dest_mode,
> - uint8_t delivery_mode, uint8_t trig_mode)
> +static int vmsi_deliver_callback(struct domain *d, int vector, uint8_t dest,
> + uint8_t dest_mode, uint8_t delivery_mode,
> + uint8_t trig_mode,
> + vlapic_eoi_callback_t *callback, void *data)
> {
> struct vlapic *target;
> struct vcpu *v;
> @@ -78,7 +76,8 @@ int vmsi_deliver(
> target = vlapic_lowest_prio(d, NULL, 0, dest, dest_mode);
> if ( target != NULL )
> {
> - vmsi_inj_irq(target, vector, trig_mode, delivery_mode);
> + vmsi_inj_irq(target, vector, trig_mode, delivery_mode, callback,
> + data);
> break;
> }
> HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "null MSI round robin: vector=%02x\n",
> @@ -89,8 +88,8 @@ int vmsi_deliver(
> for_each_vcpu ( d, v )
> if ( vlapic_match_dest(vcpu_vlapic(v), NULL,
> 0, dest, dest_mode) )
> - vmsi_inj_irq(vcpu_vlapic(v), vector,
> - trig_mode, delivery_mode);
> + vmsi_inj_irq(vcpu_vlapic(v), vector, trig_mode,
> delivery_mode,
> + callback, data);
> break;
>
> default:
> @@ -103,6 +102,14 @@ int vmsi_deliver(
> return 0;
> }
>
> +
> +int vmsi_deliver(struct domain *d, int vector, uint8_t dest, uint8_t
> dest_mode,
> + uint8_t delivery_mode, uint8_t trig_mode)
> +{
> + return vmsi_deliver_callback(d, vector, dest, dest_mode, delivery_mode,
> + trig_mode, NULL, NULL);
> +}
> +
> void vmsi_deliver_pirq(struct domain *d, const struct hvm_pirq_dpci
> *pirq_dpci)
> {
> uint32_t flags = pirq_dpci->gmsi.gflags;
> @@ -119,7 +126,8 @@ void vmsi_deliver_pirq(struct domain *d, const struct
> hvm_pirq_dpci *pirq_dpci)
>
> ASSERT(pirq_dpci->flags & HVM_IRQ_DPCI_GUEST_MSI);
>
> - vmsi_deliver(d, vector, dest, dest_mode, delivery_mode, trig_mode);
> + vmsi_deliver_callback(d, vector, dest, dest_mode, delivery_mode,
> trig_mode,
> + hvm_dpci_msi_eoi, NULL);
> }
>
> /* Return value, -1 : multi-dests, non-negative value: dest_vcpu_id */
> diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c
> index 6b1305a3e5..3793029b29 100644
> --- a/xen/drivers/passthrough/io.c
> +++ b/xen/drivers/passthrough/io.c
> @@ -874,8 +874,10 @@ static int _hvm_dpci_msi_eoi(struct domain *d,
> return 0;
> }
>
> -void hvm_dpci_msi_eoi(struct domain *d, int vector)
> +void hvm_dpci_msi_eoi(struct vcpu *v, unsigned int vector, void *data)
> {
> + struct domain *d = v->domain;
> +
Could we actually drop the vcpu parameter here... i.e. is there any case where
this code will be invoked with v != current?
> if ( !is_iommu_enabled(d) ||
> (!hvm_domain_irq(d)->dpci && !is_hardware_domain(d)) )
> return;
> diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h
> index 558426b772..450c7c8acb 100644
> --- a/xen/include/asm-x86/hvm/io.h
> +++ b/xen/include/asm-x86/hvm/io.h
> @@ -159,7 +159,7 @@ struct hvm_hw_stdvga {
> void stdvga_init(struct domain *d);
> void stdvga_deinit(struct domain *d);
>
> -extern void hvm_dpci_msi_eoi(struct domain *d, int vector);
> +void hvm_dpci_msi_eoi(struct vcpu *v, unsigned int vector, void *data);
>
> /* Decode a PCI port IO access into a bus/slot/func/reg. */
> unsigned int hvm_pci_decode_addr(unsigned int cf8, unsigned int addr,
> --
> 2.28.0
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |