From patchwork Mon Oct 17 21:22:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirti Wankhede X-Patchwork-Id: 683423 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3syWWl6lRVz9sR9 for ; Tue, 18 Oct 2016 08:27:47 +1100 (AEDT) Received: from localhost ([::1]:36092 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwFRg-00043L-H2 for incoming@patchwork.ozlabs.org; Mon, 17 Oct 2016 17:27:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwFLd-0007KY-I0 for qemu-devel@nongnu.org; Mon, 17 Oct 2016 17:21:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwFLY-000430-KS for qemu-devel@nongnu.org; Mon, 17 Oct 2016 17:21:29 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:8490) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bwFLY-000427-80 for qemu-devel@nongnu.org; Mon, 17 Oct 2016 17:21:24 -0400 Received: from hqnvupgp08.nvidia.com (Not Verified[216.228.121.13]) by hqemgate15.nvidia.com id ; Mon, 17 Oct 2016 14:21:06 -0700 Received: from HQMAIL106.nvidia.com ([172.20.13.39]) by hqnvupgp08.nvidia.com (PGP Universal service); Mon, 17 Oct 2016 14:14:19 -0700 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Mon, 17 Oct 2016 14:14:19 -0700 Received: from HQMAIL103.nvidia.com (172.20.187.11) by HQMAIL106.nvidia.com (172.18.146.12) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Mon, 17 Oct 2016 21:21:22 +0000 Received: from kwankhede-dev.nvidia.com (172.20.13.39) by HQMAIL103.nvidia.com (172.20.187.11) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Mon, 17 Oct 2016 21:21:19 +0000 From: Kirti Wankhede To: , , , Date: Tue, 18 Oct 2016 02:52:05 +0530 Message-ID: <1476739332-4911-6-git-send-email-kwankhede@nvidia.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1476739332-4911-1-git-send-email-kwankhede@nvidia.com> References: <1476739332-4911-1-git-send-email-kwankhede@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 216.228.121.64 Subject: [Qemu-devel] [PATCH v9 05/12] vfio: Introduce common function to add capabilities X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jike.song@intel.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, kevin.tian@intel.com, qemu-devel@nongnu.org, Kirti Wankhede , bjsdjshi@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Signed-off-by: Neo Jia 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);