All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jan Kiszka <jan.kiszka@web.de>
To: Peter Xu <peterx@redhat.com>, qemu-devel@nongnu.org
Cc: imammedo@redhat.com, rth@twiddle.net, ehabkost@redhat.com,
	jasowang@redhat.com, marcel@redhat.com, mst@redhat.com,
	pbonzini@redhat.com, rkrcmar@redhat.com,
	alex.williamson@redhat.com, wexu@redhat.com,
	David kiarie <davidkiarie4@gmail.com>
Subject: Re: [Qemu-devel] [PATCH v5 15/18] intel_iommu: introduce IEC notifiers
Date: Thu, 28 Apr 2016 09:26:01 +0200	[thread overview]
Message-ID: <5721BB09.2030302@web.de> (raw)
In-Reply-To: <1461827144-6937-16-git-send-email-peterx@redhat.com>

On 2016-04-28 09:05, Peter Xu wrote:
> This patch introduces Intel VT-d IEC (Interrupt Entry Cache)
> invalidation notifier list. When vIOMMU receives IEC invalidate request,
> all the registered units will be notified with specific invalidation
> requests.

This should be designed to be IOMMU-agnostic, i.e. become reusable for
the AMD implementation. I suspect we will have the same need for route
invalidations there as well...

Jan

