From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 88E2ECD6E4A for ; Tue, 2 Jun 2026 10:47:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Kbjp/ndSpS2VzxK0fPyovqcC2Ww81EnJ32SRD/dW6zo=; b=2h8cikosUzkKtKGaIBG3nT2hjN 6PgUqFRpBOROXv+nA2VfmkivWKdJyWhzOt7LMqDslwvFTjTjN/kcklGZTuu0qsb266VERW3QLE6Ws DOnH7wn4srlaUfEzpeXd+Vl+6zOIBY2ESMAB1UTzTvnw2mQSTCtFvgkjmIZPncZbxgLpqL3eyyOg0 Exx4es3BJX1upyNUxPzFLPYRji1RVoEU8NGGoqlsX6/QNZ7ebOHWSiXRa24wNn05Hfa/sOsoMJ8n/ Lup36Zy8A1lGJpbbekSpdflv9lhRWoUa4QkKRngP/GvD1/mJTiR9uKdIBlZk/8+lB5OQl6JsHMQjX 3ywRneAg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wUMeX-0000000CoUe-2Vue; Tue, 02 Jun 2026 10:47:21 +0000 Received: from out30-118.freemail.mail.aliyun.com ([115.124.30.118]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wUMeR-0000000CoCD-06ya for linux-arm-kernel@lists.infradead.org; Tue, 02 Jun 2026 10:47:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1780397233; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=Kbjp/ndSpS2VzxK0fPyovqcC2Ww81EnJ32SRD/dW6zo=; b=a4AwY8SOd5fA86G4pqlxQIW42MynrsenGhlNX6yPORhdtaGmvlOPAS+Ly5pZXj2pwXl5JCEpwGUuBaxqbC+P74Ylo88h/QL7PhpKhrpA+WSJErpWoaroq4D48YycreGfyC8CWeSZ7OWum2i4XpJR+7cOm1BMX0AG3qGS9+5Xnx8= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R151e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033037026112;MF=guanghuifeng@linux.alibaba.com;NM=1;PH=DS;RN=28;SR=0;TI=SMTPD_---0X44E97z_1780397229; Received: from VM20241011-104.tbsite.net(mailfrom:guanghuifeng@linux.alibaba.com fp:SMTPD_---0X44E97z_1780397229 cluster:ay36) by smtp.aliyun-inc.com; Tue, 02 Jun 2026 18:47:10 +0800 From: Guanghui Feng To: adrian.larumbe@collabora.com, airlied@gmail.com, alex@shazbot.org, baolu.lu@linux.intel.com, boris.brezillon@collabora.com, dri-devel@lists.freedesktop.org, dwmw2@infradead.org, iommu@lists.linux.dev, jgg@ziepe.ca, joro@8bytes.org, kevin.tian@intel.com, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, liviu.dudau@arm.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, oliver.yang@linux.alibaba.com, robh@kernel.org, robin.murphy@arm.com, shiyu.zsq@linux.alibaba.com, steven.price@arm.com, suravee.suthikulpanit@amd.com, tzimmermann@suse.de, wei.guo.simon@linux.alibaba.com, will@kernel.org, xlpang@linux.alibaba.com Cc: alikernel-developer@linux.alibaba.com Subject: [PATCH v2 22/30] iommu/virtio: implement iova_to_phys_length Date: Tue, 2 Jun 2026 18:46:29 +0800 Message-ID: <20260602104637.1219810-23-guanghuifeng@linux.alibaba.com> X-Mailer: git-send-email 2.43.7 In-Reply-To: <20260602104637.1219810-1-guanghuifeng@linux.alibaba.com> References: <20260531093637.3893199-1-guanghuifeng@linux.alibaba.com> <20260602104637.1219810-1-guanghuifeng@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260602_034715_274730_AB078668 X-CRM114-Status: UNSURE ( 9.34 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Implement iova_to_phys_length for virtio IOMMU driver, returning the actual PTE mapping size. Signed-off-by: Guanghui Feng --- drivers/iommu/virtio-iommu.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c index 587fc13197f1..c90d02cbbfd0 100644 --- a/drivers/iommu/virtio-iommu.c +++ b/drivers/iommu/virtio-iommu.c @@ -912,20 +912,27 @@ static size_t viommu_unmap_pages(struct iommu_domain *domain, unsigned long iova return ret ? 0 : unmapped; } -static phys_addr_t viommu_iova_to_phys(struct iommu_domain *domain, - dma_addr_t iova) +static phys_addr_t viommu_iova_to_phys_length(struct iommu_domain *domain, + dma_addr_t iova, + size_t *mapped_length) { - u64 paddr = 0; + u64 paddr = PHYS_ADDR_MAX; unsigned long flags; struct viommu_mapping *mapping; struct interval_tree_node *node; struct viommu_domain *vdomain = to_viommu_domain(domain); + if (mapped_length) + *mapped_length = 0; + spin_lock_irqsave(&vdomain->mappings_lock, flags); node = interval_tree_iter_first(&vdomain->mappings, iova, iova); if (node) { mapping = container_of(node, struct viommu_mapping, iova); paddr = mapping->paddr + (iova - mapping->iova.start); + if (mapped_length) + *mapped_length = mapping->iova.last - + mapping->iova.start + 1; } spin_unlock_irqrestore(&vdomain->mappings_lock, flags); @@ -1102,7 +1109,7 @@ static const struct iommu_ops viommu_ops = { .attach_dev = viommu_attach_dev, .map_pages = viommu_map_pages, .unmap_pages = viommu_unmap_pages, - .iova_to_phys = viommu_iova_to_phys, + .iova_to_phys_length = viommu_iova_to_phys_length, .flush_iotlb_all = viommu_flush_iotlb_all, .iotlb_sync = viommu_iotlb_sync, .iotlb_sync_map = viommu_iotlb_sync_map, -- 2.43.7