Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754090AbcKULEh (ORCPT ); Mon, 21 Nov 2016 06:04:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38109 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752931AbcKULEf (ORCPT ); Mon, 21 Nov 2016 06:04:35 -0500 Subject: Re: [PATCH v14 14/22] vfio_pci: Update vfio_pci to use vfio_info_add_capability() To: Kirti Wankhede , alex.williamson@redhat.com, pbonzini@redhat.com, kraxel@redhat.com, cjia@nvidia.com References: <1479329194-10247-1-git-send-email-kwankhede@nvidia.com> <1479329194-10247-15-git-send-email-kwankhede@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 From: Auger Eric Message-ID: Date: Mon, 21 Nov 2016 12:04:30 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <1479329194-10247-15-git-send-email-kwankhede@nvidia.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 21 Nov 2016 11:04:34 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3429 Lines: 113 Hi, On 16/11/2016 21:46, Kirti Wankhede wrote: > Update msix_sparse_mmap_cap() to use vfio_info_add_capability() > Update region type capability to use vfio_info_add_capability() > > Signed-off-by: Kirti Wankhede > Signed-off-by: Neo Jia > Change-Id: I52bb28c7875a6da5a79ddad1843e6088aff58a45 > --- > drivers/vfio/pci/vfio_pci.c | 49 ++++++++++++++++++--------------------------- > 1 file changed, 19 insertions(+), 30 deletions(-) > > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c > index 031bc08d000d..03b5434f4d5b 100644 > --- a/drivers/vfio/pci/vfio_pci.c > +++ b/drivers/vfio/pci/vfio_pci.c > @@ -558,10 +558,9 @@ static int vfio_pci_for_each_slot_or_bus(struct pci_dev *pdev, > static int msix_sparse_mmap_cap(struct vfio_pci_device *vdev, > struct vfio_info_cap *caps) > { > - struct vfio_info_cap_header *header; > struct vfio_region_info_cap_sparse_mmap *sparse; > size_t end, size; > - int nr_areas = 2, i = 0; > + int nr_areas = 2, i = 0, ret; > > end = pci_resource_len(vdev->pdev, vdev->msix_bar); > > @@ -572,13 +571,10 @@ static int msix_sparse_mmap_cap(struct vfio_pci_device *vdev, > > size = sizeof(*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 = kzalloc(size, GFP_KERNEL); > + if (!sparse) > + return -ENOMEM; > > - sparse = container_of(header, > - struct vfio_region_info_cap_sparse_mmap, header); > sparse->nr_areas = nr_areas; > > if (vdev->msix_offset & PAGE_MASK) { > @@ -594,26 +590,11 @@ static int msix_sparse_mmap_cap(struct vfio_pci_device *vdev, > i++; > } > > - return 0; > -} > - > -static int region_type_cap(struct vfio_pci_device *vdev, > - struct vfio_info_cap *caps, > - unsigned int type, unsigned int subtype) > -{ > - struct vfio_info_cap_header *header; > - struct vfio_region_info_cap_type *cap; > - > - header = vfio_info_cap_add(caps, sizeof(*cap), > - VFIO_REGION_INFO_CAP_TYPE, 1); > - if (IS_ERR(header)) > - return PTR_ERR(header); > - > - cap = container_of(header, struct vfio_region_info_cap_type, header); > - cap->type = type; > - cap->subtype = subtype; > + ret = vfio_info_add_capability(caps, VFIO_REGION_INFO_CAP_SPARSE_MMAP, > + sparse); > + kfree(sparse); > > - return 0; > + return ret; > } > > int vfio_pci_register_dev_region(struct vfio_pci_device *vdev, > @@ -752,6 +733,9 @@ static long vfio_pci_ioctl(void *device_data, > > break; > default: > + { > + struct vfio_region_info_cap_type cap_type; > + > if (info.index >= > VFIO_PCI_NUM_REGIONS + vdev->num_regions) > return -EINVAL; > @@ -762,11 +746,16 @@ static long vfio_pci_ioctl(void *device_data, > info.size = vdev->region[i].size; > info.flags = vdev->region[i].flags; > > - ret = region_type_cap(vdev, &caps, > - vdev->region[i].type, > - vdev->region[i].subtype); > + cap_type.type = vdev->region[i].type; > + cap_type.subtype = vdev->region[i].subtype; > + > + ret = vfio_info_add_capability(&caps, > + VFIO_REGION_INFO_CAP_TYPE, > + &cap_type); > if (ret) > return ret; > + nit: spare empty line Reviewed-by: Eric Auger Eric > + } > } > > if (caps.size) { >