> 
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
>  hw/i386/intel_iommu.c          | 56 ++++++++++++++++++++++++++++++++++++------
>  hw/i386/intel_iommu_internal.h | 24 +++++++++++++++---
>  include/hw/i386/intel_iommu.h  | 22 +++++++++++++++++
>  3 files changed, 91 insertions(+), 11 deletions(-)
> 
> diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
> index a8a57db..7122e5b 100644
> --- a/hw/i386/intel_iommu.c
> +++ b/hw/i386/intel_iommu.c
> @@ -900,6 +900,22 @@ static void vtd_root_table_setup(IntelIOMMUState *s)
>                  (s->root_extended ? "(extended)" : ""));
>  }
>  
> +static void vtd_iec_notify_all(IntelIOMMUState *s, bool global,
> +                               uint32_t index, uint32_t mask)
> +{
> +    VTD_IEC_Notifier *notifier;
> +
> +    VTD_DPRINTF(INV, "notify IEC invalidate: global=%d, index=%u, mask=%u",
> +                global, index, mask);
> +
> +    QLIST_FOREACH(notifier, &s->iec_notifiers, list) {
> +        if (notifier->iec_notify) {
> +            notifier->iec_notify(notifier->private, global,
> +                                 index, mask);
> +        }
> +    }
> +}
> +
>  static void vtd_interrupt_remap_table_setup(IntelIOMMUState *s)
>  {
>      uint64_t value = 0;
> @@ -907,7 +923,8 @@ static void vtd_interrupt_remap_table_setup(IntelIOMMUState *s)
>      s->intr_size = 1UL << ((value & VTD_IRTA_SIZE_MASK) + 1);
>      s->intr_root = value & VTD_IRTA_ADDR_MASK;
>  
> -    /* TODO: invalidate interrupt entry cache */
> +    /* Notify global invalidation */
> +    vtd_iec_notify_all(s, true, 0, 0);
>  
>      VTD_DPRINTF(CSR, "int remap table addr 0x%"PRIx64 " size %"PRIu32,
>                  s->intr_root, s->intr_size);
> @@ -1409,6 +1426,21 @@ static bool vtd_process_iotlb_desc(IntelIOMMUState *s, VTDInvDesc *inv_desc)
>      return true;
>  }
>  
> +static bool vtd_process_inv_iec_desc(IntelIOMMUState *s,
> +                                     VTDInvDesc *inv_desc)
> +{
> +    VTD_DPRINTF(INV, "inv ir glob %d index %d mask %d",
> +                inv_desc->iec.granularity,
> +                inv_desc->iec.index,
> +                inv_desc->iec.index_mask);
> +
> +    vtd_iec_notify_all(s, inv_desc->iec.granularity,
> +                       inv_desc->iec.index,
> +                       inv_desc->iec.index_mask);
> +
> +    return true;
> +}
> +
>  static bool vtd_process_inv_desc(IntelIOMMUState *s)
>  {
>      VTDInvDesc inv_desc;
> @@ -1449,12 +1481,12 @@ static bool vtd_process_inv_desc(IntelIOMMUState *s)
>          break;
>  
>      case VTD_INV_DESC_IEC:
> -        VTD_DPRINTF(INV, "Interrupt Entry Cache Invalidation "
> -                    "not implemented yet");
> -        /*
> -         * Since currently we do not cache interrupt entries, we can
> -         * just mark this descriptor as "good" and move on.
> -         */
> +        VTD_DPRINTF(INV, "Invalidation Interrupt Entry Cache "
> +                    "Descriptor hi 0x%"PRIx64 " lo 0x%"PRIx64,
> +                    inv_desc.hi, inv_desc.lo);
> +        if (!vtd_process_inv_iec_desc(s, &inv_desc)) {
> +            return false;
> +        }
>          break;
>  
>      default:
> @@ -2209,6 +2241,15 @@ static const MemoryRegionOps vtd_mem_ir_ops = {
>      },
>  };
>  
> +void vtd_iec_register_notifier(IntelIOMMUState *s, vtd_iec_notify_fn fn,
> +                               void *data)
> +{
> +    VTD_IEC_Notifier *notifier = g_new0(VTD_IEC_Notifier, 1);
> +    notifier->iec_notify = fn;
> +    notifier->private = data;
> +    QLIST_INSERT_HEAD(&s->iec_notifiers, notifier, list);
> +}
> +
>  VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devfn)
>  {
>      uintptr_t key = (uintptr_t)bus;
> @@ -2371,6 +2412,7 @@ static void vtd_realize(DeviceState *dev, Error **errp)
>                                       g_free, g_free);
>      s->vtd_as_by_busptr = g_hash_table_new_full(vtd_uint64_hash, vtd_uint64_equal,
>                                                g_free, g_free);
> +    QLIST_INIT(&s->iec_notifiers);
>      vtd_init(s);
>  }
>  
> diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h
> index e1a08cb..10c20fe 100644
> --- a/hw/i386/intel_iommu_internal.h
> +++ b/hw/i386/intel_iommu_internal.h
> @@ -296,12 +296,28 @@ typedef enum VTDFaultReason {
>  
>  #define VTD_CONTEXT_CACHE_GEN_MAX       0xffffffffUL
>  
> +/* Interrupt Entry Cache Invalidation Descriptor: VT-d 6.5.2.7. */
> +struct VTDInvDescIEC {
> +    uint32_t type:4;            /* Should always be 0x4 */
> +    uint32_t granularity:1;     /* If set, it's global IR invalidation */
> +    uint32_t resved_1:22;
> +    uint32_t index_mask:5;      /* 2^N for continuous int invalidation */
> +    uint32_t index:16;          /* Start index to invalidate */
> +    uint32_t reserved_2:16;
> +};
> +typedef struct VTDInvDescIEC VTDInvDescIEC;
> +
>  /* Queued Invalidation Descriptor */
> -struct VTDInvDesc {
> -    uint64_t lo;
> -    uint64_t hi;
> +union VTDInvDesc {
> +    struct {
> +        uint64_t lo;
> +        uint64_t hi;
> +    };
> +    union {
> +        VTDInvDescIEC iec;
> +    };
>  };
> -typedef struct VTDInvDesc VTDInvDesc;
> +typedef union VTDInvDesc VTDInvDesc;
>  
>  /* Masks for struct VTDInvDesc */
>  #define VTD_INV_DESC_TYPE               0xf
> diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h
> index 5910e6f..4fe92cf 100644
> --- a/include/hw/i386/intel_iommu.h
> +++ b/include/hw/i386/intel_iommu.h
> @@ -203,6 +203,24 @@ struct VTD_MSIMessage {
>  /* When IR is enabled, all MSI/MSI-X data bits should be zero */
>  #define VTD_IR_MSI_DATA          (0)
>  
> +/**
> + * vtd_iec_notify_fn - IEC (Interrupt Entry Cache) notifier hook,
> + *                     triggered when IR invalidation happens.
> + * @private: private data
> + * @global: whether this is a global IEC invalidation
> + * @index: IRTE index to invalidate (start from)
> + * @mask: invalidation mask
> + */
> +typedef void (*vtd_iec_notify_fn)(void *private, bool global,
> +                                  uint32_t index, uint32_t mask);
> +
> +struct VTD_IEC_Notifier {
> +    vtd_iec_notify_fn iec_notify;
> +    void *private;
> +    QLIST_ENTRY(VTD_IEC_Notifier) list;
> +};
> +typedef struct VTD_IEC_Notifier VTD_IEC_Notifier;
> +
>  /* The iommu (DMAR) device state struct */
>  struct IntelIOMMUState {
>      SysBusDevice busdev;
> @@ -243,6 +261,7 @@ struct IntelIOMMUState {
>      bool intr_enabled;              /* Whether guest enabled IR */
>      dma_addr_t intr_root;           /* Interrupt remapping table pointer */
>      uint32_t intr_size;             /* Number of IR table entries */
> +    QLIST_HEAD(, VTD_IEC_Notifier) iec_notifiers; /* IEC notify list */
>  };
>  
>  /* Find the VTD Address space associated with the given bus pointer,
> @@ -252,5 +271,8 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devfn);
>  /* Get default IOMMU object */
>  IntelIOMMUState *vtd_iommu_get(void);
>  int vtd_int_remap(void *iommu, MSIMessage *src, MSIMessage *dst);
> +/* Register IEC invalidate notifier */
> +void vtd_iec_register_notifier(IntelIOMMUState *s, vtd_iec_notify_fn fn,
> +                               void *data);
>  
>  #endif
> 

  reply	other threads:[~2016-04-28  7:26 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-28  7:05 [Qemu-devel] [PATCH v5 00/18] IOMMU: Enable interrupt remapping for Intel IOMMU Peter Xu
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 01/18] acpi: enable INTR for DMAR report structure Peter Xu
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 02/18] intel_iommu: allow queued invalidation for IR Peter Xu
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 03/18] intel_iommu: set IR bit for ECAP register Peter Xu
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 04/18] acpi: add DMAR scope definition for root IOAPIC Peter Xu
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 05/18] intel_iommu: define interrupt remap table addr register Peter Xu
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 06/18] intel_iommu: handle interrupt remap enable Peter Xu
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 07/18] intel_iommu: define several structs for IOMMU IR Peter Xu
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 08/18] intel_iommu: provide helper function vtd_get_iommu Peter Xu
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 09/18] intel_iommu: add IR translation faults defines Peter Xu
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 10/18] intel_iommu: Add support for PCI MSI remap Peter Xu
2016-04-28  7:32   ` Jan Kiszka
2016-04-28  8:06     ` Peter Xu
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 11/18] q35: ioapic: add support for emulated IOAPIC IR Peter Xu
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 12/18] ioapic: introduce ioapic_entry_parse() helper Peter Xu
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 13/18] intel_iommu: add support for split irqchip Peter Xu
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 14/18] q35: add "intremap" parameter to enable IR Peter Xu
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 15/18] intel_iommu: introduce IEC notifiers Peter Xu
2016-04-28  7:26   ` Jan Kiszka [this message]
2016-04-28  8:29     ` Peter Xu
2016-04-28  8:36       ` Jan Kiszka
2016-04-28  8:49         ` Peter Xu
2016-04-28 15:56           ` David Kiarie
2016-04-29  2:43             ` Peter Xu
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 16/18] ioapic: register VT-d IEC invalidate notifier Peter Xu
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 17/18] ioapic: keep RO bits for IOAPIC entry Peter Xu
2016-04-29 19:42   ` Radim Krčmář
2016-04-28  7:05 ` [Qemu-devel] [PATCH v5 18/18] ioapic: clear remote irr bit for edge-triggered interrupts Peter Xu
2016-04-29 19:46   ` Radim Krčmář
2016-04-28  7:12 ` [Qemu-devel] [PATCH v5 00/18] IOMMU: Enable interrupt remapping for Intel IOMMU Peter Xu
2016-04-28  7:19 ` Jan Kiszka
2016-04-28  9:18   ` Peter Xu
2016-04-28  9:32     ` Jan Kiszka
2016-04-29 19:52     ` Radim Krčmář
2016-05-03  3:22       ` Peter Xu
2016-05-03  4:38         ` Jan Kiszka
2016-05-03  5:30           ` Peter Xu
2016-05-03  5:40             ` Jan Kiszka
2016-05-03  6:00               ` Peter Xu
2016-05-03  6:09                 ` Jan Kiszka
2016-05-09 11:50           ` Paolo Bonzini
2016-04-28  9:30 ` [Qemu-devel] [PATCH 19/18] intel_iommu: Add support for Extended Interrupt Mode Jan Kiszka
2016-04-29  2:54   ` Peter Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5721BB09.2030302@web.de \
    --to=jan.kiszka@web.de \
    --cc=alex.williamson@redhat.com \
    --cc=davidkiarie4@gmail.com \
    --cc=ehabkost@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=marcel@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rkrcmar@redhat.com \
    --cc=rth@twiddle.net \
    --cc=wexu@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.