From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNc65-0002zk-Fe for qemu-devel@nongnu.org; Wed, 12 Mar 2014 01:53:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNc5t-0005Jc-9c for qemu-devel@nongnu.org; Wed, 12 Mar 2014 01:52:57 -0400 Received: from e23smtp02.au.ibm.com ([202.81.31.144]:38662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNc5s-0005HY-CI for qemu-devel@nongnu.org; Wed, 12 Mar 2014 01:52:45 -0400 Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 12 Mar 2014 15:52:39 +1000 From: Alexey Kardashevskiy Date: Wed, 12 Mar 2014 16:52:28 +1100 Message-Id: <1394603550-11556-10-git-send-email-aik@ozlabs.ru> In-Reply-To: <1394603550-11556-1-git-send-email-aik@ozlabs.ru> References: <1394603550-11556-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH v5 09/11] spapr vfio: add vfio_container_spapr_get_info() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex Williamson Cc: Alexey Kardashevskiy , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Alexander Graf 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: v6: * added dup() to protect group_fd from accidental disposal v5: * reworked to reflect change in vfio_get_group() from one of previous patches change v4: * fixed possible leaks on error paths --- hw/misc/vfio.c | 36 ++++++++++++++++++++++++++++++++++++ include/hw/misc/vfio.h | 11 +++++++++++ 2 files changed, 47 insertions(+) create mode 100644 include/hw/misc/vfio.h diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index 4f6f5da..6dee090 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 @@ -4163,3 +4164,38 @@ static void register_vfio_pci_dev_type(void) } type_init(register_vfio_pci_dev_type) + +int vfio_container_spapr_get_info(AddressSpace *as, uint64_t liobn, + int32_t groupid, + struct vfio_iommu_spapr_tce_info *info) +{ + VFIOGroup *group; + VFIOContainer *container; + int ret, fd; + + group = vfio_get_group(groupid, as); + if (!group) { + return -1; + } + 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; + } + + return 0; + +put_group_exit: + vfio_put_group(group); + + return -1; +} diff --git a/include/hw/misc/vfio.h b/include/hw/misc/vfio.h new file mode 100644 index 0000000..ec59989 --- /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, uint64_t liobn, + int32_t groupid, + struct vfio_iommu_spapr_tce_info *info); + +#endif -- 1.8.4.rc4