Re: [Qemu-devel] [RFC v2 1/6] hw/vfio: Retrieve valid iova ranges from kernel

2018-05-30 Thread Shameerali Kolothum Thodi 
Hi Eric,

> -Original Message-
> From: Auger Eric [mailto:eric.au...@redhat.com]
> Sent: Monday, May 28, 2018 3:21 PM
> To: Shameerali Kolothum Thodi ;
> qemu-devel@nongnu.org; qemu-...@nongnu.org
> Cc: peter.mayd...@linaro.org; drjo...@redhat.com; Jonathan Cameron
> ; Linuxarm ;
> alex.william...@redhat.com; Zhaoshenglong ;
> imamm...@redhat.com
> Subject: Re: [Qemu-devel] [RFC v2 1/6] hw/vfio: Retrieve valid iova ranges
> from kernel
> 
> Hi Shameer,
> On 05/16/2018 05:20 PM, Shameer Kolothum wrote:
> > This makes use of the newly introduced iova cap chains added
> > to the  type1 VFIO_IOMMU_GET_INFO ioctl.
> >
> > The retrieved iova info is stored in a list for later use.
> >
> > Signed-off-by: Shameer Kolothum 
> > ---
> >  hw/vfio/common.c  | 108
> +++---
> >  include/hw/vfio/vfio-common.h |   7 +++
> >  linux-headers/linux/vfio.h|  23 +
> >  3 files changed, 132 insertions(+), 6 deletions(-)
> >
> > diff --git a/hw/vfio/common.c b/hw/vfio/common.c
> > index 07ffa0b..94d7b24 100644
> > --- a/hw/vfio/common.c
> > +++ b/hw/vfio/common.c
> > @@ -40,6 +40,8 @@ struct vfio_group_head vfio_group_list =
> >  QLIST_HEAD_INITIALIZER(vfio_group_list);
> >  struct vfio_as_head vfio_address_spaces =
> >  QLIST_HEAD_INITIALIZER(vfio_address_spaces);
> > +struct vfio_iova_head vfio_iova_regions =
> > +QLIST_HEAD_INITIALIZER(vfio_iova_regions);
> >
> >  #ifdef CONFIG_KVM
> >  /*
> > @@ -1030,6 +1032,85 @@ static void
> vfio_put_address_space(VFIOAddressSpace *space)
> >  }
> >  }
> >
> > +static void vfio_iommu_get_iova_ranges(struct vfio_iommu_type1_info
> *info)
> > +{
> > +struct vfio_info_cap_header *hdr;
> > +struct vfio_iommu_type1_info_cap_iova_range *cap_iova;
> > +VFIOIovaRange *iova, *tmp, *prev = NULL;
> nit: s/iova/iova_range?

Ok.

> > +void *ptr = info;
> > +bool found = false;
> > +int i;
> > +
> > +if (!(info->flags & VFIO_IOMMU_INFO_CAPS)) {
> > +return;
> > +}
> > +
> > +for (hdr = ptr + info->cap_offset; hdr != ptr; hdr = ptr + hdr->next) {
> > +if (hdr->id == VFIO_IOMMU_TYPE1_INFO_CAP_IOVA_RANGE) {
> > +found = true;
> > +break;
> > +}
> > +}
> > +
> > +if (!found) {
> > +return;
> > +}
> > +
> > +/* purge the current iova list, if any */
> > +QLIST_FOREACH_SAFE(iova, _iova_regions, next, tmp) {
> > +QLIST_REMOVE(iova, next);
> > +g_free(iova);
> > +}
> > +
> > +cap_iova = container_of(hdr, struct
> vfio_iommu_type1_info_cap_iova_range,
> > +header);
> > +
> > +/* populate the list */
> > +for (i = 0; i < cap_iova->nr_iovas; i++) {
> > +iova = g_malloc0(sizeof(*iova));
> nit: g_new0 is preferred

Sure.

> > +iova->start = cap_iova->iova_ranges[i].start;
> > +iova->end = cap_iova->iova_ranges[i].end;
> > +
> > +if (prev) {
> > +QLIST_INSERT_AFTER(prev, iova, next);
> > +} else {
> > +QLIST_INSERT_HEAD(_iova_regions, iova, next);
> > +}
> > +prev = iova;
> > +}
> > +
> > +return;
> > +}
> > +
> > +static int vfio_get_iommu_info(VFIOContainer *container,
> > + struct vfio_iommu_type1_info **info)
> > +{
> > +
> > +size_t argsz = sizeof(struct vfio_iommu_type1_info);
> > +
> > +
> > +*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;
> > +}
> > +
> > +vfio_iommu_get_iova_ranges(*info);
> > +
> > +return 0;
> > +}
> > +
> >  static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
> >Error **errp)
> >  {
> > @@ -1044,6 +1125,15 @@ static int vfio_connect_container(VFIOGroup
> *group, AddressSpace *as,
> >  group->container = container;

Re: [Qemu-devel] [RFC v2 1/6] hw/vfio: Retrieve valid iova ranges from kernel

2018-05-28 Thread Auger Eric 
Hi Shameer,
On 05/16/2018 05:20 PM, Shameer Kolothum wrote:
> This makes use of the newly introduced iova cap chains added
> to the  type1 VFIO_IOMMU_GET_INFO ioctl.
> 
> The retrieved iova info is stored in a list for later use.
> 
> Signed-off-by: Shameer Kolothum 
> ---
>  hw/vfio/common.c  | 108 
> +++---
>  include/hw/vfio/vfio-common.h |   7 +++
>  linux-headers/linux/vfio.h|  23 +
>  3 files changed, 132 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/vfio/common.c b/hw/vfio/common.c
> index 07ffa0b..94d7b24 100644
> --- a/hw/vfio/common.c
> +++ b/hw/vfio/common.c
> @@ -40,6 +40,8 @@ struct vfio_group_head vfio_group_list =
>  QLIST_HEAD_INITIALIZER(vfio_group_list);
>  struct vfio_as_head vfio_address_spaces =
>  QLIST_HEAD_INITIALIZER(vfio_address_spaces);
> +struct vfio_iova_head vfio_iova_regions =
> +QLIST_HEAD_INITIALIZER(vfio_iova_regions);
>  
>  #ifdef CONFIG_KVM
>  /*
> @@ -1030,6 +1032,85 @@ static void vfio_put_address_space(VFIOAddressSpace 
> *space)
>  }
>  }
>  
> +static void vfio_iommu_get_iova_ranges(struct vfio_iommu_type1_info *info)
> +{
> +struct vfio_info_cap_header *hdr;
> +struct vfio_iommu_type1_info_cap_iova_range *cap_iova;
> +VFIOIovaRange *iova, *tmp, *prev = NULL;
nit: s/iova/iova_range?
> +void *ptr = info;
> +bool found = false;
> +int i;
> +
> +if (!(info->flags & VFIO_IOMMU_INFO_CAPS)) {
> +return;
> +}
> +
> +for (hdr = ptr + info->cap_offset; hdr != ptr; hdr = ptr + hdr->next) {
> +if (hdr->id == VFIO_IOMMU_TYPE1_INFO_CAP_IOVA_RANGE) {
> +found = true;
> +break;
> +}
> +}
> +
> +if (!found) {
> +return;
> +}
> +
> +/* purge the current iova list, if any */
> +QLIST_FOREACH_SAFE(iova, _iova_regions, next, tmp) {
> +QLIST_REMOVE(iova, next);
> +g_free(iova);
> +}
> +
> +cap_iova = container_of(hdr, struct vfio_iommu_type1_info_cap_iova_range,
> +header);
> +
> +/* populate the list */
> +for (i = 0; i < cap_iova->nr_iovas; i++) {
> +iova = g_malloc0(sizeof(*iova));
nit: g_new0 is preferred
> +iova->start = cap_iova->iova_ranges[i].start;
> +iova->end = cap_iova->iova_ranges[i].end;
> +
> +if (prev) {
> +QLIST_INSERT_AFTER(prev, iova, next);
> +} else {
> +QLIST_INSERT_HEAD(_iova_regions, iova, next);
> +}
> +prev = iova;
> +}
> +
> +return;
> +}
> +
> +static int vfio_get_iommu_info(VFIOContainer *container,
> + struct vfio_iommu_type1_info **info)
> +{
> +
> +size_t argsz = sizeof(struct vfio_iommu_type1_info);
> +
> +
> +*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;
> +}
> +
> +vfio_iommu_get_iova_ranges(*info);
> +
> +return 0;
> +}
> +
>  static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
>Error **errp)
>  {
> @@ -1044,6 +1125,15 @@ static int vfio_connect_container(VFIOGroup *group, 
> AddressSpace *as,
>  group->container = container;
>  QLIST_INSERT_HEAD(>group_list, group, container_next);
>  vfio_kvm_device_add_group(group);
> +
> +/* New group might change the valid iovas. Get the updated list 
> */
> +if ((container->iommu_type == VFIO_TYPE1_IOMMU) ||
> +(container->iommu_type == VFIO_TYPE1v2_IOMMU)) {
> +struct vfio_iommu_type1_info *info;
> +
> +vfio_get_iommu_info(container, );
> +g_free(info);
> +}
>  return 0;
>  }
>  }
> @@ -1071,7 +1161,7 @@ static int vfio_connect_container(VFIOGroup *group, 
> AddressSpace *as,
>  if (ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_TYPE1_IOMMU) ||
>  ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_TYPE1v2_IOMMU)) {
>  bool v2 = !!ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_TYPE1v2_IOMMU);
> -struct vfio_iommu_type1_info info;
> +struct vfio_iommu_type1_info *info;
>  
>  ret = ioctl(group->fd, VFIO_GROUP_SET_CONTAINER, );
>  if (ret) {
> @@ -1095,14 +1185,14 @@ static int vfio_connect_container(VFIOGroup *group, 
> AddressSpace *as,
>   * existing Type1 IOMMUs generally support any IOVA we're
>   * going to actually try in practice.
>   */
> -info.argsz = sizeof(info);
> -ret = ioctl(fd, VFIO_IOMMU_GET_INFO, );
> +ret = vfio_get_iommu_info(container, );
>  /* Ignore errors */
> -if

[Qemu-devel] [RFC v2 1/6] hw/vfio: Retrieve valid iova ranges from kernel

2018-05-16 Thread Shameer Kolothum 
This makes use of the newly introduced iova cap chains added
to the  type1 VFIO_IOMMU_GET_INFO ioctl.

The retrieved iova info is stored in a list for later use.

Signed-off-by: Shameer Kolothum 
---
 hw/vfio/common.c  | 108 +++---
 include/hw/vfio/vfio-common.h |   7 +++
 linux-headers/linux/vfio.h|  23 +
 3 files changed, 132 insertions(+), 6 deletions(-)

diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 07ffa0b..94d7b24 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -40,6 +40,8 @@ struct vfio_group_head vfio_group_list =
 QLIST_HEAD_INITIALIZER(vfio_group_list);
 struct vfio_as_head vfio_address_spaces =
 QLIST_HEAD_INITIALIZER(vfio_address_spaces);
+struct vfio_iova_head vfio_iova_regions =
+QLIST_HEAD_INITIALIZER(vfio_iova_regions);
 
 #ifdef CONFIG_KVM
 /*
@@ -1030,6 +1032,85 @@ static void vfio_put_address_space(VFIOAddressSpace 
*space)
 }
 }
 
+static void vfio_iommu_get_iova_ranges(struct vfio_iommu_type1_info *info)
+{
+struct vfio_info_cap_header *hdr;
+struct vfio_iommu_type1_info_cap_iova_range *cap_iova;
+VFIOIovaRange *iova, *tmp, *prev = NULL;
+void *ptr = info;
+bool found = false;
+int i;
+
+if (!(info->flags & VFIO_IOMMU_INFO_CAPS)) {
+return;
+}
+
+for (hdr = ptr + info->cap_offset; hdr != ptr; hdr = ptr + hdr->next) {
+if (hdr->id == VFIO_IOMMU_TYPE1_INFO_CAP_IOVA_RANGE) {
+found = true;
+break;
+}
+}
+
+if (!found) {
+return;
+}
+
+/* purge the current iova list, if any */
+QLIST_FOREACH_SAFE(iova, _iova_regions, next, tmp) {
+QLIST_REMOVE(iova, next);
+g_free(iova);
+}
+
+cap_iova = container_of(hdr, struct vfio_iommu_type1_info_cap_iova_range,
+header);
+
+/* populate the list */
+for (i = 0; i < cap_iova->nr_iovas; i++) {
+iova = g_malloc0(sizeof(*iova));
+iova->start = cap_iova->iova_ranges[i].start;
+iova->end = cap_iova->iova_ranges[i].end;
+
+if (prev) {
+QLIST_INSERT_AFTER(prev, iova, next);
+} else {
+QLIST_INSERT_HEAD(_iova_regions, iova, next);
+}
+prev = iova;
+}
+
+return;
+}
+
+static int vfio_get_iommu_info(VFIOContainer *container,
+ struct vfio_iommu_type1_info **info)
+{
+
+size_t argsz = sizeof(struct vfio_iommu_type1_info);
+
+
+*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;
+}
+
+vfio_iommu_get_iova_ranges(*info);
+
+return 0;
+}
+
 static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
   Error **errp)
 {
@@ -1044,6 +1125,15 @@ static int vfio_connect_container(VFIOGroup *group, 
AddressSpace *as,
 group->container = container;
 QLIST_INSERT_HEAD(>group_list, group, container_next);
 vfio_kvm_device_add_group(group);
+
+/* New group might change the valid iovas. Get the updated list */
+if ((container->iommu_type == VFIO_TYPE1_IOMMU) ||
+(container->iommu_type == VFIO_TYPE1v2_IOMMU)) {
+struct vfio_iommu_type1_info *info;
+
+vfio_get_iommu_info(container, );
+g_free(info);
+}
 return 0;
 }
 }
