From: "Liu, Yi L" <yi.l.liu@intel.com>
To: Peter Xu <peterx@redhat.com>
Cc: "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>,
"david@gibson.dropbear.id.au" <david@gibson.dropbear.id.au>,
"pbonzini@redhat.com" <pbonzini@redhat.com>,
"alex.williamson@redhat.com" <alex.williamson@redhat.com>,
"mst@redhat.com" <mst@redhat.com>,
"eric.auger@redhat.com" <eric.auger@redhat.com>,
"Tian, Kevin" <kevin.tian@intel.com>,
"Tian, Jun J" <jun.j.tian@intel.com>,
"Sun, Yi Y" <yi.y.sun@intel.com>,
"kvm@vger.kernel.org" <kvm@vger.kernel.org>,
"Wu, Hao" <hao.wu@intel.com>,
Jacob Pan <jacob.jun.pan@linux.intel.com>,
Yi Sun <yi.y.sun@linux.intel.com>
Subject: RE: [RFC v3 11/25] vfio: get stage-1 pasid formats from Kernel
Date: Wed, 12 Feb 2020 07:19:29 +0000 [thread overview]
Message-ID: <A2975661238FB949B60364EF0F2C25743A1BA521@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <20200211193022.GI984290@xz-x1>
> From: Peter Xu <peterx@redhat.com>
> Sent: Wednesday, February 12, 2020 3:30 AM
> To: Liu, Yi L <yi.l.liu@intel.com>
> Subject: Re: [RFC v3 11/25] vfio: get stage-1 pasid formats from Kernel
>
> On Wed, Jan 29, 2020 at 04:16:42AM -0800, Liu, Yi L wrote:
> > From: Liu Yi L <yi.l.liu@intel.com>
> >
> > VFIO checks IOMMU UAPI version when it finds Kernel supports
> > VFIO_TYPE1_NESTING_IOMMU. It is enough for UAPI compatibility check.
> > However, IOMMU UAPI may support multiple stage-1 pasid formats in a
> > specific UAPI version, which is highly possible since IOMMU UAPI
> > supports stage-1 formats across all IOMMU vendors.
> > So VFIO needs to get the supported formats from Kernel and tell
> > vIOMMU. Let vIOMMU select proper format when setup dual stage DMA
> > translation.
> >
> > This patch gets the stage-1 pasid format from kernel by using IOCTL
> > VFIO_IOMMU_GET_INFO and pass the supported format to vIOMMU by the
> > DualStageIOMMUObject instance which has been registered to vIOMMU.
> >
> > This patch referred some code from Shameer Kolothum.
> > https://lists.gnu.org/archive/html/qemu-devel/2018-05/msg03759.html
> >
> > Cc: Kevin Tian <kevin.tian@intel.com>
> > Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
> > Cc: Peter Xu <peterx@redhat.com>
> > Cc: Eric Auger <eric.auger@redhat.com>
> > Cc: Yi Sun <yi.y.sun@linux.intel.com>
> > Cc: David Gibson <david@gibson.dropbear.id.au>
> > Cc: Alex Williamson <alex.williamson@redhat.com>
> > Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> > Signed-off-by: Liu Yi L <yi.l.liu@intel.com>
> > ---
> > hw/iommu/dual_stage_iommu.c | 5 ++-
> > hw/vfio/common.c | 85
> ++++++++++++++++++++++++++++++++++++-
> > include/hw/iommu/dual_stage_iommu.h | 10 ++++-
> > 3 files changed, 97 insertions(+), 3 deletions(-)
> >
> > diff --git a/hw/iommu/dual_stage_iommu.c
> b/hw/iommu/dual_stage_iommu.c
> > index be4179d..d5a7168 100644
> > --- a/hw/iommu/dual_stage_iommu.c
> > +++ b/hw/iommu/dual_stage_iommu.c
> > @@ -48,9 +48,12 @@ int ds_iommu_pasid_free(DualStageIOMMUObject
> > *dsi_obj, uint32_t pasid) }
> >
> > void ds_iommu_object_init(DualStageIOMMUObject *dsi_obj,
> > - DualStageIOMMUOps *ops)
> > + DualStageIOMMUOps *ops,
> > + DualStageIOMMUInfo *uinfo)
> > {
> > dsi_obj->ops = ops;
> > +
> > + dsi_obj->uinfo.pasid_format = uinfo->pasid_format;
> > }
> >
> > void ds_iommu_object_destroy(DualStageIOMMUObject *dsi_obj) diff
> > --git a/hw/vfio/common.c b/hw/vfio/common.c index fc1723d..a07824b
> > 100644
> > --- a/hw/vfio/common.c
> > +++ b/hw/vfio/common.c
> > @@ -1182,10 +1182,84 @@ static int vfio_get_iommu_type(VFIOContainer
> > *container, static struct DualStageIOMMUOps vfio_ds_iommu_ops = { };
> >
> > +static int vfio_get_iommu_info(VFIOContainer *container,
> > + struct vfio_iommu_type1_info **info)
>
> Better comment on the function to remember to free(*info) after use for the
> callers.
Will do. 😊
>
> > +{
> > +
> > + size_t argsz = sizeof(struct vfio_iommu_type1_info);
> > +
>
> Nit: extra newline.
accepted. 😊
> > +
> > + *info = g_malloc0(argsz);
> > +
> > +retry:
> > + (*info)->argsz = argsz;
> > +
> > + if (ioctl(container->fd, VFIO_IOMMU_GET_INFO, *info)) {
> > + g_free(*info);
> > + *info = NULL;
> > + return -errno;
> > + }
> > +
> > + if (((*info)->argsz > argsz)) {
> > + argsz = (*info)->argsz;
> > + *info = g_realloc(*info, argsz);
> > + goto retry;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static struct vfio_info_cap_header *
> > +vfio_get_iommu_info_cap(struct vfio_iommu_type1_info *info, uint16_t
> > +id) {
> > + struct vfio_info_cap_header *hdr;
> > + void *ptr = info;
> > +
> > + if (!(info->flags & VFIO_IOMMU_INFO_CAPS)) {
> > + return NULL;
> > + }
> > +
> > + for (hdr = ptr + info->cap_offset; hdr != ptr; hdr = ptr + hdr->next) {
> > + if (hdr->id == id) {
> > + return hdr;
> > + }
> > + }
> > +
> > + return NULL;
> > +}
> > +
> > +static int vfio_get_nesting_iommu_format(VFIOContainer *container,
> > + uint32_t *pasid_format) {
> > + struct vfio_iommu_type1_info *info;
> > + struct vfio_info_cap_header *hdr;
> > + struct vfio_iommu_type1_info_cap_nesting *cap;
> > +
> > + if (vfio_get_iommu_info(container, &info)) {
> > + return -errno;
>
> Should return the retcode from vfio_get_iommu_info.
yes , it is. thx for catching it.
> > + }
> > +
> > + hdr = vfio_get_iommu_info_cap(info,
> > + VFIO_IOMMU_TYPE1_INFO_CAP_NESTING);
> > + if (!hdr) {
> > + g_free(info);
> > + return -errno;
> > + }
> > +
> > + cap = container_of(hdr,
> > + struct vfio_iommu_type1_info_cap_nesting, header);
> > + *pasid_format = cap->pasid_format;
> > +
> > + g_free(info);
> > + return 0;
> > +}
> > +
> > static int vfio_init_container(VFIOContainer *container, int group_fd,
> > Error **errp) {
> > int iommu_type, ret;
> > + uint32_t format;
> > + DualStageIOMMUInfo uinfo;
> >
> > iommu_type = vfio_get_iommu_type(container, errp);
> > if (iommu_type < 0) {
> > @@ -1214,7 +1288,16 @@ static int vfio_init_container(VFIOContainer
> *container, int group_fd,
> > }
> >
> > if (iommu_type == VFIO_TYPE1_NESTING_IOMMU) {
> > - ds_iommu_object_init(&container->dsi_obj, &vfio_ds_iommu_ops);
> > + if (vfio_get_nesting_iommu_format(container, &format)) {
> > + error_setg_errno(errp, errno,
> > + "Failed to get nesting iommu format");
> > + return -errno;
>
> Same here, you might want to return the retcode from
> vfio_get_nesting_iommu_format()?
will do it. 😊
Thanks for your comments, I'll address them in next version.
Regards,
Yi Liu
next prev parent reply other threads:[~2020-02-12 7:19 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-29 12:16 [RFC v3 00/25] intel_iommu: expose Shared Virtual Addressing to VMs Liu, Yi L
2020-01-29 12:16 ` [RFC v3 01/25] hw/pci: modify pci_setup_iommu() to set PCIIOMMUOps Liu, Yi L
2020-01-29 12:16 ` [RFC v3 02/25] hw/iommu: introduce DualStageIOMMUObject Liu, Yi L
2020-01-31 3:59 ` David Gibson
2020-01-31 11:42 ` Liu, Yi L
2020-02-12 6:32 ` David Gibson
2020-01-29 12:16 ` [RFC v3 03/25] hw/iommu: introduce IOMMUContext Liu, Yi L
2020-01-31 4:06 ` David Gibson
2020-01-31 11:42 ` Liu, Yi L
2020-02-11 16:58 ` Peter Xu
2020-02-12 7:15 ` Liu, Yi L
2020-02-12 15:59 ` Peter Xu
2020-02-13 2:46 ` Liu, Yi L
2020-02-14 5:36 ` David Gibson
2020-02-15 6:25 ` Liu, Yi L
2020-01-29 12:16 ` [RFC v3 04/25] hw/pci: introduce pci_device_iommu_context() Liu, Yi L
2020-01-29 12:16 ` [RFC v3 05/25] intel_iommu: provide get_iommu_context() callback Liu, Yi L
2020-01-29 12:16 ` [RFC v3 06/25] scripts/update-linux-headers: Import iommu.h Liu, Yi L
2020-01-29 12:25 ` Cornelia Huck
2020-01-31 11:40 ` Liu, Yi L
2020-01-29 12:16 ` [RFC v3 07/25] header file update VFIO/IOMMU vSVA APIs Liu, Yi L
2020-01-29 12:28 ` Cornelia Huck
2020-01-31 11:41 ` Liu, Yi L
2020-01-29 12:16 ` [RFC v3 08/25] vfio: pass IOMMUContext into vfio_get_group() Liu, Yi L
2020-01-29 12:16 ` [RFC v3 09/25] vfio: check VFIO_TYPE1_NESTING_IOMMU support Liu, Yi L
2020-02-11 19:08 ` Peter Xu
2020-02-12 7:16 ` Liu, Yi L
2020-01-29 12:16 ` [RFC v3 10/25] vfio: register DualStageIOMMUObject to vIOMMU Liu, Yi L
2020-01-29 12:16 ` [RFC v3 11/25] vfio: get stage-1 pasid formats from Kernel Liu, Yi L
2020-02-11 19:30 ` Peter Xu
2020-02-12 7:19 ` Liu, Yi L [this message]
2020-01-29 12:16 ` [RFC v3 12/25] vfio/common: add pasid_alloc/free support Liu, Yi L
2020-02-11 19:31 ` Peter Xu
2020-02-12 7:20 ` Liu, Yi L
2020-01-29 12:16 ` [RFC v3 13/25] intel_iommu: modify x-scalable-mode to be string option Liu, Yi L
2020-02-11 19:43 ` Peter Xu
2020-02-12 7:28 ` Liu, Yi L
2020-02-12 16:05 ` Peter Xu
2020-02-13 2:44 ` Liu, Yi L
2020-01-29 12:16 ` [RFC v3 14/25] intel_iommu: add virtual command capability support Liu, Yi L
2020-02-11 20:16 ` Peter Xu
2020-02-12 7:32 ` Liu, Yi L
2020-02-11 21:56 ` Peter Xu
2020-02-13 2:40 ` Liu, Yi L
2020-02-13 14:31 ` Peter Xu
2020-02-13 15:08 ` Peter Xu
2020-02-15 8:49 ` Liu, Yi L
2020-01-29 12:16 ` [RFC v3 15/25] intel_iommu: process pasid cache invalidation Liu, Yi L
2020-02-11 20:17 ` Peter Xu
2020-02-12 7:33 ` Liu, Yi L
2020-01-29 12:16 ` [RFC v3 16/25] intel_iommu: add PASID cache management infrastructure Liu, Yi L
2020-02-11 23:35 ` Peter Xu
2020-02-12 8:37 ` Liu, Yi L
2020-02-12 15:26 ` Peter Xu
2020-02-13 2:59 ` Liu, Yi L
2020-02-13 15:14 ` Peter Xu
2020-02-15 8:50 ` Liu, Yi L
2020-01-29 12:16 ` [RFC v3 17/25] vfio: add bind stage-1 page table support Liu, Yi L
2020-01-29 12:16 ` [RFC v3 18/25] intel_iommu: bind/unbind guest page table to host Liu, Yi L
2020-01-29 12:16 ` [RFC v3 19/25] intel_iommu: replay guest pasid bindings " Liu, Yi L
2020-01-29 12:16 ` [RFC v3 20/25] intel_iommu: replay pasid binds after context cache invalidation Liu, Yi L
2020-01-29 12:16 ` [RFC v3 21/25] intel_iommu: do not pass down pasid bind for PASID #0 Liu, Yi L
2020-01-29 12:16 ` [RFC v3 22/25] vfio: add support for flush iommu stage-1 cache Liu, Yi L
2020-01-29 12:16 ` [RFC v3 23/25] intel_iommu: process PASID-based iotlb invalidation Liu, Yi L
2020-01-29 12:16 ` [RFC v3 24/25] intel_iommu: propagate PASID-based iotlb invalidation to host Liu, Yi L
2020-01-29 12:16 ` [RFC v3 25/25] intel_iommu: process PASID-based Device-TLB invalidation Liu, Yi L
2020-01-29 13:44 ` [RFC v3 00/25] intel_iommu: expose Shared Virtual Addressing to VMs no-reply
2020-01-29 13:48 ` no-reply
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=A2975661238FB949B60364EF0F2C25743A1BA521@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=hao.wu@intel.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=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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).