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 v12 13/22] vfio: Introduce common function to add capabilities Date: Mon, 14 Nov 2016 21:12:27 +0530 [thread overview] Message-ID: <1479138156-28905-14-git-send-email-kwankhede@nvidia.com> (raw) In-Reply-To: <1479138156-28905-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 388a3cbddbd9..3648fd74aa30 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 123e089388e9..b1aaf69cb470 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -111,6 +111,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
WARNING: multiple messages have this Message-ID (diff)
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: [Qemu-devel] [PATCH v12 13/22] vfio: Introduce common function to add capabilities Date: Mon, 14 Nov 2016 21:12:27 +0530 [thread overview] Message-ID: <1479138156-28905-14-git-send-email-kwankhede@nvidia.com> (raw) In-Reply-To: <1479138156-28905-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 388a3cbddbd9..3648fd74aa30 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 123e089388e9..b1aaf69cb470 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -111,6 +111,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-14 15:45 UTC|newest] Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-14 15:42 [PATCH v12 00/22] Add Mediated device support Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 01/22] vfio: Mediated device Core driver Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-15 8:30 ` Dong Jia Shi 2016-11-15 8:30 ` [Qemu-devel] " Dong Jia Shi 2016-11-15 15:16 ` Kirti Wankhede 2016-11-15 15:16 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 02/22] vfio: VFIO based driver for Mediated devices Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 03/22] vfio: Rearrange functions to get vfio_group from dev Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 04/22] vfio: Common function to increment container_users Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 05/22] vfio iommu: Added pin and unpin callback functions to vfio_iommu_driver_ops Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 19:43 ` Alex Williamson 2016-11-14 19:43 ` [Qemu-devel] " Alex Williamson 2016-11-15 15:03 ` Kirti Wankhede 2016-11-15 15:03 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 06/22] vfio iommu type1: Update arguments of vfio_lock_acct Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 07/22] vfio iommu type1: Update argument of vaddr_get_pfn() Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 08/22] vfio iommu type1: Add find_iommu_group() function Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 09/22] vfio iommu type1: Add task structure to vfio_dma Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-15 5:26 ` Alexey Kardashevskiy 2016-11-15 5:26 ` [Qemu-devel] " Alexey Kardashevskiy 2016-11-14 15:42 ` [PATCH v12 10/22] vfio iommu type1: Add support for mediated devices Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 23:25 ` Alex Williamson 2016-11-14 23:25 ` [Qemu-devel] " Alex Williamson 2016-11-15 15:09 ` Kirti Wankhede 2016-11-15 15:09 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 11/22] vfio iommu: Add blocking notifier to notify DMA_UNMAP Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 23:58 ` Alex Williamson 2016-11-14 23:58 ` [Qemu-devel] " Alex Williamson 2016-11-15 15:11 ` Kirti Wankhede 2016-11-15 15:11 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 12/22] vfio: Add notifier callback to parent's ops structure of mdev Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-15 6:45 ` Jike Song 2016-11-15 6:45 ` [Qemu-devel] " Jike Song 2016-11-15 8:11 ` Kirti Wankhede 2016-11-15 8:11 ` [Qemu-devel] " Kirti Wankhede 2016-11-15 9:30 ` Jike Song 2016-11-15 9:30 ` [Qemu-devel] " Jike Song 2016-11-15 15:19 ` Alex Williamson 2016-11-15 15:19 ` [Qemu-devel] " Alex Williamson 2016-11-16 5:52 ` Jike Song 2016-11-16 5:52 ` [Qemu-devel] " Jike Song 2016-11-14 15:42 ` Kirti Wankhede [this message] 2016-11-14 15:42 ` [Qemu-devel] [PATCH v12 13/22] vfio: Introduce common function to add capabilities Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 14/22] vfio_pci: Update vfio_pci to use vfio_info_add_capability() Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 15/22] vfio: Introduce vfio_set_irqs_validate_and_prepare() Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 16/22] vfio_pci: Updated to use vfio_set_irqs_validate_and_prepare() Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 17/22] vfio_platform: " Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 18/22] vfio: Define device_api strings Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 19/22] docs: Add Documentation for Mediated devices Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 20/22] docs: Sysfs ABI for mediated device framework Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 21/22] docs: Sample driver to demonstrate how to use Mediated " Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede 2016-11-14 15:42 ` [PATCH v12 22/22] MAINTAINERS: Add entry VFIO based Mediated device drivers Kirti Wankhede 2016-11-14 15:42 ` [Qemu-devel] " Kirti Wankhede
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=1479138156-28905-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.