From: Kirti Wankhede <kwankhede@nvidia.com>
To: <alex.williamson@redhat.com>, <pbonzini@redhat.com>,
<kraxel@redhat.com>, <cjia@nvidia.com>
Cc: <qemu-devel@nongnu.org>, <kvm@vger.kernel.org>,
<kevin.tian@intel.com>, <jike.song@intel.com>,
<bjsdjshi@linux.vnet.ibm.com>, <linux-kernel@vger.kernel.org>,
Kirti Wankhede <kwankhede@nvidia.com>
Subject: [PATCH v14 13/22] vfio: Introduce common function to add capabilities
Date: Thu, 17 Nov 2016 02:16:25 +0530 [thread overview]
Message-ID: <1479329194-10247-14-git-send-email-kwankhede@nvidia.com> (raw)
In-Reply-To: <1479329194-10247-1-git-send-email-kwankhede@nvidia.com>
Vendor driver using mediated device framework should use
vfio_info_add_capability() to add capabilities.
Introduced this function to reduce code duplication in vendor drivers.
vfio_info_cap_shift() manipulated a data buffer to add an offset to each
element in a chain. This data buffer is documented in a uapi header.
Changing vfio_info_cap_shift symbol to be available to all drivers.
Signed-off-by: Kirti Wankhede <kwankhede@nvidia.com>
Signed-off-by: Neo Jia <cjia@nvidia.com>
Change-Id: I6fca329fa2291f37a2c859d0bc97574d9e2ce1a6
---
drivers/vfio/vfio.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++-
include/linux/vfio.h | 3 +++
2 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
index c850ba324be2..82257cf30f52 100644
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
@@ -1797,8 +1797,66 @@ void vfio_info_cap_shift(struct vfio_info_cap *caps, size_t offset)
for (tmp = caps->buf; tmp->next; tmp = (void *)tmp + tmp->next - offset)
tmp->next += offset;
}
-EXPORT_SYMBOL_GPL(vfio_info_cap_shift);
+EXPORT_SYMBOL(vfio_info_cap_shift);
+static int sparse_mmap_cap(struct vfio_info_cap *caps, void *cap_type)
+{
+ struct vfio_info_cap_header *header;
+ struct vfio_region_info_cap_sparse_mmap *sparse_cap, *sparse = cap_type;
+ size_t size;
+
+ size = sizeof(*sparse) + sparse->nr_areas * sizeof(*sparse->areas);
+ header = vfio_info_cap_add(caps, size,
+ VFIO_REGION_INFO_CAP_SPARSE_MMAP, 1);
+ if (IS_ERR(header))
+ return PTR_ERR(header);
+
+ sparse_cap = container_of(header,
+ struct vfio_region_info_cap_sparse_mmap, header);
+ sparse_cap->nr_areas = sparse->nr_areas;
+ memcpy(sparse_cap->areas, sparse->areas,
+ sparse->nr_areas * sizeof(*sparse->areas));
+ return 0;
+}
+
+static int region_type_cap(struct vfio_info_cap *caps, void *cap_type)
+{
+ struct vfio_info_cap_header *header;
+ struct vfio_region_info_cap_type *type_cap, *cap = cap_type;
+
+ header = vfio_info_cap_add(caps, sizeof(*cap),
+ VFIO_REGION_INFO_CAP_TYPE, 1);
+ if (IS_ERR(header))
+ return PTR_ERR(header);
+
+ type_cap = container_of(header, struct vfio_region_info_cap_type,
+ header);
+ type_cap->type = cap->type;
+ type_cap->subtype = cap->subtype;
+ return 0;
+}
+
+int vfio_info_add_capability(struct vfio_info_cap *caps, int cap_type_id,
+ void *cap_type)
+{
+ int ret = -EINVAL;
+
+ if (!cap_type)
+ return 0;
+
+ switch (cap_type_id) {
+ case VFIO_REGION_INFO_CAP_SPARSE_MMAP:
+ ret = sparse_mmap_cap(caps, cap_type);
+ break;
+
+ case VFIO_REGION_INFO_CAP_TYPE:
+ ret = region_type_cap(caps, cap_type);
+ break;
+ }
+
+ return ret;
+}
+EXPORT_SYMBOL(vfio_info_add_capability);
/*
* Pin a set of guest PFNs and return their associated host PFNs for local
diff --git a/include/linux/vfio.h b/include/linux/vfio.h
index 6ab13f7e2920..e26f7ccab564 100644
--- a/include/linux/vfio.h
+++ b/include/linux/vfio.h
@@ -126,6 +126,9 @@ extern struct vfio_info_cap_header *vfio_info_cap_add(
struct vfio_info_cap *caps, size_t size, u16 id, u16 version);
extern void vfio_info_cap_shift(struct vfio_info_cap *caps, size_t offset);
+extern int vfio_info_add_capability(struct vfio_info_cap *caps,
+ int cap_type_id, void *cap_type);
+
struct pci_dev;
#ifdef CONFIG_EEH
extern void vfio_spapr_pci_eeh_open(struct pci_dev *pdev);
--
2.7.0
next prev parent reply other threads:[~2016-11-16 20:46 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-16 20:46 [PATCH v14 00/22] Add Mediated device support Kirti Wankhede
2016-11-16 20:46 ` [PATCH v14 01/22] vfio: Mediated device Core driver Kirti Wankhede
2016-11-16 20:46 ` [PATCH v14 02/22] vfio: VFIO based driver for Mediated devices Kirti Wankhede
2016-11-16 20:46 ` [PATCH v14 03/22] vfio: Rearrange functions to get vfio_group from dev Kirti Wankhede
2016-11-16 20:46 ` [PATCH v14 04/22] vfio: Common function to increment container_users Kirti Wankhede
2016-11-16 20:46 ` [PATCH v14 05/22] vfio iommu: Added pin and unpin callback functions to vfio_iommu_driver_ops Kirti Wankhede
2016-11-16 20:46 ` [PATCH v14 06/22] vfio iommu type1: Update arguments of vfio_lock_acct Kirti Wankhede
2016-11-16 20:46 ` [PATCH v14 07/22] vfio iommu type1: Update argument of vaddr_get_pfn() Kirti Wankhede
2016-11-16 20:46 ` [PATCH v14 08/22] vfio iommu type1: Add find_iommu_group() function Kirti Wankhede
2016-11-21 11:29 ` Auger Eric
2016-11-21 11:55 ` Kirti Wankhede
2016-11-21 12:42 ` Auger Eric
2016-11-16 20:46 ` [PATCH v14 09/22] vfio iommu type1: Add task structure to vfio_dma Kirti Wankhede
2016-11-17 5:41 ` Alexey Kardashevskiy
2016-11-17 6:12 ` Alex Williamson
2016-11-17 6:42 ` Alexey Kardashevskiy
2016-11-17 6:23 ` Kirti Wankhede
2016-11-16 20:46 ` [PATCH v14 10/22] vfio iommu type1: Add support for mediated devices Kirti Wankhede
2016-11-16 23:57 ` Alex Williamson
2016-11-17 4:49 ` Kirti Wankhede
2016-11-17 4:52 ` Kirti Wankhede
2016-11-16 20:46 ` [PATCH v14 11/22] vfio iommu: Add blocking notifier to notify DMA_UNMAP Kirti Wankhede
2016-11-17 0:02 ` Alex Williamson
2016-11-17 2:53 ` Jike Song
2016-11-17 4:58 ` Kirti Wankhede
2016-11-16 20:46 ` [PATCH v14 12/22] vfio: Add notifier callback to parent's ops structure of mdev Kirti Wankhede
2016-11-17 5:04 ` Kirti Wankhede
[not found] ` <20161117021533.GD6620@bjsdjshi@linux.vnet.ibm.com>
2016-11-17 5:05 ` Kirti Wankhede
2016-11-17 12:35 ` Jike Song
2016-11-17 15:27 ` Alex Williamson
2016-11-17 16:00 ` Kirti Wankhede
2016-11-17 16:14 ` Alex Williamson
2016-11-16 20:46 ` Kirti Wankhede [this message]
2016-11-21 11:04 ` [Qemu-devel] [PATCH v14 13/22] vfio: Introduce common function to add capabilities Auger Eric
2016-11-16 20:46 ` [PATCH v14 14/22] vfio_pci: Update vfio_pci to use vfio_info_add_capability() Kirti Wankhede
2016-11-21 11:04 ` Auger Eric
2016-11-16 20:46 ` [PATCH v14 15/22] vfio: Introduce vfio_set_irqs_validate_and_prepare() Kirti Wankhede
2016-11-21 10:51 ` Auger Eric
2016-11-16 20:46 ` [PATCH v14 16/22] vfio_pci: Updated to use vfio_set_irqs_validate_and_prepare() Kirti Wankhede
2016-11-21 10:51 ` Auger Eric
2016-11-16 20:46 ` [PATCH v14 17/22] vfio_platform: " Kirti Wankhede
2016-11-21 10:51 ` Auger Eric
2016-11-16 20:46 ` [PATCH v14 18/22] vfio: Define device_api strings Kirti Wankhede
2016-11-16 20:46 ` [PATCH v14 19/22] docs: Add Documentation for Mediated devices Kirti Wankhede
2016-11-16 20:46 ` [PATCH v14 20/22] docs: Sysfs ABI for mediated device framework Kirti Wankhede
2016-11-16 20:46 ` [PATCH v14 21/22] docs: Sample driver to demonstrate how to use Mediated " Kirti Wankhede
2016-11-16 20:46 ` [PATCH v14 22/22] MAINTAINERS: Add entry VFIO based Mediated device drivers Kirti Wankhede
2016-11-17 21:25 ` [PATCH v14 00/22] Add Mediated device support Alex Williamson
2016-11-17 22:05 ` Neo Jia
2016-11-18 2:00 ` Kirti Wankhede
2016-11-18 2:26 ` [Qemu-devel] " Jike Song
2016-11-17 23:29 ` Tian, Kevin
2016-11-17 23:51 ` Alex Williamson
2016-11-18 9:16 ` Zhenyu Wang
2016-11-18 15:40 ` Alex Williamson
2016-11-18 16:09 ` Daniel Vetter
2016-11-18 16:50 ` Alex Williamson
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=1479329194-10247-14-git-send-email-kwankhede@nvidia.com \
--to=kwankhede@nvidia.com \
--cc=alex.williamson@redhat.com \
--cc=bjsdjshi@linux.vnet.ibm.com \
--cc=cjia@nvidia.com \
--cc=jike.song@intel.com \
--cc=kevin.tian@intel.com \
--cc=kraxel@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/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
all inboxes | Powered by JetHome®