From: "Liu, Yi L" <yi.l.liu@intel.com> To: Peter Xu <peterx@redhat.com> Cc: "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>, "mst@redhat.com" <mst@redhat.com>, "pbonzini@redhat.com" <pbonzini@redhat.com>, "alex.williamson@redhat.com" <alex.williamson@redhat.com>, "eric.auger@redhat.com" <eric.auger@redhat.com>, "david@gibson.dropbear.id.au" <david@gibson.dropbear.id.au>, "tianyu.lan@intel.com" <tianyu.lan@intel.com>, "Tian, Kevin" <kevin.tian@intel.com>, "Tian, Jun J" <jun.j.tian@intel.com>, "Sun, Yi Y" <yi.y.sun@intel.com>, "jacob.jun.pan@linux.intel.com" <jacob.jun.pan@linux.intel.com>, "kvm@vger.kernel.org" <kvm@vger.kernel.org>, Yi Sun <yi.y.sun@linux.intel.com> Subject: RE: [RFC v2 08/22] intel_iommu: provide get_iommu_context() callback Date: Wed, 6 Nov 2019 11:07:11 +0000 [thread overview] Message-ID: <A2975661238FB949B60364EF0F2C25743A0EF168@SHSMSX104.ccr.corp.intel.com> (raw) In-Reply-To: <20191101145503.GB8888@xz-x1.metropole.lan> > From: Peter Xu [mailto:peterx@redhat.com] > Sent: Friday, November 1, 2019 10:55 PM > To: Liu, Yi L <yi.l.liu@intel.com> > Subject: Re: [RFC v2 08/22] intel_iommu: provide get_iommu_context() callback > > On Thu, Oct 24, 2019 at 08:34:29AM -0400, Liu Yi L wrote: > > This patch adds get_iommu_context() callback to return an iommu_context > > Intel VT-d platform. > > > > Cc: Kevin Tian <kevin.tian@intel.com> > > Cc: Jacob Pan <jacob.jun.pan@linux.intel.com> > > Cc: Peter Xu <peterx@redhat.com> > > Cc: Yi Sun <yi.y.sun@linux.intel.com> > > Signed-off-by: Liu Yi L <yi.l.liu@intel.com> > > --- > > hw/i386/intel_iommu.c | 57 ++++++++++++++++++++++++++++++++++++++--- > -- > > include/hw/i386/intel_iommu.h | 14 ++++++++++- > > 2 files changed, 64 insertions(+), 7 deletions(-) > > > > diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c > > index 67a7836..e9f8692 100644 > > --- a/hw/i386/intel_iommu.c > > +++ b/hw/i386/intel_iommu.c > > @@ -3288,22 +3288,33 @@ static const MemoryRegionOps vtd_mem_ir_ops = { > > }, > > }; > > > > -VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devfn) > > +static VTDBus *vtd_find_add_bus(IntelIOMMUState *s, PCIBus *bus) > > { > > uintptr_t key = (uintptr_t)bus; > > - VTDBus *vtd_bus = g_hash_table_lookup(s->vtd_as_by_busptr, &key); > > - VTDAddressSpace *vtd_dev_as; > > - char name[128]; > > + VTDBus *vtd_bus; > > > > + vtd_iommu_lock(s); > > Why explicitly take the IOMMU lock here? I mean, it's fine to take > it, but if so why not take it to cover the whole vtd_find_add_as()? Just wanted to make the protected snippet smaller. But I'm fine to move it to vtd_find_add_as() if there is no much value for putting it here. > For now it'll be fine in either way because I believe iommu_lock is > not really functioning when we're still with BQL here, however if you > add that explicitly then I don't see why it's not covering that. Got it. It functions if you missed to put a mirrored unlock after a lock. (joke) > > > + vtd_bus = g_hash_table_lookup(s->vtd_as_by_busptr, &key); > > if (!vtd_bus) { > > uintptr_t *new_key = g_malloc(sizeof(*new_key)); > > *new_key = (uintptr_t)bus; > > /* No corresponding free() */ > > - vtd_bus = g_malloc0(sizeof(VTDBus) + sizeof(VTDAddressSpace *) * \ > > - PCI_DEVFN_MAX); > > + vtd_bus = g_malloc0(sizeof(VTDBus) + PCI_DEVFN_MAX * \ > > + (sizeof(VTDAddressSpace *) + sizeof(VTDIOMMUContext *))); > > Should this be as simple as g_malloc0(sizeof(VTDBus) since [1]? yes, it's old writing. Will modify it. > Otherwise the patch looks sane to me. > > > vtd_bus->bus = bus; > > g_hash_table_insert(s->vtd_as_by_busptr, new_key, vtd_bus); > > } > > + vtd_iommu_unlock(s); > > + return vtd_bus; > > +} > > [...] > > > struct VTDBus { > > PCIBus* bus; /* A reference to the bus to provide translation for > */ > > - VTDAddressSpace *dev_as[0]; /* A table of VTDAddressSpace objects > indexed by devfn */ > > + /* A table of VTDAddressSpace objects indexed by devfn */ > > + VTDAddressSpace *dev_as[PCI_DEVFN_MAX]; > > + /* A table of VTDIOMMUContext objects indexed by devfn */ > > + VTDIOMMUContext *dev_ic[PCI_DEVFN_MAX]; > > [1] exactly. > > > }; > > > > struct VTDIOTLBEntry { > > @@ -282,5 +293,6 @@ struct IntelIOMMUState { > > * create a new one if none exists > > */ > > VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devfn); > > +VTDIOMMUContext *vtd_find_add_ic(IntelIOMMUState *s, PCIBus *bus, int > devfn); > > > > #endif > > -- > > 2.7.4 > > Thanks, Yi Liu
WARNING: multiple messages have this Message-ID (diff)
From: "Liu, Yi L" <yi.l.liu@intel.com> To: Peter Xu <peterx@redhat.com> Cc: "tianyu.lan@intel.com" <tianyu.lan@intel.com>, "Tian, Kevin" <kevin.tian@intel.com>, "jacob.jun.pan@linux.intel.com" <jacob.jun.pan@linux.intel.com>, Yi Sun <yi.y.sun@linux.intel.com>, "kvm@vger.kernel.org" <kvm@vger.kernel.org>, "mst@redhat.com" <mst@redhat.com>, "Tian, Jun J" <jun.j.tian@intel.com>, "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>, "eric.auger@redhat.com" <eric.auger@redhat.com>, "alex.williamson@redhat.com" <alex.williamson@redhat.com>, "pbonzini@redhat.com" <pbonzini@redhat.com>, "Sun, Yi Y" <yi.y.sun@intel.com>, "david@gibson.dropbear.id.au" <david@gibson.dropbear.id.au> Subject: RE: [RFC v2 08/22] intel_iommu: provide get_iommu_context() callback Date: Wed, 6 Nov 2019 11:07:11 +0000 [thread overview] Message-ID: <A2975661238FB949B60364EF0F2C25743A0EF168@SHSMSX104.ccr.corp.intel.com> (raw) In-Reply-To: <20191101145503.GB8888@xz-x1.metropole.lan> > From: Peter Xu [mailto:peterx@redhat.com] > Sent: Friday, November 1, 2019 10:55 PM > To: Liu, Yi L <yi.l.liu@intel.com> > Subject: Re: [RFC v2 08/22] intel_iommu: provide get_iommu_context() callback > > On Thu, Oct 24, 2019 at 08:34:29AM -0400, Liu Yi L wrote: > > This patch adds get_iommu_context() callback to return an iommu_context > > Intel VT-d platform. > > > > Cc: Kevin Tian <kevin.tian@intel.com> > > Cc: Jacob Pan <jacob.jun.pan@linux.intel.com> > > Cc: Peter Xu <peterx@redhat.com> > > Cc: Yi Sun <yi.y.sun@linux.intel.com> > > Signed-off-by: Liu Yi L <yi.l.liu@intel.com> > > --- > > hw/i386/intel_iommu.c | 57 ++++++++++++++++++++++++++++++++++++++--- > -- > > include/hw/i386/intel_iommu.h | 14 ++++++++++- > > 2 files changed, 64 insertions(+), 7 deletions(-) > > > > diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c > > index 67a7836..e9f8692 100644 > > --- a/hw/i386/intel_iommu.c > > +++ b/hw/i386/intel_iommu.c > > @@ -3288,22 +3288,33 @@ static const MemoryRegionOps vtd_mem_ir_ops = { > > }, > > }; > > > > -VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devfn) > > +static VTDBus *vtd_find_add_bus(IntelIOMMUState *s, PCIBus *bus) > > { > > uintptr_t key = (uintptr_t)bus; > > - VTDBus *vtd_bus = g_hash_table_lookup(s->vtd_as_by_busptr, &key); > > - VTDAddressSpace *vtd_dev_as; > > - char name[128]; > > + VTDBus *vtd_bus; > > > > + vtd_iommu_lock(s); > > Why explicitly take the IOMMU lock here? I mean, it's fine to take > it, but if so why not take it to cover the whole vtd_find_add_as()? Just wanted to make the protected snippet smaller. But I'm fine to move it to vtd_find_add_as() if there is no much value for putting it here. > For now it'll be fine in either way because I believe iommu_lock is > not really functioning when we're still with BQL here, however if you > add that explicitly then I don't see why it's not covering that. Got it. It functions if you missed to put a mirrored unlock after a lock. (joke) > > > + vtd_bus = g_hash_table_lookup(s->vtd_as_by_busptr, &key); > > if (!vtd_bus) { > > uintptr_t *new_key = g_malloc(sizeof(*new_key)); > > *new_key = (uintptr_t)bus; > > /* No corresponding free() */ > > - vtd_bus = g_malloc0(sizeof(VTDBus) + sizeof(VTDAddressSpace *) * \ > > - PCI_DEVFN_MAX); > > + vtd_bus = g_malloc0(sizeof(VTDBus) + PCI_DEVFN_MAX * \ > > + (sizeof(VTDAddressSpace *) + sizeof(VTDIOMMUContext *))); > > Should this be as simple as g_malloc0(sizeof(VTDBus) since [1]? yes, it's old writing. Will modify it. > Otherwise the patch looks sane to me. > > > vtd_bus->bus = bus; > > g_hash_table_insert(s->vtd_as_by_busptr, new_key, vtd_bus); > > } > > + vtd_iommu_unlock(s); > > + return vtd_bus; > > +} > > [...] > > > struct VTDBus { > > PCIBus* bus; /* A reference to the bus to provide translation for > */ > > - VTDAddressSpace *dev_as[0]; /* A table of VTDAddressSpace objects > indexed by devfn */ > > + /* A table of VTDAddressSpace objects indexed by devfn */ > > + VTDAddressSpace *dev_as[PCI_DEVFN_MAX]; > > + /* A table of VTDIOMMUContext objects indexed by devfn */ > > + VTDIOMMUContext *dev_ic[PCI_DEVFN_MAX]; > > [1] exactly. > > > }; > > > > struct VTDIOTLBEntry { > > @@ -282,5 +293,6 @@ struct IntelIOMMUState { > > * create a new one if none exists > > */ > > VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devfn); > > +VTDIOMMUContext *vtd_find_add_ic(IntelIOMMUState *s, PCIBus *bus, int > devfn); > > > > #endif > > -- > > 2.7.4 > > Thanks, Yi Liu
next prev parent reply other threads:[~2019-11-06 11:07 UTC|newest] Thread overview: 150+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-24 12:34 [RFC v2 00/22] intel_iommu: expose Shared Virtual Addressing to VM Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-10-24 12:34 ` [RFC v2 01/22] update-linux-headers: Import iommu.h Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-10-24 12:34 ` [RFC v2 02/22] header update VFIO/IOMMU vSVA APIs against 5.4.0-rc3+ Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-10-24 12:34 ` [RFC v2 03/22] intel_iommu: modify x-scalable-mode to be string option Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-11-01 14:57 ` Peter Xu 2019-11-01 14:57 ` Peter Xu 2019-11-05 9:14 ` Liu, Yi L 2019-11-05 9:14 ` Liu, Yi L 2019-11-05 12:50 ` Peter Xu 2019-11-05 12:50 ` Peter Xu 2019-11-06 9:50 ` Liu, Yi L 2019-11-06 9:50 ` Liu, Yi L 2019-10-24 12:34 ` [RFC v2 04/22] hw/iommu: introduce IOMMUContext Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-10-27 17:39 ` David Gibson 2019-10-27 17:39 ` David Gibson 2019-11-06 11:18 ` Liu, Yi L 2019-11-06 11:18 ` Liu, Yi L 2019-10-24 12:34 ` [RFC v2 05/22] vfio/common: add iommu_ctx_notifier in container Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-11-01 14:58 ` Peter Xu 2019-11-01 14:58 ` Peter Xu 2019-11-06 11:08 ` Liu, Yi L 2019-10-24 12:34 ` [RFC v2 06/22] hw/pci: modify pci_setup_iommu() to set PCIIOMMUOps Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-10-27 17:43 ` David Gibson 2019-10-27 17:43 ` David Gibson 2019-11-06 8:18 ` Liu, Yi L 2019-11-06 8:18 ` Liu, Yi L 2019-11-01 18:09 ` Peter Xu 2019-11-01 18:09 ` Peter Xu 2019-11-06 8:15 ` Liu, Yi L 2019-11-06 8:15 ` Liu, Yi L 2019-10-24 12:34 ` [RFC v2 07/22] hw/pci: introduce pci_device_iommu_context() Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-10-29 11:50 ` David Gibson 2019-10-29 11:50 ` David Gibson 2019-11-06 8:20 ` Liu, Yi L 2019-11-06 8:20 ` Liu, Yi L 2019-11-01 18:09 ` Peter Xu 2019-11-01 18:09 ` Peter Xu 2019-11-06 8:14 ` Liu, Yi L 2019-11-06 8:14 ` Liu, Yi L 2019-10-24 12:34 ` [RFC v2 08/22] intel_iommu: provide get_iommu_context() callback Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-11-01 14:55 ` Peter Xu 2019-11-01 14:55 ` Peter Xu 2019-11-06 11:07 ` Liu, Yi L [this message] 2019-11-06 11:07 ` Liu, Yi L 2019-10-24 12:34 ` [RFC v2 09/22] vfio/pci: add iommu_context notifier for pasid alloc/free Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-10-29 12:15 ` David Gibson 2019-10-29 12:15 ` David Gibson 2019-11-01 17:26 ` Peter Xu 2019-11-01 17:26 ` Peter Xu 2019-11-06 12:46 ` Liu, Yi L 2019-11-06 12:46 ` Liu, Yi L 2019-11-06 12:14 ` Liu, Yi L 2019-11-06 12:14 ` Liu, Yi L 2019-11-20 4:27 ` David Gibson 2019-11-20 4:27 ` David Gibson 2019-11-26 7:07 ` Liu, Yi L 2019-11-26 7:07 ` Liu, Yi L 2019-10-24 12:34 ` [RFC v2 10/22] intel_iommu: add virtual command capability support Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-11-01 18:05 ` Peter Xu 2019-11-01 18:05 ` Peter Xu 2019-11-06 12:40 ` Liu, Yi L 2019-11-06 12:40 ` Liu, Yi L 2019-11-06 14:00 ` Peter Xu 2019-11-06 14:00 ` Peter Xu 2019-11-12 6:27 ` Liu, Yi L 2019-11-12 6:27 ` Liu, Yi L 2019-10-24 12:34 ` [RFC v2 11/22] intel_iommu: process pasid cache invalidation Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-11-02 16:05 ` Peter Xu 2019-11-02 16:05 ` Peter Xu 2019-11-06 5:55 ` Liu, Yi L 2019-11-06 5:55 ` Liu, Yi L 2019-10-24 12:34 ` [RFC v2 12/22] intel_iommu: add present bit check for pasid table entries Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-11-02 16:20 ` Peter Xu 2019-11-02 16:20 ` Peter Xu 2019-11-06 8:14 ` Liu, Yi L 2019-11-06 8:14 ` Liu, Yi L 2019-10-24 12:34 ` [RFC v2 13/22] intel_iommu: add PASID cache management infrastructure Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-11-04 17:08 ` Peter Xu 2019-11-04 17:08 ` Peter Xu 2019-11-04 20:06 ` Peter Xu 2019-11-04 20:06 ` Peter Xu 2019-11-06 7:56 ` Liu, Yi L 2019-11-06 7:56 ` Liu, Yi L 2019-11-07 15:46 ` Peter Xu 2019-11-07 15:46 ` Peter Xu 2019-10-24 12:34 ` [RFC v2 14/22] vfio/pci: add iommu_context notifier for pasid bind/unbind Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-11-04 16:02 ` David Gibson 2019-11-04 16:02 ` David Gibson 2019-11-06 12:22 ` Liu, Yi L 2019-11-06 12:22 ` Liu, Yi L 2019-11-06 14:25 ` Peter Xu 2019-11-06 14:25 ` Peter Xu 2019-10-24 12:34 ` [RFC v2 15/22] intel_iommu: bind/unbind guest page table to host Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-11-04 20:25 ` Peter Xu 2019-11-04 20:25 ` Peter Xu 2019-11-06 8:10 ` Liu, Yi L 2019-11-06 8:10 ` Liu, Yi L 2019-11-06 14:27 ` Peter Xu 2019-11-06 14:27 ` Peter Xu 2019-10-24 12:34 ` [RFC v2 16/22] intel_iommu: replay guest pasid bindings " Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-10-24 12:34 ` [RFC v2 17/22] intel_iommu: replay pasid binds after context cache invalidation Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-10-24 12:34 ` [RFC v2 18/22] intel_iommu: do not passdown pasid bind for PASID #0 Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-10-24 12:34 ` [RFC v2 19/22] vfio/pci: add iommu_context notifier for PASID-based iotlb flush Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-10-24 12:34 ` [RFC v2 20/22] intel_iommu: process PASID-based iotlb invalidation Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-10-24 12:34 ` [RFC v2 21/22] intel_iommu: propagate PASID-based iotlb invalidation to host Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-10-24 12:34 ` [RFC v2 22/22] intel_iommu: process PASID-based Device-TLB invalidation Liu Yi L 2019-10-24 12:34 ` Liu Yi L 2019-10-25 6:21 ` [RFC v2 00/22] intel_iommu: expose Shared Virtual Addressing to VM no-reply 2019-10-25 6:21 ` no-reply 2019-10-25 6:30 ` no-reply 2019-10-25 6:30 ` no-reply 2019-10-25 9:49 ` Jason Wang 2019-10-25 9:49 ` Jason Wang 2019-10-25 10:12 ` Tian, Kevin 2019-10-25 10:12 ` Tian, Kevin 2019-10-31 4:33 ` Jason Wang 2019-10-31 5:39 ` Tian, Kevin 2019-10-31 14:07 ` Liu, Yi L 2019-11-01 7:29 ` Jason Wang 2019-11-01 7:46 ` Tian, Kevin 2019-11-01 8:04 ` Jason Wang 2019-11-01 8:04 ` Jason Wang 2019-11-01 8:09 ` Jason Wang 2019-11-02 7:35 ` Tian, Kevin 2019-11-04 17:22 ` Peter Xu 2019-11-04 17:22 ` Peter Xu 2019-11-05 9:09 ` Liu, Yi L 2019-11-05 9:09 ` Liu, Yi L
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=A2975661238FB949B60364EF0F2C25743A0EF168@SHSMSX104.ccr.corp.intel.com \ --to=yi.l.liu@intel.com \ --cc=alex.williamson@redhat.com \ --cc=david@gibson.dropbear.id.au \ --cc=eric.auger@redhat.com \ --cc=jacob.jun.pan@linux.intel.com \ --cc=jun.j.tian@intel.com \ --cc=kevin.tian@intel.com \ --cc=kvm@vger.kernel.org \ --cc=mst@redhat.com \ --cc=pbonzini@redhat.com \ --cc=peterx@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=tianyu.lan@intel.com \ --cc=yi.y.sun@intel.com \ --cc=yi.y.sun@linux.intel.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: linkBe 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.