From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFLkV-0005DY-Th for qemu-devel@nongnu.org; Fri, 30 Aug 2013 06:16:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VFLkJ-0003VY-CK for qemu-devel@nongnu.org; Fri, 30 Aug 2013 06:16:15 -0400 Received: from e23smtp08.au.ibm.com ([202.81.31.141]:33233) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFLkI-0003UB-MU for qemu-devel@nongnu.org; Fri, 30 Aug 2013 06:16:03 -0400 Received: from /spool/local by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 30 Aug 2013 20:12:41 +1000 From: Alexey Kardashevskiy Date: Fri, 30 Aug 2013 20:15:30 +1000 Message-Id: <1377857738-14789-5-git-send-email-aik@ozlabs.ru> In-Reply-To: <1377857738-14789-1-git-send-email-aik@ozlabs.ru> References: <1377857738-14789-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH v4 04/12] spapr vfio: add vfio_container_spapr_get_info() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , Alexander Graf , Alex Williamson , qemu-ppc@nongnu.org, David Gibson As sPAPR platform supports DMA windows on a PCI bus, the information about their location and size should be passed into the guest via the device tree. The patch adds a helper to read this info from the container fd. Signed-off-by: Alexey Kardashevskiy --- Changes: v4: * fixed possible leaks on error paths --- hw/misc/vfio.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/hw/misc/vfio.h | 11 +++++++++++ 2 files changed, 56 insertions(+) create mode 100644 include/hw/misc/vfio.h diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index 53791fb..4210471 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -39,6 +39,7 @@ #include "qemu/range.h" #include "sysemu/kvm.h" #include "sysemu/sysemu.h" +#include "hw/misc/vfio.h" /* #define DEBUG_VFIO */ #ifdef DEBUG_VFIO @@ -3490,3 +3491,47 @@ static void register_vfio_pci_dev_type(void) } type_init(register_vfio_pci_dev_type) + +int vfio_container_spapr_get_info(AddressSpace *as, int32_t groupid, + struct vfio_iommu_spapr_tce_info *info, + int *group_fd) +{ + VFIOAddressSpace *space; + VFIOGroup *group; + VFIOContainer *container; + int ret, fd; + + space = vfio_get_address_space(as); + if (!space) { + return -1; + } + group = vfio_get_group(groupid, space); + if (!group) { + goto put_as_exit; + } + container = group->container; + if (!group->container) { + goto put_group_exit; + } + fd = container->fd; + if (!ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_SPAPR_TCE_IOMMU)) { + goto put_group_exit; + } + ret = ioctl(fd, VFIO_IOMMU_SPAPR_TCE_GET_INFO, info); + if (ret) { + error_report("vfio: failed to get iommu info for container: %s", + strerror(errno)); + goto put_group_exit; + } + *group_fd = group->fd; + + return 0; + +put_group_exit: + vfio_put_group(group); + +put_as_exit: + vfio_put_address_space(space); + + return -1; +} diff --git a/include/hw/misc/vfio.h b/include/hw/misc/vfio.h new file mode 100644 index 0000000..ac9a971 --- /dev/null +++ b/include/hw/misc/vfio.h @@ -0,0 +1,11 @@ +#ifndef VFIO_API_H +#define VFIO_API_H + +#include "qemu/typedefs.h" +#include + +extern int vfio_container_spapr_get_info(AddressSpace *as, int32_t groupid, + struct vfio_iommu_spapr_tce_info *info, + int *group_fd); + +#endif -- 1.8.4.rc4