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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 960CCCD6E55 for ; Wed, 3 Jun 2026 15:18:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C717B10FFE7; Wed, 3 Jun 2026 15:18:49 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="eTdkhtot"; dkim-atps=neutral Received: from out30-100.freemail.mail.aliyun.com (out30-100.freemail.mail.aliyun.com [115.124.30.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0501910FFDB for ; Wed, 3 Jun 2026 15:18:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1780499925; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=pzHjh+jwVoHwjthiqpzHxMzEqV3gkG9mTeHPbbZ5Xck=; b=eTdkhtotfzupZhnLVSYSHN8WadSi5dklG85CCAQ3Aw62KY3/khHhe9hqERy87qLif1LiBRhkHHMjrebg3rZtL1PS2eSURsKI7Js9Rupj/fRSTLlqEg4bv/HQsl5XBlzBYU0YdMQLdGpzX98kEQJRpl8/uzVBPBfoN7oW7oNgTyk= X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R851e4; 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_---0X47fR1x_1780499923; Received: from VM20241011-104.tbsite.net(mailfrom:guanghuifeng@linux.alibaba.com fp:SMTPD_---0X47fR1x_1780499923 cluster:ay36) by smtp.aliyun-inc.com; Wed, 03 Jun 2026 23:18:43 +0800 From: Guanghui Feng To: jgg@ziepe.ca Cc: adrian.larumbe@collabora.com, airlied@gmail.com, alex@shazbot.org, alikernel-developer@linux.alibaba.com, baolu.lu@linux.intel.com, boris.brezillon@collabora.com, dri-devel@lists.freedesktop.org, dwmw2@infradead.org, iommu@lists.linux.dev, 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 Subject: [PATCH v3 05/32] iommu/generic_pt: implement iova_to_phys_length Date: Wed, 3 Jun 2026 23:17:37 +0800 Message-ID: <20260603151804.1963871-6-guanghuifeng@linux.alibaba.com> X-Mailer: git-send-email 2.43.7 In-Reply-To: <20260603151804.1963871-1-guanghuifeng@linux.alibaba.com> References: <20260602104637.1219810-1-guanghuifeng@linux.alibaba.com> <20260603151804.1963871-1-guanghuifeng@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Extend the Generic Page Table framework to implement iova_to_phys_length. Use pt_entry_oa_lg2sz() to determine PTE block size. Update IOMMU_PT_DOMAIN_OPS macro to set .iova_to_phys_length. Signed-off-by: Guanghui Feng Acked-by: Shiqiang Zhang Acked-by: Simon Guo --- drivers/iommu/generic_pt/iommu_pt.h | 84 +++++++++++++++++++++-------- include/linux/generic_pt/iommu.h | 13 ++--- 2 files changed, 69 insertions(+), 28 deletions(-) diff --git a/drivers/iommu/generic_pt/iommu_pt.h b/drivers/iommu/generic_pt/iommu_pt.h index dc91fb4e2f61..e362e819ef9c 100644 --- a/drivers/iommu/generic_pt/iommu_pt.h +++ b/drivers/iommu/generic_pt/iommu_pt.h @@ -145,13 +145,21 @@ static inline unsigned int compute_best_pgsize(struct pt_state *pts, pts->range->va, pts->range->last_va, oa); } -static __always_inline int __do_iova_to_phys(struct pt_range *range, void *arg, - unsigned int level, - struct pt_table_p *table, - pt_level_fn_t descend_fn) +struct iova_to_phys_length_data { + pt_oaddr_t phys; + size_t length; +}; + +static __always_inline int __do_iova_to_phys_length(struct pt_range *range, + void *arg, unsigned int level, + struct pt_table_p *table, + pt_level_fn_t descend_fn) { struct pt_state pts = pt_init(range, level, table); - pt_oaddr_t *res = arg; + struct iova_to_phys_length_data *data = arg; + unsigned int entry_lg2sz; + size_t entry_sz; + pt_oaddr_t expected_oa; switch (pt_load_single_entry(&pts)) { case PT_ENTRY_EMPTY: @@ -159,45 +167,77 @@ static __always_inline int __do_iova_to_phys(struct pt_range *range, void *arg, case PT_ENTRY_TABLE: return pt_descend(&pts, arg, descend_fn); case PT_ENTRY_OA: - *res = pt_entry_oa_exact(&pts); - return 0; + break; } - return -ENOENT; + + data->phys = pt_entry_oa_exact(&pts); + entry_lg2sz = pt_entry_oa_lg2sz(&pts); + entry_sz = log2_to_int(entry_lg2sz); + + /* Start with the full mapping size of the first entry */ + data->length = entry_sz; + + /* Accumulate subsequent physically contiguous entries */ + expected_oa = pt_entry_oa(&pts) + entry_sz; + pts.end_index = log2_to_int(pt_num_items_lg2(&pts)); + pt_next_entry(&pts); + + while (pts.index < pts.end_index) { + pt_load_entry(&pts); + if (pts.type != PT_ENTRY_OA) + break; + if (pt_entry_oa_lg2sz(&pts) != entry_lg2sz) + break; + if (pt_entry_oa(&pts) != expected_oa) + break; + data->length += entry_sz; + expected_oa += entry_sz; + pt_next_entry(&pts); + } + + return 0; } -PT_MAKE_LEVELS(__iova_to_phys, __do_iova_to_phys); +PT_MAKE_LEVELS(__iova_to_phys_length, __do_iova_to_phys_length); /** - * iova_to_phys() - Return the output address for the given IOVA + * iova_to_phys_length() - Translate IOVA returning phys and contiguous length * @domain: Table to query * @iova: IO virtual address to query + * @mapped_length: Output for the total contiguous mapped length in bytes * - * Determine the output address from the given IOVA. @iova may have any - * alignment, the returned physical will be adjusted with any sub page offset. + * Walk the IOMMU page table to translate @iova to a physical address while + * also returning the total contiguous physically mapped length through + * @mapped_length. The function accumulates consecutive page table entries that + * are physically contiguous, so callers can determine the full contiguous + * mapping extent with a single call. * * Context: The caller must hold a read range lock that includes @iova. * - * Return: 0 if there is no translation for the given iova. + * Return: The physical address, or PHYS_ADDR_MAX if there is no translation. */ -phys_addr_t DOMAIN_NS(iova_to_phys)(struct iommu_domain *domain, - dma_addr_t iova) +phys_addr_t DOMAIN_NS(iova_to_phys_length)(struct iommu_domain *domain, + dma_addr_t iova, + size_t *mapped_length) { struct pt_iommu *iommu_table = container_of(domain, struct pt_iommu, domain); struct pt_range range; - pt_oaddr_t res; + struct iova_to_phys_length_data data; int ret; ret = make_range(common_from_iommu(iommu_table), &range, iova, 1); if (ret) - return ret; + return PHYS_ADDR_MAX; - ret = pt_walk_range(&range, __iova_to_phys, &res); - /* PHYS_ADDR_MAX would be a better error code */ + ret = pt_walk_range(&range, __iova_to_phys_length, &data); if (ret) - return 0; - return res; + return PHYS_ADDR_MAX; + + if (mapped_length) + *mapped_length = data.length; + return data.phys; } -EXPORT_SYMBOL_NS_GPL(DOMAIN_NS(iova_to_phys), "GENERIC_PT_IOMMU"); +EXPORT_SYMBOL_NS_GPL(DOMAIN_NS(iova_to_phys_length), "GENERIC_PT_IOMMU"); struct pt_iommu_dirty_args { struct iommu_dirty_bitmap *dirty; diff --git a/include/linux/generic_pt/iommu.h b/include/linux/generic_pt/iommu.h index dd0edd02a48a..859b853e9dc7 100644 --- a/include/linux/generic_pt/iommu.h +++ b/include/linux/generic_pt/iommu.h @@ -249,8 +249,9 @@ struct pt_iommu_cfg { /* Generate the exported function signatures from iommu_pt.h */ #define IOMMU_PROTOTYPES(fmt) \ - phys_addr_t pt_iommu_##fmt##_iova_to_phys(struct iommu_domain *domain, \ - dma_addr_t iova); \ + phys_addr_t pt_iommu_##fmt##_iova_to_phys_length( \ + struct iommu_domain *domain, dma_addr_t iova, \ + size_t *mapped_length); \ int pt_iommu_##fmt##_read_and_clear_dirty( \ struct iommu_domain *domain, unsigned long iova, size_t size, \ unsigned long flags, struct iommu_dirty_bitmap *dirty); \ @@ -267,11 +268,11 @@ struct pt_iommu_cfg { IOMMU_PROTOTYPES(fmt) /* - * A driver uses IOMMU_PT_DOMAIN_OPS to populate the iommu_domain_ops for the - * iommu_pt + * A driver uses IOMMU_PT_DOMAIN_OPS to populate the iommu_domain_ops for + * the iommu_pt */ -#define IOMMU_PT_DOMAIN_OPS(fmt) \ - .iova_to_phys = &pt_iommu_##fmt##_iova_to_phys +#define IOMMU_PT_DOMAIN_OPS(fmt) \ + .iova_to_phys_length = &pt_iommu_##fmt##_iova_to_phys_length #define IOMMU_PT_DIRTY_OPS(fmt) \ .read_and_clear_dirty = &pt_iommu_##fmt##_read_and_clear_dirty -- 2.43.7