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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43735C7EE2A for ; Wed, 25 Jun 2025 13:19:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D692B6B009A; Wed, 25 Jun 2025 09:19:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D18606B009B; Wed, 25 Jun 2025 09:19:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C07FD6B00C0; Wed, 25 Jun 2025 09:19:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id AD9A86B009A for ; Wed, 25 Jun 2025 09:19:33 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 6133BB87DB for ; Wed, 25 Jun 2025 13:19:33 +0000 (UTC) X-FDA: 83593979826.15.D3E815B Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf25.hostedemail.com (Postfix) with ESMTP id 87AC1A0013 for ; Wed, 25 Jun 2025 13:19:31 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=NnBSLNRQ; spf=pass (imf25.hostedemail.com: domain of leon@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750857571; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Fuq/EXA4R2mOYUr8QDY0zcJTyX7n7zR8XDaMk9x/6cc=; b=xlRDYxd+6KIvoLQ1y9eHaV8hWfl6gksPYIhZLrwK1Jl0NR6n58cj+4rI7bA1XWVI9SGaD5 U0evW/0DJzApaz5fymXAYtU2DL1LmuRiapEO969WXyXSElolrJNlqUf3YyZVkA5091u5SC uG8ANBklPMynRlLMfPkR4Q3E1E33MSU= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=NnBSLNRQ; spf=pass (imf25.hostedemail.com: domain of leon@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750857571; a=rsa-sha256; cv=none; b=jQKi18gajLjx5DJohrHOVOT7iWb1hADuHH8gE7hdu9oIbMbfv0K6Gbje5OZb6UNwoi8OF/ QP7wOmGt/hDxYu7ld7tcdZDcpN8VxQHPyR32lbuYWLaydvbwgh2lrsVPwBtuI/kpLlj6fG dJiesLn4PcLEf2N29wxYrsJy/nPt8zg= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 28E3F5C5A14; Wed, 25 Jun 2025 13:17:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D15CC4CEF0; Wed, 25 Jun 2025 13:19:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750857570; bh=SIZyAYw6EeJesl2xvRvX+slrHOcMXE4gqSctQlG7kE4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NnBSLNRQ1YLXOoO/E/CtdZLkiZlzE9zjiZ5IARF6vGB6kZNuHX7J5xLN4djIRQbNL qw9CBTxf/3FYOin9KEig7uak+ZG5deOQ8Ine5/YMX7oaqS2cagSh7C/FPGykfb+TDB tZNfJs7TLQa3KJjnOUd3GnjDC/8XKvIt7V5BUhZcv2wDUM2XEbhTqrGRaQS2/xwb2z 2Zhw0LkFdhs31KYZQ+U96Pij141InBpEqARNUpAPzW5WpbM+k9pc3es1gZ9M3GW3yZ Ag6gcmzzAqrR6ob1Gqbr8jGx0rDNJvZZZC8c8QDYAVw6ie4w77hZf4gLrOg9u3PNAi uOKjYgR8CAliw== From: Leon Romanovsky To: Marek Szyprowski Cc: Leon Romanovsky , Christoph Hellwig , Jonathan Corbet , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Robin Murphy , Joerg Roedel , Will Deacon , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Alexander Potapenko , Marco Elver , Dmitry Vyukov , Masami Hiramatsu , Mathieu Desnoyers , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Andrew Morton , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, iommu@lists.linux.dev, virtualization@lists.linux.dev, kasan-dev@googlegroups.com, linux-trace-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 3/8] iommu/dma: rename iommu_dma_*map_page to iommu_dma_*map_phys Date: Wed, 25 Jun 2025 16:19:00 +0300 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 87AC1A0013 X-Stat-Signature: kqwfjzzactqfq8rekui1hkmy6eomsm9n X-Rspam-User: X-HE-Tag: 1750857571-555470 X-HE-Meta: U2FsdGVkX190wPT1diN4yiCO8fmK7Z9Eq1CBD4wEFrg6fu+usq8RMsFYU/MRLZCA3Q2Uynr+IRHgP+987yG4Goip8KOhudhcnBNwiY3MmOnJkWoPSmQZMZaUEDTAHKXKoDo34/SO6BUqMw2N1lxn46vqrTNtX0NzGRaUqwB6J1vwDBA2zKuyPRPY+wRIlMv/johvxC01f2bpLsVSRq+6F9hD4d8Zqa7ehwU8F1Ddi1oGDQEKOaQJ84xoc9IeGMALsNnOIiScs5qZNRzqfTuSCx5VsJfW7hj/uZPDFLnNFoHdTQlI0+HMxay6ZY2tmzgkZdzB3QV5ECfxK3TBelHIl5ZlvhWNjxXyA0hY5EZv5MUGqjyZkpAjdb3wIQEteZZ/Xk/1jWgkTKbp8aYtvqKDIOu6AKfwvZKSZaAzBA31/J7xndsivJGaOYDxJ/T5sjQLHrDyJnJ/6hMlQ1hApBkPr1fRS/ZV2gVRA/xhJIXiS6ABngcQXMHNmMXtzhoBqF8wVmziaxN0oX1NI0Jq/RTQgyTsludVOOeQNZeFo0sXSxfiIQN7z5U/HBRwuXvL5qM2R36moaIg/Tvg+U2deJQIBbber4BDIigKiGVeY+IVNZ3z9aIv1YDtCGQCAalPy7rZ1HvixwpMssrBJPR5pFs36VXbEJ89fZjor1Fw7eFV4S3dQPTtwKU8EUdFSmOX49F2MkYx4CAAqu8Yu8BYtfVIJjTQhjAkiKVBMNyG5FZTIIOtlock7JMhthAhlr2emU455Itau2bKg8sbGu/njX4BwutBqz1kV4bfruh1O8kvUH1O7UDr67KdiekQ3DXQmVIkaQSXn2lj+YMboHDge1+6nxY4MQjAmOYmqBTjqeckq92oDDmjl4nuP/ac6MQ6QixOJjk5YV1CGmyoEA7ni3DFZneso0sGk3/5FTtz4ZheYf8smm0DI2FW167Wtgbf8Iwwqwbl65jbhMMEOU2u7xE kXBdJDkx Svp3At1ff4RgEjjph1qN0ivlujvhFR4A1StZI/OBPp/XnmlMN7s7WqPzrw/z97O7q8GjBZHH33KWuOCJHXNXnSRDr8nMeG3IqMW/+ffCwaUEWuTFVpB2OS32YepqXbgLBiJJJyHl+0nFIXqZCmUkF2n130AGO5EBS6WDtJC+Fn84Dl73b8AHBdIBJm+KUR18g4Ax/rzneEiN2stddMfp/gos0GxB27jOPqOzLvJR7qALT+6A914b7rtem3d6oNrlsePoOibxAXV1X+qzQ4WD+QBEvRg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Leon Romanovsky Rename the IOMMU DMA mapping functions to better reflect their actual calling convention. The functions iommu_dma_map_page() and iommu_dma_unmap_page() are renamed to iommu_dma_map_phys() and iommu_dma_unmap_phys() respectively, as they already operate on physical addresses rather than page structures. The calling convention changes from accepting (struct page *page, unsigned long offset) to (phys_addr_t phys), which eliminates the need for page-to-physical address conversion within the functions. This renaming prepares for the broader DMA API conversion from page-based to physical address-based mapping throughout the kernel. All callers are updated to pass physical addresses directly, including dma_map_page_attrs(), scatterlist mapping functions, and DMA page allocation helpers. The change simplifies the code by removing the page_to_phys() + offset calculation that was previously done inside the IOMMU functions. Signed-off-by: Leon Romanovsky --- drivers/iommu/dma-iommu.c | 14 ++++++-------- include/linux/iommu-dma.h | 7 +++---- kernel/dma/mapping.c | 4 ++-- kernel/dma/ops_helpers.c | 6 +++--- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index ea2ef53bd4fe..cd4bc22efa96 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -1190,11 +1190,9 @@ static inline size_t iova_unaligned(struct iova_domain *iovad, phys_addr_t phys, return iova_offset(iovad, phys | size); } -dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page, - unsigned long offset, size_t size, enum dma_data_direction dir, - unsigned long attrs) +dma_addr_t iommu_dma_map_phys(struct device *dev, phys_addr_t phys, size_t size, + enum dma_data_direction dir, unsigned long attrs) { - phys_addr_t phys = page_to_phys(page) + offset; bool coherent = dev_is_dma_coherent(dev); int prot = dma_info_to_prot(dir, coherent, attrs); struct iommu_domain *domain = iommu_get_dma_domain(dev); @@ -1222,7 +1220,7 @@ dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page, return iova; } -void iommu_dma_unmap_page(struct device *dev, dma_addr_t dma_handle, +void iommu_dma_unmap_phys(struct device *dev, dma_addr_t dma_handle, size_t size, enum dma_data_direction dir, unsigned long attrs) { struct iommu_domain *domain = iommu_get_dma_domain(dev); @@ -1341,7 +1339,7 @@ static void iommu_dma_unmap_sg_swiotlb(struct device *dev, struct scatterlist *s int i; for_each_sg(sg, s, nents, i) - iommu_dma_unmap_page(dev, sg_dma_address(s), + iommu_dma_unmap_phys(dev, sg_dma_address(s), sg_dma_len(s), dir, attrs); } @@ -1354,8 +1352,8 @@ static int iommu_dma_map_sg_swiotlb(struct device *dev, struct scatterlist *sg, sg_dma_mark_swiotlb(sg); for_each_sg(sg, s, nents, i) { - sg_dma_address(s) = iommu_dma_map_page(dev, sg_page(s), - s->offset, s->length, dir, attrs); + sg_dma_address(s) = iommu_dma_map_phys(dev, sg_phys(s), + s->length, dir, attrs); if (sg_dma_address(s) == DMA_MAPPING_ERROR) goto out_unmap; sg_dma_len(s) = s->length; diff --git a/include/linux/iommu-dma.h b/include/linux/iommu-dma.h index 508beaa44c39..485bdffed988 100644 --- a/include/linux/iommu-dma.h +++ b/include/linux/iommu-dma.h @@ -21,10 +21,9 @@ static inline bool use_dma_iommu(struct device *dev) } #endif /* CONFIG_IOMMU_DMA */ -dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page, - unsigned long offset, size_t size, enum dma_data_direction dir, - unsigned long attrs); -void iommu_dma_unmap_page(struct device *dev, dma_addr_t dma_handle, +dma_addr_t iommu_dma_map_phys(struct device *dev, phys_addr_t phys, size_t size, + enum dma_data_direction dir, unsigned long attrs); +void iommu_dma_unmap_phys(struct device *dev, dma_addr_t dma_handle, size_t size, enum dma_data_direction dir, unsigned long attrs); int iommu_dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, enum dma_data_direction dir, unsigned long attrs); diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c index fe1f0da6dc50..58482536db9b 100644 --- a/kernel/dma/mapping.c +++ b/kernel/dma/mapping.c @@ -169,7 +169,7 @@ dma_addr_t dma_map_page_attrs(struct device *dev, struct page *page, arch_dma_map_page_direct(dev, phys + size)) addr = dma_direct_map_page(dev, page, offset, size, dir, attrs); else if (use_dma_iommu(dev)) - addr = iommu_dma_map_page(dev, page, offset, size, dir, attrs); + addr = iommu_dma_map_phys(dev, phys, size, dir, attrs); else addr = ops->map_page(dev, page, offset, size, dir, attrs); kmsan_handle_dma(page, offset, size, dir); @@ -190,7 +190,7 @@ void dma_unmap_page_attrs(struct device *dev, dma_addr_t addr, size_t size, arch_dma_unmap_page_direct(dev, addr + size)) dma_direct_unmap_page(dev, addr, size, dir, attrs); else if (use_dma_iommu(dev)) - iommu_dma_unmap_page(dev, addr, size, dir, attrs); + iommu_dma_unmap_phys(dev, addr, size, dir, attrs); else ops->unmap_page(dev, addr, size, dir, attrs); trace_dma_unmap_phys(dev, addr, size, dir, attrs); diff --git a/kernel/dma/ops_helpers.c b/kernel/dma/ops_helpers.c index 9afd569eadb9..6f9d604d9d40 100644 --- a/kernel/dma/ops_helpers.c +++ b/kernel/dma/ops_helpers.c @@ -72,8 +72,8 @@ struct page *dma_common_alloc_pages(struct device *dev, size_t size, return NULL; if (use_dma_iommu(dev)) - *dma_handle = iommu_dma_map_page(dev, page, 0, size, dir, - DMA_ATTR_SKIP_CPU_SYNC); + *dma_handle = iommu_dma_map_phys(dev, page_to_phys(page), size, + dir, DMA_ATTR_SKIP_CPU_SYNC); else *dma_handle = ops->map_page(dev, page, 0, size, dir, DMA_ATTR_SKIP_CPU_SYNC); @@ -92,7 +92,7 @@ void dma_common_free_pages(struct device *dev, size_t size, struct page *page, const struct dma_map_ops *ops = get_dma_ops(dev); if (use_dma_iommu(dev)) - iommu_dma_unmap_page(dev, dma_handle, size, dir, + iommu_dma_unmap_phys(dev, dma_handle, size, dir, DMA_ATTR_SKIP_CPU_SYNC); else if (ops->unmap_page) ops->unmap_page(dev, dma_handle, size, dir, -- 2.49.0