@@ -1071,7 +1161,7 @@ static int vfio_connect_container(VFIOGroup *group, 
AddressSpace *as,
 if (ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_TYPE1_IOMMU) ||
 ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_TYPE1v2_IOMMU)) {
 bool v2 = !!ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_TYPE1v2_IOMMU);
-struct vfio_iommu_type1_info info;
+struct vfio_iommu_type1_info *info;
 
 ret = ioctl(group->fd, VFIO_GROUP_SET_CONTAINER, );
 if (ret) {
@@ -1095,14 +1185,14 @@ static int vfio_connect_container(VFIOGroup *group, 
AddressSpace *as,
  * existing Type1 IOMMUs generally support any IOVA we're
  * going to actually try in practice.
  */
-info.argsz = sizeof(info);
-ret = ioctl(fd, VFIO_IOMMU_GET_INFO, );
+ret = vfio_get_iommu_info(container, );
 /* Ignore errors */
-if (ret || !(info.flags & VFIO_IOMMU_INFO_PGSIZES)) {
+if (ret || !(info->flags & VFIO_IOMMU_INFO_PGSIZES)) {
 /* Assume 4k IOVA page size */
-info.iova_pgsizes = 4096;
+info->iova_pgsizes = 4096;
 }
-vfio_host_win_add(container, 0, (hwaddr)-1, info.iova_pgsizes);
+vfio_host_win_add(container, 0, (hwaddr)-1, info->iova_pgsizes);
+