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 v9 05/12] vfio: Introduce common function to add capabilities Date: Tue, 18 Oct 2016 02:52:05 +0530 [thread overview] Message-ID: <1476739332-4911-6-git-send-email-kwankhede@nvidia.com> (raw) In-Reply-To: <1476739332-4911-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. Signed-off-by: Kirti Wankhede <kwankhede@nvidia.com> Signed-off-by: Neo Jia <cjia@nvidia.com> Change-Id: I6fca329fa2291f37a2c859d0bc97574d9e2ce1a6 --- drivers/vfio/vfio.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/vfio.h | 4 +++ 2 files changed, 82 insertions(+) diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c index a5a210005b65..e96cb3f7a23c 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio.c @@ -1799,6 +1799,84 @@ void vfio_info_cap_shift(struct vfio_info_cap *caps, size_t offset) } EXPORT_SYMBOL_GPL(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_region_info *info, + struct vfio_info_cap *caps, + int cap_type_id, + void *cap_type) +{ + int ret; + + if (!cap_type) + return 0; + + switch (cap_type_id) { + case VFIO_REGION_INFO_CAP_SPARSE_MMAP: + ret = sparse_mmap_cap(caps, cap_type); + if (ret) + return ret; + break; + + case VFIO_REGION_INFO_CAP_TYPE: + ret = region_type_cap(caps, cap_type); + if (ret) + return ret; + break; + default: + return -EINVAL; + } + + info->flags |= VFIO_REGION_INFO_FLAG_CAPS; + + if (caps->size) { + if (info->argsz < sizeof(*info) + caps->size) { + info->argsz = sizeof(*info) + caps->size; + info->cap_offset = 0; + } else { + vfio_info_cap_shift(caps, sizeof(*info)); + info->cap_offset = sizeof(*info); + } + } + return 0; +} +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 0bd25ba6223d..854a4b40be02 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -108,6 +108,10 @@ 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_region_info *info, + 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 v9 05/12] vfio: Introduce common function to add capabilities Date: Tue, 18 Oct 2016 02:52:05 +0530 [thread overview] Message-ID: <1476739332-4911-6-git-send-email-kwankhede@nvidia.com> (raw) In-Reply-To: <1476739332-4911-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. Signed-off-by: Kirti Wankhede <kwankhede@nvidia.com> Signed-off-by: Neo Jia <cjia@nvidia.com> Change-Id: I6fca329fa2291f37a2c859d0bc97574d9e2ce1a6 --- drivers/vfio/vfio.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/vfio.h | 4 +++ 2 files changed, 82 insertions(+) diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c index a5a210005b65..e96cb3f7a23c 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio.c @@ -1799,6 +1799,84 @@ void vfio_info_cap_shift(struct vfio_info_cap *caps, size_t offset) } EXPORT_SYMBOL_GPL(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_region_info *info, + struct vfio_info_cap *caps, + int cap_type_id, + void *cap_type) +{ + int ret; + + if (!cap_type) + return 0; + + switch (cap_type_id) { + case VFIO_REGION_INFO_CAP_SPARSE_MMAP: + ret = sparse_mmap_cap(caps, cap_type); + if (ret) + return ret; + break; + + case VFIO_REGION_INFO_CAP_TYPE: + ret = region_type_cap(caps, cap_type); + if (ret) + return ret; + break; + default: + return -EINVAL; + } + + info->flags |= VFIO_REGION_INFO_FLAG_CAPS; + + if (caps->size) { + if (info->argsz < sizeof(*info) + caps->size) { + info->argsz = sizeof(*info) + caps->size; + info->cap_offset = 0; + } else { + vfio_info_cap_shift(caps, sizeof(*info)); + info->cap_offset = sizeof(*info); + } + } + return 0; +} +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 0bd25ba6223d..854a4b40be02 100644 --- a/include/linux/vfio.h +++ b/include/linux/vfio.h @@ -108,6 +108,10 @@ 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_region_info *info, + 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-10-17 21:23 UTC|newest] Thread overview: 148+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-10-17 21:22 [PATCH v9 00/12] Add Mediated device support Kirti Wankhede 2016-10-17 21:22 ` [Qemu-devel] " Kirti Wankhede 2016-10-17 21:22 ` [PATCH v9 01/12] vfio: Mediated device Core driver Kirti Wankhede 2016-10-17 21:22 ` [Qemu-devel] " Kirti Wankhede 2016-10-18 23:16 ` Alex Williamson 2016-10-18 23:16 ` [Qemu-devel] " Alex Williamson 2016-10-19 19:16 ` Kirti Wankhede 2016-10-19 19:16 ` [Qemu-devel] " Kirti Wankhede 2016-10-19 22:20 ` Alex Williamson 2016-10-19 22:20 ` [Qemu-devel] " Alex Williamson 2016-10-19 22:20 ` Alex Williamson 2016-10-20 7:23 ` Jike Song 2016-10-20 7:23 ` [Qemu-devel] " Jike Song 2016-10-20 17:12 ` Alex Williamson 2016-10-20 17:12 ` [Qemu-devel] " Alex Williamson 2016-10-21 2:41 ` Jike Song 2016-10-21 2:41 ` [Qemu-devel] " Jike Song 2016-10-27 5:56 ` Jike Song 2016-10-27 5:56 ` [Qemu-devel] " Jike Song 2016-10-26 6:52 ` Tian, Kevin 2016-10-26 6:52 ` [Qemu-devel] " Tian, Kevin 2016-10-26 14:58 ` Kirti Wankhede 2016-10-26 14:58 ` [Qemu-devel] " Kirti Wankhede 2016-10-17 21:22 ` [PATCH v9 02/12] vfio: VFIO based driver for Mediated devices Kirti Wankhede 2016-10-17 21:22 ` [Qemu-devel] " Kirti Wankhede 2016-10-26 6:57 ` Tian, Kevin 2016-10-26 6:57 ` [Qemu-devel] " Tian, Kevin 2016-10-26 15:01 ` Kirti Wankhede 2016-10-26 15:01 ` [Qemu-devel] " Kirti Wankhede 2016-10-17 21:22 ` [PATCH v9 03/12] vfio: Rearrange functions to get vfio_group from dev Kirti Wankhede 2016-10-17 21:22 ` [Qemu-devel] " Kirti Wankhede 2016-10-19 17:26 ` Alex Williamson 2016-10-19 17:26 ` [Qemu-devel] " Alex Williamson 2016-10-17 21:22 ` [PATCH v9 04/12] vfio iommu: Add support for mediated devices Kirti Wankhede 2016-10-17 21:22 ` [Qemu-devel] " Kirti Wankhede 2016-10-17 21:22 ` Kirti Wankhede 2016-10-19 21:02 ` Alex Williamson 2016-10-19 21:02 ` [Qemu-devel] " Alex Williamson 2016-10-20 20:17 ` Kirti Wankhede 2016-10-20 20:17 ` [Qemu-devel] " Kirti Wankhede 2016-10-24 2:32 ` Alex Williamson 2016-10-24 2:32 ` [Qemu-devel] " Alex Williamson 2016-10-26 7:19 ` Tian, Kevin 2016-10-26 7:19 ` [Qemu-devel] " Tian, Kevin 2016-10-26 15:06 ` Kirti Wankhede 2016-10-26 15:06 ` [Qemu-devel] " Kirti Wankhede 2016-10-26 7:53 ` Tian, Kevin 2016-10-26 7:53 ` [Qemu-devel] " Tian, Kevin 2016-10-26 15:16 ` Alex Williamson 2016-10-26 15:16 ` [Qemu-devel] " Alex Williamson 2016-10-26 7:54 ` Tian, Kevin 2016-10-26 7:54 ` [Qemu-devel] " Tian, Kevin 2016-10-26 15:19 ` Alex Williamson 2016-10-26 15:19 ` [Qemu-devel] " Alex Williamson 2016-10-21 7:49 ` Jike Song 2016-10-21 7:49 ` [Qemu-devel] " Jike Song 2016-10-21 14:36 ` Alex Williamson 2016-10-21 14:36 ` [Qemu-devel] " Alex Williamson 2016-10-24 10:35 ` Kirti Wankhede 2016-10-24 10:35 ` [Qemu-devel] " Kirti Wankhede 2016-10-27 7:20 ` Alexey Kardashevskiy 2016-10-27 12:31 ` Kirti Wankhede 2016-10-27 12:31 ` Kirti Wankhede 2016-10-27 12:31 ` Kirti Wankhede 2016-10-27 14:30 ` [Qemu-devel] " Alex Williamson 2016-10-27 14:30 ` Alex Williamson 2016-10-27 14:30 ` Alex Williamson 2016-10-27 15:59 ` [Qemu-devel] " Kirti Wankhede 2016-10-27 15:59 ` Kirti Wankhede 2016-10-28 2:18 ` Alexey Kardashevskiy 2016-11-01 14:01 ` Kirti Wankhede 2016-11-01 14:01 ` Kirti Wankhede 2016-11-02 1:24 ` Alexey Kardashevskiy 2016-11-02 3:29 ` Kirti Wankhede 2016-11-02 3:29 ` Kirti Wankhede 2016-11-02 4:09 ` Alexey Kardashevskiy 2016-11-02 12:21 ` Jike Song 2016-11-02 12:21 ` Jike Song 2016-11-02 12:41 ` [Qemu-devel] " Kirti Wankhede 2016-11-02 12:41 ` Kirti Wankhede 2016-11-02 13:00 ` Jike Song 2016-11-02 13:18 ` Kirti Wankhede 2016-11-02 13:18 ` Kirti Wankhede 2016-11-02 13:35 ` Jike Song 2016-11-02 13:35 ` Jike Song 2016-11-03 4:29 ` [Qemu-devel] " Alexey Kardashevskiy 2016-11-03 4:29 ` Alexey Kardashevskiy 2016-10-17 21:22 ` Kirti Wankhede [this message] 2016-10-17 21:22 ` [Qemu-devel] [PATCH v9 05/12] vfio: Introduce common function to add capabilities Kirti Wankhede 2016-10-20 19:24 ` Alex Williamson 2016-10-20 19:24 ` [Qemu-devel] " Alex Williamson 2016-10-24 21:27 ` Kirti Wankhede 2016-10-24 21:27 ` [Qemu-devel] " Kirti Wankhede 2016-10-24 21:39 ` Alex Williamson 2016-10-24 21:39 ` [Qemu-devel] " Alex Williamson 2016-10-17 21:22 ` [PATCH v9 06/12] vfio_pci: Update vfio_pci to use vfio_info_add_capability() Kirti Wankhede 2016-10-17 21:22 ` [Qemu-devel] " Kirti Wankhede 2016-10-20 19:24 ` Alex Williamson 2016-10-20 19:24 ` [Qemu-devel] " Alex Williamson 2016-10-24 21:22 ` Kirti Wankhede 2016-10-24 21:22 ` [Qemu-devel] " Kirti Wankhede 2016-10-24 21:37 ` Alex Williamson 2016-10-24 21:37 ` [Qemu-devel] " Alex Williamson 2016-10-17 21:22 ` [PATCH v9 07/12] vfio: Introduce vfio_set_irqs_validate_and_prepare() Kirti Wankhede 2016-10-17 21:22 ` [Qemu-devel] " Kirti Wankhede 2016-10-17 21:22 ` [PATCH v9 08/12] vfio_pci: Updated to use vfio_set_irqs_validate_and_prepare() Kirti Wankhede 2016-10-17 21:22 ` [Qemu-devel] " Kirti Wankhede 2016-10-17 21:22 ` [PATCH v9 09/12] vfio_platform: " Kirti Wankhede 2016-10-17 21:22 ` [Qemu-devel] " Kirti Wankhede 2016-10-17 21:22 ` [PATCH v9 10/12] vfio: Add function to get device_api string from vfio_device_info.flags Kirti Wankhede 2016-10-17 21:22 ` [Qemu-devel] " Kirti Wankhede 2016-10-20 19:34 ` Alex Williamson 2016-10-20 19:34 ` [Qemu-devel] " Alex Williamson 2016-10-20 20:29 ` Kirti Wankhede 2016-10-20 20:29 ` [Qemu-devel] " Kirti Wankhede 2016-10-20 21:05 ` Alex Williamson 2016-10-20 21:05 ` [Qemu-devel] " Alex Williamson 2016-10-20 21:14 ` Kirti Wankhede 2016-10-20 21:14 ` [Qemu-devel] " Kirti Wankhede 2016-10-20 21:22 ` Alex Williamson 2016-10-20 21:22 ` [Qemu-devel] " Alex Williamson 2016-10-21 3:00 ` Kirti Wankhede 2016-10-21 3:00 ` [Qemu-devel] " Kirti Wankhede 2016-10-21 3:20 ` Alex Williamson 2016-10-21 3:20 ` [Qemu-devel] " Alex Williamson 2016-10-17 21:22 ` [PATCH v9 11/12] docs: Add Documentation for Mediated devices Kirti Wankhede 2016-10-17 21:22 ` [Qemu-devel] " Kirti Wankhede 2016-10-25 16:17 ` Alex Williamson 2016-10-25 16:17 ` [Qemu-devel] " Alex Williamson 2016-10-17 21:22 ` [PATCH v9 12/12] docs: Sample driver to demonstrate how to use Mediated device framework Kirti Wankhede 2016-10-17 21:22 ` [Qemu-devel] " Kirti Wankhede 2016-10-18 2:54 ` Dong Jia Shi 2016-10-18 17:17 ` Alex Williamson 2016-10-18 17:17 ` [Qemu-devel] " Alex Williamson 2016-10-19 19:19 ` Kirti Wankhede 2016-10-19 19:19 ` [Qemu-devel] " Kirti Wankhede 2016-10-18 2:54 ` Dong Jia Shi 2016-10-17 21:41 ` [PATCH v9 00/12] Add Mediated device support Alex Williamson 2016-10-17 21:41 ` [Qemu-devel] " Alex Williamson 2016-10-24 7:07 ` Jike Song 2016-10-24 7:07 ` [Qemu-devel] " Jike Song 2016-12-05 17:44 ` Gerd Hoffmann 2016-12-05 17:44 ` [Qemu-devel] " Gerd Hoffmann 2016-12-05 17:44 ` Gerd Hoffmann 2016-12-06 2:24 ` Jike Song 2016-12-06 2:24 ` [Qemu-devel] " Jike Song 2016-12-07 14:40 ` Gerd Hoffmann 2016-12-07 14:40 ` [Qemu-devel] " Gerd Hoffmann
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=1476739332-4911-6-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.