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 v10 15/19] vfio_platform: Updated to use vfio_set_irqs_validate_and_prepare()
Date: Thu, 27 Oct 2016 02:59:22 +0530 [thread overview]
Message-ID: <1477517366-27871-16-git-send-email-kwankhede@nvidia.com> (raw)
In-Reply-To: <1477517366-27871-1-git-send-email-kwankhede@nvidia.com>
Updated vfio_platform_common.c file to use
vfio_set_irqs_validate_and_prepare()
Signed-off-by: Kirti Wankhede <kwankhede@nvidia.com>
Signed-off-by: Neo Jia <cjia@nvidia.com>
Change-Id: Id87cd6b78ae901610b39bf957974baa6f40cd7b0
---
drivers/vfio/platform/vfio_platform_common.c | 31 +++++++---------------------
1 file changed, 8 insertions(+), 23 deletions(-)
diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c
index d78142830754..4c27f4be3c3d 100644
--- a/drivers/vfio/platform/vfio_platform_common.c
+++ b/drivers/vfio/platform/vfio_platform_common.c
@@ -364,36 +364,21 @@ static long vfio_platform_ioctl(void *device_data,
struct vfio_irq_set hdr;
u8 *data = NULL;
int ret = 0;
+ size_t data_size = 0;
minsz = offsetofend(struct vfio_irq_set, count);
if (copy_from_user(&hdr, (void __user *)arg, minsz))
return -EFAULT;
- if (hdr.argsz < minsz)
- return -EINVAL;
-
- if (hdr.index >= vdev->num_irqs)
- return -EINVAL;
-
- if (hdr.flags & ~(VFIO_IRQ_SET_DATA_TYPE_MASK |
- VFIO_IRQ_SET_ACTION_TYPE_MASK))
- return -EINVAL;
-
- if (!(hdr.flags & VFIO_IRQ_SET_DATA_NONE)) {
- size_t size;
-
- if (hdr.flags & VFIO_IRQ_SET_DATA_BOOL)
- size = sizeof(uint8_t);
- else if (hdr.flags & VFIO_IRQ_SET_DATA_EVENTFD)
- size = sizeof(int32_t);
- else
- return -EINVAL;
-
- if (hdr.argsz - minsz < size)
- return -EINVAL;
+ ret = vfio_set_irqs_validate_and_prepare(&hdr, vdev->num_irqs,
+ vdev->num_irqs, &data_size);
+ if (ret)
+ return ret;
- data = memdup_user((void __user *)(arg + minsz), size);
+ if (data_size) {
+ data = memdup_user((void __user *)(arg + minsz),
+ data_size);
if (IS_ERR(data))
return PTR_ERR(data);
}
--
2.7.0
next prev parent reply other threads:[~2016-10-26 21:32 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-26 21:29 [PATCH v10 00/19] Add Mediated device support Kirti Wankhede
2016-10-26 21:29 ` [PATCH v10 01/19] vfio: Mediated device Core driver Kirti Wankhede
2016-10-29 4:30 ` Jike Song
2016-10-29 10:06 ` Kirti Wankhede
2016-10-29 18:11 ` Jike Song
2016-11-02 7:59 ` Kirti Wankhede
2016-11-02 10:31 ` [Qemu-devel] " Jike Song
2016-11-01 3:08 ` Jike Song
2016-11-01 3:44 ` Alex Williamson
2016-11-01 5:28 ` Jike Song
2016-10-26 21:29 ` [PATCH v10 02/19] vfio: VFIO based driver for Mediated devices Kirti Wankhede
2016-11-02 10:39 ` Jike Song
2016-10-26 21:29 ` [PATCH v10 03/19] vfio: Rearrange functions to get vfio_group from dev Kirti Wankhede
2016-11-02 10:41 ` Jike Song
2016-10-26 21:29 ` [PATCH v10 04/19] vfio: Common function to increment container_users Kirti Wankhede
2016-11-02 11:34 ` Jike Song
2016-10-26 21:29 ` [PATCH v10 05/19] vfio iommu: Added pin and unpin callback functions to vfio_iommu_driver_ops Kirti Wankhede
2016-11-01 8:07 ` Jike Song
2016-10-26 21:29 ` [PATCH v10 06/19] vfio iommu type1: Update arguments of vfio_lock_acct Kirti Wankhede
2016-10-26 21:29 ` [PATCH v10 07/19] vfio iommu type1: Update argument of vaddr_get_pfn() Kirti Wankhede
2016-10-27 12:11 ` Jike Song
2016-10-27 12:24 ` Kirti Wankhede
2016-10-28 6:01 ` Jike Song
2016-11-02 8:06 ` Kirti Wankhede
2016-10-26 21:29 ` [PATCH v10 08/19] vfio iommu type1: Add find_iommu_group() function Kirti Wankhede
2016-11-02 14:13 ` Jike Song
2016-10-26 21:29 ` [PATCH v10 09/19] vfio iommu type1: Add support for mediated devices Kirti Wankhede
2016-10-27 23:01 ` Alex Williamson
2016-11-02 13:29 ` Jike Song
2016-10-26 21:29 ` [PATCH v10 10/19] vfio iommu: Add blocking notifier to notify DMA_UNMAP Kirti Wankhede
2016-10-28 7:33 ` Jike Song
2016-10-28 12:38 ` Kirti Wankhede
2016-10-28 12:40 ` Alex Williamson
2016-10-28 20:02 ` Kirti Wankhede
2016-10-28 20:33 ` Alex Williamson
2016-10-29 10:37 ` Kirti Wankhede
2016-10-29 14:03 ` Alex Williamson
[not found] ` <20161101034558.GA7186@bjsdjshi@linux.vnet.ibm.com>
2016-11-01 7:47 ` Kirti Wankhede
2016-10-31 3:50 ` Jike Song
2016-10-31 5:59 ` Kirti Wankhede
2016-10-31 6:05 ` Jike Song
2016-10-26 21:29 ` [PATCH v10 11/19] vfio: Introduce common function to add capabilities Kirti Wankhede
2016-10-26 21:29 ` [PATCH v10 12/19] vfio_pci: Update vfio_pci to use vfio_info_add_capability() Kirti Wankhede
2016-10-26 21:29 ` [PATCH v10 13/19] vfio: Introduce vfio_set_irqs_validate_and_prepare() Kirti Wankhede
2016-10-26 21:29 ` [PATCH v10 14/19] vfio_pci: Updated to use vfio_set_irqs_validate_and_prepare() Kirti Wankhede
2016-10-26 21:29 ` Kirti Wankhede [this message]
2016-10-26 21:29 ` [PATCH v10 16/19] vfio: Define device_api strings Kirti Wankhede
2016-10-26 21:29 ` [PATCH v10 17/19] docs: Add Documentation for Mediated devices Kirti Wankhede
2016-10-26 21:29 ` [PATCH v10 18/19] docs: Sysfs ABI for mediated device framework Kirti Wankhede
2016-10-31 7:19 ` Jike Song
2016-11-02 7:55 ` Kirti Wankhede
2016-10-26 21:29 ` [PATCH v10 19/19] docs: Sample driver to demonstrate how to use Mediated " Kirti Wankhede
2016-10-27 14:29 ` Jonathan Corbet
2016-11-01 8:32 ` [PATCH v10 00/19] Add Mediated device support Jike Song
2016-11-01 15:24 ` Gerd Hoffmann
2016-11-02 1:01 ` [Qemu-devel] " Jike Song
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=1477517366-27871-16-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
Powered by JetHome