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: 702875 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 3tXclx3k0pz9sQw for ; Tue, 6 Dec 2016 08:07:41 +1100 (AEDT) Received: from localhost ([::1]:44335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cE0U4-00079b-QA for incoming@patchwork.ozlabs.org; Mon, 05 Dec 2016 16:07:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cE0TD-0006hR-KE for qemu-devel@nongnu.org; Mon, 05 Dec 2016 16:06:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cE0T8-00070f-MR for qemu-devel@nongnu.org; Mon, 05 Dec 2016 16:06:43 -0500 Received: from hqemgate16.nvidia.com ([216.228.121.65]:3697) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cE0T8-00070I-G5 for qemu-devel@nongnu.org; Mon, 05 Dec 2016 16:06:38 -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: , , , 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 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 216.228.121.65 Subject: [Qemu-devel] [PATCH 1/1] vfio iommu type1: set size to PAGE_SIZE while looking for iova in dma list 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: Kirti Wankhede , qemu-devel@nongnu.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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;