From: Yan Zhao <yan.y.zhao@intel.com>
To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: alex.williamson@redhat.com, cohuck@redhat.com,
zhenyuw@linux.intel.com, zhi.a.wang@intel.com,
kevin.tian@intel.com, shaopeng.he@intel.com, yi.l.liu@intel.com,
xin.zeng@intel.com, hang.yuan@intel.com,
Yan Zhao <yan.y.zhao@intel.com>
Subject: [RFC PATCH v4 04/10] vfio/pci: let vfio_pci know number of vendor regions and vendor irqs
Date: Sun, 17 May 2020 22:49:44 -0400 [thread overview]
Message-ID: <20200518024944.14263-1-yan.y.zhao@intel.com> (raw)
In-Reply-To: <20200518024202.13996-1-yan.y.zhao@intel.com>
This allows a simpler VFIO_DEVICE_GET_INFO ioctl in vendor driver
Cc: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Yan Zhao <yan.y.zhao@intel.com>
---
drivers/vfio/pci/vfio_pci.c | 23 +++++++++++++++++++++--
drivers/vfio/pci/vfio_pci_private.h | 2 ++
include/linux/vfio.h | 3 +++
3 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index 290b7ab55ecf..30137c1c5308 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -105,6 +105,24 @@ void *vfio_pci_vendor_data(void *device_data)
}
EXPORT_SYMBOL_GPL(vfio_pci_vendor_data);
+int vfio_pci_set_vendor_regions(void *device_data, int num_vendor_regions)
+{
+ struct vfio_pci_device *vdev = device_data;
+
+ vdev->num_vendor_regions = num_vendor_regions;
+ return 0;
+}
+EXPORT_SYMBOL_GPL(vfio_pci_set_vendor_regions);
+
+
+int vfio_pci_set_vendor_irqs(void *device_data, int num_vendor_irqs)
+{
+ struct vfio_pci_device *vdev = device_data;
+
+ vdev->num_vendor_irqs = num_vendor_irqs;
+ return 0;
+}
+EXPORT_SYMBOL_GPL(vfio_pci_set_vendor_irqs);
/*
* Our VGA arbiter participation is limited since we don't know anything
* about the device itself. However, if the device is the only VGA device
@@ -797,8 +815,9 @@ long vfio_pci_ioctl(void *device_data,
if (vdev->reset_works)
info.flags |= VFIO_DEVICE_FLAGS_RESET;
- info.num_regions = VFIO_PCI_NUM_REGIONS + vdev->num_regions;
- info.num_irqs = VFIO_PCI_NUM_IRQS;
+ info.num_regions = VFIO_PCI_NUM_REGIONS + vdev->num_regions +
+ vdev->num_vendor_regions;
+ info.num_irqs = VFIO_PCI_NUM_IRQS + vdev->num_vendor_irqs;
return copy_to_user((void __user *)arg, &info, minsz) ?
-EFAULT : 0;
diff --git a/drivers/vfio/pci/vfio_pci_private.h b/drivers/vfio/pci/vfio_pci_private.h
index 7758a20546fa..c6cfc4605987 100644
--- a/drivers/vfio/pci/vfio_pci_private.h
+++ b/drivers/vfio/pci/vfio_pci_private.h
@@ -110,6 +110,8 @@ struct vfio_pci_device {
int num_ctx;
int irq_type;
int num_regions;
+ int num_vendor_regions;
+ int num_vendor_irqs;
struct vfio_pci_region *region;
u8 msi_qmax;
u8 msix_bar;
diff --git a/include/linux/vfio.h b/include/linux/vfio.h
index 6ededceb1964..6310c53f9d36 100644
--- a/include/linux/vfio.h
+++ b/include/linux/vfio.h
@@ -231,6 +231,9 @@ extern void vfio_pci_release(void *device_data);
extern int vfio_pci_match(void *device_data, char *buf);
extern void *vfio_pci_vendor_data(void *device_data);
+extern int vfio_pci_set_vendor_regions(void *device_data,
+ int num_vendor_regions);
+extern int vfio_pci_set_vendor_irqs(void *device_data, int num_vendor_irqs);
struct vfio_pci_vendor_driver_ops {
char *name;
--
2.17.1
next prev parent reply other threads:[~2020-05-18 2:59 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-18 2:42 [RFC PATCH v4 00/10] Introduce vendor ops in vfio-pci Yan Zhao
2020-05-18 2:43 ` [RFC PATCH v4 01/10] vfio/pci: register/unregister vfio_pci_vendor_driver_ops Yan Zhao
2020-05-18 2:45 ` [RFC PATCH v4 02/10] vfio/pci: macros to generate module_init and module_exit for vendor modules Yan Zhao
2020-06-04 15:01 ` Cornelia Huck
2020-06-05 2:05 ` Yan Zhao
2020-05-18 2:49 ` [RFC PATCH v4 03/10] vfio/pci: export vendor_data, irq_type, num_regions, pdev and functions in vfio_pci_ops Yan Zhao
2020-05-18 2:49 ` Yan Zhao [this message]
2020-06-04 15:25 ` [RFC PATCH v4 04/10] vfio/pci: let vfio_pci know number of vendor regions and vendor irqs Cornelia Huck
2020-06-05 2:15 ` Yan Zhao
2020-06-11 12:31 ` David Edmondson
2020-06-11 23:09 ` Yan Zhao
2020-05-18 2:50 ` [RFC PATCH v4 05/10] vfio/pci: export vfio_pci_get_barmap Yan Zhao
2020-05-18 2:50 ` [RFC PATCH v4 06/10] vfio: Define device specific irq type capability Yan Zhao
2020-05-18 2:52 ` [RFC PATCH v4 07/10] vfio/pci: introduce a new irq type VFIO_IRQ_TYPE_REMAP_BAR_REGION Yan Zhao
2020-05-18 2:56 ` [QEMU RFC PATCH v4] hw/vfio/pci: remap bar region irq Yan Zhao
2020-05-29 21:45 ` [RFC PATCH v4 07/10] vfio/pci: introduce a new irq type VFIO_IRQ_TYPE_REMAP_BAR_REGION Alex Williamson
2020-06-01 6:57 ` Yan Zhao
2020-06-01 16:43 ` Alex Williamson
2020-06-02 8:28 ` Yan Zhao
2020-06-02 19:34 ` Alex Williamson
2020-06-03 1:40 ` Yan Zhao
2020-06-03 23:04 ` Alex Williamson
2020-06-04 2:42 ` Yan Zhao
2020-06-04 4:10 ` Alex Williamson
2020-06-05 0:26 ` He, Shaopeng
2020-06-05 17:54 ` Alex Williamson
2020-06-05 2:02 ` Yan Zhao
2020-06-05 16:13 ` Alex Williamson
2020-06-10 5:23 ` Yan Zhao
2020-06-19 22:55 ` Alex Williamson
2020-06-22 3:34 ` Yan Zhao
2020-05-18 2:53 ` [RFC PATCH v4 08/10] i40e/vf_migration: VF live migration - pass-through VF first Yan Zhao
2020-06-10 8:59 ` Xiang Zheng
2020-06-11 0:23 ` Yan Zhao
2020-06-11 2:27 ` Xiang Zheng
2020-06-11 23:10 ` Yan Zhao
2020-05-18 2:54 ` [RFC PATCH v4 09/10] i40e/vf_migration: register a migration vendor region Yan Zhao
2020-05-18 2:54 ` [RFC PATCH v4 10/10] i40e/vf_migration: vendor defined irq_type to support dynamic bar map Yan Zhao
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=20200518024944.14263-1-yan.y.zhao@intel.com \
--to=yan.y.zhao@intel.com \
--cc=alex.williamson@redhat.com \
--cc=cohuck@redhat.com \
--cc=hang.yuan@intel.com \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=shaopeng.he@intel.com \
--cc=xin.zeng@intel.com \
--cc=yi.l.liu@intel.com \
--cc=zhenyuw@linux.intel.com \
--cc=zhi.a.wang@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).