[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 23/32] s390x/pci: Add routine to get the vfio dma available cou
From: |
Alex Williamson |
Subject: |
[PULL v2 23/32] s390x/pci: Add routine to get the vfio dma available count |
Date: |
Wed, 28 Oct 2020 10:42:50 -0600 |
User-agent: |
StGit/0.21-dirty |
From: Matthew Rosato <mjrosato@linux.ibm.com>
Create new files for separating out vfio-specific work for s390
pci. Add the first such routine, which issues VFIO_IOMMU_GET_INFO
ioctl to collect the current dma available count.
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
hw/s390x/meson.build | 1 +
hw/s390x/s390-pci-vfio.c | 54 ++++++++++++++++++++++++++++++++++++++
include/hw/s390x/s390-pci-vfio.h | 17 ++++++++++++
3 files changed, 72 insertions(+)
create mode 100644 hw/s390x/s390-pci-vfio.c
create mode 100644 include/hw/s390x/s390-pci-vfio.h
diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build
index 948ceae7a7b3..3ee4594760ac 100644
--- a/hw/s390x/meson.build
+++ b/hw/s390x/meson.build
@@ -10,6 +10,7 @@ s390x_ss.add(files(
's390-ccw.c',
's390-pci-bus.c',
's390-pci-inst.c',
+ 's390-pci-vfio.c',
's390-skeys.c',
's390-stattrib.c',
's390-virtio-hcall.c',
diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c
new file mode 100644
index 000000000000..cb3f4d98adf8
--- /dev/null
+++ b/hw/s390x/s390-pci-vfio.c
@@ -0,0 +1,54 @@
+/*
+ * s390 vfio-pci interfaces
+ *
+ * Copyright 2020 IBM Corp.
+ * Author(s): Matthew Rosato <mjrosato@linux.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or (at
+ * your option) any later version. See the COPYING file in the top-level
+ * directory.
+ */
+
+#include <sys/ioctl.h>
+
+#include "qemu/osdep.h"
+#include "hw/s390x/s390-pci-vfio.h"
+#include "hw/vfio/vfio-common.h"
+
+/*
+ * Get the current DMA available count from vfio. Returns true if vfio is
+ * limiting DMA requests, false otherwise. The current available count read
+ * from vfio is returned in avail.
+ */
+bool s390_pci_update_dma_avail(int fd, unsigned int *avail)
+{
+ g_autofree struct vfio_iommu_type1_info *info;
+ uint32_t argsz;
+
+ assert(avail);
+
+ argsz = sizeof(struct vfio_iommu_type1_info);
+ info = g_malloc0(argsz);
+
+ /*
+ * If the specified argsz is not large enough to contain all capabilities
+ * it will be updated upon return from the ioctl. Retry until we have
+ * a big enough buffer to hold the entire capability chain.
+ */
+retry:
+ info->argsz = argsz;
+
+ if (ioctl(fd, VFIO_IOMMU_GET_INFO, info)) {
+ return false;
+ }
+
+ if (info->argsz > argsz) {
+ argsz = info->argsz;
+ info = g_realloc(info, argsz);
+ goto retry;
+ }
+
+ /* If the capability exists, update with the current value */
+ return vfio_get_info_dma_avail(info, avail);
+}
+
diff --git a/include/hw/s390x/s390-pci-vfio.h b/include/hw/s390x/s390-pci-vfio.h
new file mode 100644
index 000000000000..2a5a261cc9b1
--- /dev/null
+++ b/include/hw/s390x/s390-pci-vfio.h
@@ -0,0 +1,17 @@
+/*
+ * s390 vfio-pci interfaces
+ *
+ * Copyright 2020 IBM Corp.
+ * Author(s): Matthew Rosato <mjrosato@linux.ibm.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or (at
+ * your option) any later version. See the COPYING file in the top-level
+ * directory.
+ */
+
+#ifndef HW_S390_PCI_VFIO_H
+#define HW_S390_PCI_VFIO_H
+
+bool s390_pci_update_dma_avail(int fd, unsigned int *avail);
+
+#endif
- [PULL v2 13/32] vfio: Add vfio_listener_log_sync to mark dirty pages, (continued)
- [PULL v2 13/32] vfio: Add vfio_listener_log_sync to mark dirty pages, Alex Williamson, 2020/10/28
- [PULL v2 14/32] vfio: Dirty page tracking when vIOMMU is enabled, Alex Williamson, 2020/10/28
- [PULL v2 15/32] vfio: Add ioctl to get dirty pages bitmap during dma unmap, Alex Williamson, 2020/10/28
- [PULL v2 16/32] vfio: Make vfio-pci device migration capable, Alex Williamson, 2020/10/28
- [PULL v2 17/32] qapi: Add VFIO devices migration stats in Migration stats, Alex Williamson, 2020/10/28
- [PULL v2 18/32] update-linux-headers: Add vfio_zdev.h, Alex Williamson, 2020/10/28
- [PULL v2 19/32] linux-headers: update against 5.10-rc1, Alex Williamson, 2020/10/28
- [PULL v2 20/32] s390x/pci: Move header files to include/hw/s390x, Alex Williamson, 2020/10/28
- [PULL v2 21/32] vfio: Create shared routine for scanning info capabilities, Alex Williamson, 2020/10/28
- [PULL v2 22/32] vfio: Find DMA available capability, Alex Williamson, 2020/10/28
- [PULL v2 23/32] s390x/pci: Add routine to get the vfio dma available count,
Alex Williamson <=
- [PULL v2 24/32] s390x/pci: Honor DMA limits set by vfio, Alex Williamson, 2020/10/28
- [PULL v2 25/32] s390x/pci: create a header dedicated to PCI CLP, Alex Williamson, 2020/10/28
- [PULL v2 26/32] s390x/pci: use a PCI Group structure, Alex Williamson, 2020/10/28
- [PULL v2 27/32] s390x/pci: clean up s390 PCI groups, Alex Williamson, 2020/10/28
- [PULL v2 28/32] s390x/pci: use a PCI Function structure, Alex Williamson, 2020/10/28
- [PULL v2 29/32] vfio: Add routine for finding VFIO_DEVICE_GET_INFO capabilities, Alex Williamson, 2020/10/28
- [PULL v2 30/32] s390x/pci: get zPCI function info from host, Alex Williamson, 2020/10/28
- [PULL v2 31/32] hw/vfio: Use lock guard macros, Alex Williamson, 2020/10/28
- [PULL v2 32/32] vfio: fix incorrect print type, Alex Williamson, 2020/10/28
- Re: [PULL v2 00/32] VFIO updates 2020-10-28 (for QEMU 5.2 soft-freeze), Peter Maydell, 2020/10/31