From patchwork Mon Dec 5 21:08:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirti Wankhede X-Patchwork-Id: 9461489 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B83426022E for ; Mon, 5 Dec 2016 21:06:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A322227FBE for ; Mon, 5 Dec 2016 21:06:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 95CF12807E; Mon, 5 Dec 2016 21:06:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20FFC27FBE for ; Mon, 5 Dec 2016 21:06:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751884AbcLEVGh (ORCPT ); Mon, 5 Dec 2016 16:06:37 -0500 Received: from hqemgate16.nvidia.com ([216.228.121.65]:3696 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751373AbcLEVGg (ORCPT ); Mon, 5 Dec 2016 16:06:36 -0500 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com id ; Mon, 05 Dec 2016 13:06:47 -0800 Received: from HQMAIL107.nvidia.com ([172.20.13.39]) by hqpgpgate101.nvidia.com (PGP Universal service); Mon, 05 Dec 2016 13:06:34 -0800 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Mon, 05 Dec 2016 13:06:34 -0800 Received: from HQMAIL108.nvidia.com (172.18.146.13) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Mon, 5 Dec 2016 21:06:35 +0000 Received: from kwankhede-dev.nvidia.com (172.20.13.39) by HQMAIL108.nvidia.com (172.18.146.13) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Mon, 5 Dec 2016 21:06:31 +0000 From: Kirti Wankhede To: , , , CC: , , , Kirti Wankhede Subject: [PATCH 1/1] vfio iommu type1: set size to PAGE_SIZE while looking for iova in dma list Date: Tue, 6 Dec 2016 02:38:01 +0530 Message-ID: <1480972081-773-1-git-send-email-kwankhede@nvidia.com> X-Mailer: git-send-email 2.7.0 X-NVConfidentiality: public MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In the functions of pin_pages/unpin_pages from mdev vendor driver, vfio_find_dma() should be called with size as PAGE_SIZE instead of 0. vfio_find_dma() searches for the range in dma_list. In vfio_dma_do_unmap(), vfio_find_dma() when used to look for start address of unmap->iova, size should be 1, not 0. Otherwise vfio_find_dma() returns NULL. Signed-off-by: Kirti Wankhede Signed-off-by: Neo Jia Change-Id: Iee6fd45441c342b5e8626087046b2e0075d19a08 --- drivers/vfio/vfio_iommu_type1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index a28fbddb505c..023fba7b8d5a 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -581,7 +581,7 @@ static int vfio_iommu_type1_pin_pages(void *iommu_data, struct vfio_pfn *vpfn; iova = user_pfn[i] << PAGE_SHIFT; - dma = vfio_find_dma(iommu, iova, 0); + dma = vfio_find_dma(iommu, iova, PAGE_SIZE); if (!dma) { ret = -EINVAL; goto pin_unwind; @@ -622,7 +622,7 @@ pin_unwind: dma_addr_t iova; iova = user_pfn[j] << PAGE_SHIFT; - dma = vfio_find_dma(iommu, iova, 0); + dma = vfio_find_dma(iommu, iova, PAGE_SIZE); vfio_unpin_page_external(dma, iova, do_accounting); phys_pfn[j] = 0; } @@ -659,7 +659,7 @@ static int vfio_iommu_type1_unpin_pages(void *iommu_data, dma_addr_t iova; iova = user_pfn[i] << PAGE_SHIFT; - dma = vfio_find_dma(iommu, iova, 0); + dma = vfio_find_dma(iommu, iova, PAGE_SIZE); if (!dma) goto unpin_exit; vfio_unpin_page_external(dma, iova, do_accounting); @@ -826,7 +826,7 @@ again: * mappings within the range. */ if (iommu->v2) { - dma = vfio_find_dma(iommu, unmap->iova, 0); + dma = vfio_find_dma(iommu, unmap->iova, 1); if (dma && dma->iova != unmap->iova) { ret = -EINVAL; goto unlock;