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 2BEAEC7115C for ; Wed, 25 Jun 2025 13:19:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C09E58D000E; Wed, 25 Jun 2025 09:19:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BB99B8D0001; Wed, 25 Jun 2025 09:19:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A5C148D000E; Wed, 25 Jun 2025 09:19:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 917B88D0001 for ; Wed, 25 Jun 2025 09:19:49 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 5723CC0363 for ; Wed, 25 Jun 2025 13:19:49 +0000 (UTC) X-FDA: 83593980498.18.1F9A718 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf14.hostedemail.com (Postfix) with ESMTP id C197A100003 for ; Wed, 25 Jun 2025 13:19:47 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=cnTVV8FS; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf14.hostedemail.com: domain of leon@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750857587; a=rsa-sha256; cv=none; b=kgJeW2dGAaj3OpQL6Poxjh6j80vBhSmbrrUMzJrUHRzG0aqV//4eINaXNnYwq/Q5ytMlIc TfguYulJbo9WginfCFa+3MySDIcjwz62gffqtpsDpQgdT8zLBMWShK/yO/ciDDrADQgBUF +pCayNospZOZEfXUBTlehtPX39Mstrw= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=cnTVV8FS; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf14.hostedemail.com: domain of leon@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750857587; 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=BJ1Wn2SVnMm/REOeG/rD6ahVGk6b5fUJAT/ifYboang=; b=BIC6RgBgGQ1fIrLWlPqaTitPCnmBRXEYulwSKMMwiA6KDQIVzNKArF26DtD6Xwu+rxH555 mFCnMFh5ZBM8JiWTfNlkywRWKDHJeRJ8pv586V0oa9lZe5OAlBwB/Yxyt4kr2vt51Kq4KF WKJxrG6eLos4WBriqkWcLnwS94/pgcU= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id E7A366135E; Wed, 25 Jun 2025 13:19:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 592E4C4CEEE; Wed, 25 Jun 2025 13:19:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750857586; bh=s3ricX6F0gnoDUjq0E8NJAWhkL9Tw8iVfIdzfwt4kfE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cnTVV8FSWRgTINDsBkK+iotwyFKWOB54N/KKiBJwLkRN14YJAdgWdogyeUVp7oYnS JQF5cLFJZPI6gXGVsijnU1DUn6cDooA9QKF0JLQlCux/vHk8s/QC9qvVG2ato2Jy9Z /MJsSnpP1evmTTc5iPOEKZtQRZLSiF2QWSP0sWS1zQnw07TNmRSMsyfbaQIy79hYVS 3E2bNHn79TeUYQSZ+MekASQWX0u51qZPgs+5KBB7c/JI61L5WzuQJ2XY8AUNyXt0eY Fo41SZbgHn68WZRUMguZ35VM+86zZejCu/SQgHrRC4PKYvU90HLDEllnWVq8lFzC/8 jwx/UnEJ4Xgzg== 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 4/8] dma-mapping: convert dma_direct_*map_page to be phys_addr_t based Date: Wed, 25 Jun 2025 16:19:01 +0300 Message-ID: <1165abafc7d4bd2eed2cc89480b68111fe6fd13d.1750854543.git.leon@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: zhoo39o84o1w14c5kg5xby57ft8ngnpf X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: C197A100003 X-HE-Tag: 1750857587-339676 X-HE-Meta: U2FsdGVkX1+odDSwXXuN53IzdG/msZn7aY+ySy55ayhETZ7WUMNESOdzNNDRo4vccsLkkHQ5EFWR2Qm5bCv2e3jBBLZOWWyTl0z9e5h8ca2Ti2jz3xIVvroTFu3NLb2VhDC7P6R5EeYPteYWhcN7Mp79CyjHlD44rTdxLBabYyKQ4xM7Af8HyGmiROQ2KyzgwIz9VHm74MoyKGPbdSU2npiTynkljI64o8EvlzFFF+ZUr9CIHCL/nE857N8Lpq/RMIy6g0a2C8H+2I78H28tbwwku2Fwzz6lkaIEBZhCd8nvf/hzK5ZUm4/Dff+tKARm6CpymEbOI3evc8hpQ+csxGDc0qD49nWTScJ+1KH9wf6A+jLyofa8bDOqqemcdwrPUH3T0Nf0vbg1DujnUZ6Xbx47gcWIwShsuN4sQ20f4t/FCWJW09WaQVmdABanLmlrLm+/7B6Woqz0Mw/lgLJrrToutSXRkEu/lFCygvtEy6dKBKVDmQ4ZrVLRzsT7gV3QYyfDo9Zyh/Hrg3cfDe+LmOqnBPdn83XQyKxaYo4xM/zvDCeOlf26TzlOPVPJbI1zoAsLji37doVAi9U13jhSB1MoMD+eM9jRDERhqiC+O87N9vBhgcoShUMf3DV4fHirsTRVn0xu37BNTsu6EZq6mAVi2GlBpPkvql+lA8DYBVhDCYCjom7/TC7nFa84NLJ1S0lpMbUTUxTiNldtwopfp4vvOAdUmkcKZJia1zrYFvvR0bH45GxJyxD2Jb8a/8KqyZYo3lqYSQLVdzd253EqOnIPCinBInH9pKGsXGsJk3sf9c5wQCF5KG4jNGwl+tyKnsX3ylK2nMHwcDYTN1yUSoa7LIeu+2kM/9Wdvt5QFKx7yauA2w/oFgv7To4t8gZ9ZoZVsSL6p/sDdn7OV8dgLqGbgj+/HCUZzEbsKOus7Q/qhjdSp97aIbB2duQ1QA59ZoxNTNQ5+1IQP1ENfB2 hwb0kpNc ZHDqr36WnwL2ZPJdpSTLRVLstT22HyiHX3VDcG2gVCtAR9sxe8HLOZXlVMzKxuEDWQKCSSja0XlW07ydCqKebiwC1ctL+ktrKleCeRGiuBiuOCrR50cl1iKpTr6cBcZoL4vK/QOSjixpfzlbxLcqFsPGR1mVdx4Z0raUkxqn5mOdAYqnwpR53vb8KlvrjUNQu5yiwGmmFaUznWGhmF5evmSHfeEUnRCmRSdaPXmqhpTIYfdpw0n9+l6b1xJrGMJoxWSnBQfk/g0UBHqlcX/p4F4Pxiw== 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 Convert the DMA direct mapping functions to accept physical addresses directly instead of page+offset parameters. The functions were already operating on physical addresses internally, so this change eliminates the redundant page-to-physical conversion at the API boundary. The functions dma_direct_map_page() and dma_direct_unmap_page() are renamed to dma_direct_map_phys() and dma_direct_unmap_phys() respectively, with their calling convention changed from (struct page *page, unsigned long offset) to (phys_addr_t phys). Architecture-specific functions arch_dma_map_page_direct() and arch_dma_unmap_page_direct() are similarly renamed to arch_dma_map_phys_direct() and arch_dma_unmap_phys_direct(). The is_pci_p2pdma_page() checks are replaced with pfn_valid() checks using PHYS_PFN(phys). This provides more accurate validation for non-page backed memory regions without need to have "faked" struct page. Signed-off-by: Leon Romanovsky --- arch/powerpc/kernel/dma-iommu.c | 4 ++-- include/linux/dma-map-ops.h | 8 ++++---- kernel/dma/direct.c | 6 +++--- kernel/dma/direct.h | 13 ++++++------- kernel/dma/mapping.c | 8 ++++---- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/arch/powerpc/kernel/dma-iommu.c b/arch/powerpc/kernel/dma-iommu.c index 4d64a5db50f3..0359ab72cd3b 100644 --- a/arch/powerpc/kernel/dma-iommu.c +++ b/arch/powerpc/kernel/dma-iommu.c @@ -14,7 +14,7 @@ #define can_map_direct(dev, addr) \ ((dev)->bus_dma_limit >= phys_to_dma((dev), (addr))) -bool arch_dma_map_page_direct(struct device *dev, phys_addr_t addr) +bool arch_dma_map_phys_direct(struct device *dev, phys_addr_t addr) { if (likely(!dev->bus_dma_limit)) return false; @@ -24,7 +24,7 @@ bool arch_dma_map_page_direct(struct device *dev, phys_addr_t addr) #define is_direct_handle(dev, h) ((h) >= (dev)->archdata.dma_offset) -bool arch_dma_unmap_page_direct(struct device *dev, dma_addr_t dma_handle) +bool arch_dma_unmap_phys_direct(struct device *dev, dma_addr_t dma_handle) { if (likely(!dev->bus_dma_limit)) return false; diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h index f48e5fb88bd5..71f5b3025415 100644 --- a/include/linux/dma-map-ops.h +++ b/include/linux/dma-map-ops.h @@ -392,15 +392,15 @@ void *arch_dma_set_uncached(void *addr, size_t size); void arch_dma_clear_uncached(void *addr, size_t size); #ifdef CONFIG_ARCH_HAS_DMA_MAP_DIRECT -bool arch_dma_map_page_direct(struct device *dev, phys_addr_t addr); -bool arch_dma_unmap_page_direct(struct device *dev, dma_addr_t dma_handle); +bool arch_dma_map_phys_direct(struct device *dev, phys_addr_t addr); +bool arch_dma_unmap_phys_direct(struct device *dev, dma_addr_t dma_handle); bool arch_dma_map_sg_direct(struct device *dev, struct scatterlist *sg, int nents); bool arch_dma_unmap_sg_direct(struct device *dev, struct scatterlist *sg, int nents); #else -#define arch_dma_map_page_direct(d, a) (false) -#define arch_dma_unmap_page_direct(d, a) (false) +#define arch_dma_map_phys_direct(d, a) (false) +#define arch_dma_unmap_phys_direct(d, a) (false) #define arch_dma_map_sg_direct(d, s, n) (false) #define arch_dma_unmap_sg_direct(d, s, n) (false) #endif diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 24c359d9c879..fa75e3070073 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -453,7 +453,7 @@ void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sgl, if (sg_dma_is_bus_address(sg)) sg_dma_unmark_bus_address(sg); else - dma_direct_unmap_page(dev, sg->dma_address, + dma_direct_unmap_phys(dev, sg->dma_address, sg_dma_len(sg), dir, attrs); } } @@ -476,8 +476,8 @@ int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents, */ break; case PCI_P2PDMA_MAP_NONE: - sg->dma_address = dma_direct_map_page(dev, sg_page(sg), - sg->offset, sg->length, dir, attrs); + sg->dma_address = dma_direct_map_phys(dev, sg_phys(sg), + sg->length, dir, attrs); if (sg->dma_address == DMA_MAPPING_ERROR) { ret = -EIO; goto out_unmap; diff --git a/kernel/dma/direct.h b/kernel/dma/direct.h index d2c0b7e632fc..10c1ba73c482 100644 --- a/kernel/dma/direct.h +++ b/kernel/dma/direct.h @@ -80,22 +80,21 @@ static inline void dma_direct_sync_single_for_cpu(struct device *dev, arch_dma_mark_clean(paddr, size); } -static inline dma_addr_t dma_direct_map_page(struct device *dev, - struct page *page, unsigned long offset, size_t size, - enum dma_data_direction dir, unsigned long attrs) +static inline dma_addr_t dma_direct_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; dma_addr_t dma_addr = phys_to_dma(dev, phys); if (is_swiotlb_force_bounce(dev)) { - if (is_pci_p2pdma_page(page)) + if (!pfn_valid(PHYS_PFN(phys))) return DMA_MAPPING_ERROR; return swiotlb_map(dev, phys, size, dir, attrs); } if (unlikely(!dma_capable(dev, dma_addr, size, true)) || dma_kmalloc_needs_bounce(dev, size, dir)) { - if (is_pci_p2pdma_page(page)) + if (!pfn_valid(PHYS_PFN(phys))) return DMA_MAPPING_ERROR; if (is_swiotlb_active(dev)) return swiotlb_map(dev, phys, size, dir, attrs); @@ -111,7 +110,7 @@ static inline dma_addr_t dma_direct_map_page(struct device *dev, return dma_addr; } -static inline void dma_direct_unmap_page(struct device *dev, dma_addr_t addr, +static inline void dma_direct_unmap_phys(struct device *dev, dma_addr_t addr, size_t size, enum dma_data_direction dir, unsigned long attrs) { phys_addr_t phys = dma_to_phys(dev, addr); diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c index 58482536db9b..80481a873340 100644 --- a/kernel/dma/mapping.c +++ b/kernel/dma/mapping.c @@ -166,8 +166,8 @@ dma_addr_t dma_map_page_attrs(struct device *dev, struct page *page, return DMA_MAPPING_ERROR; if (dma_map_direct(dev, ops) || - arch_dma_map_page_direct(dev, phys + size)) - addr = dma_direct_map_page(dev, page, offset, size, dir, attrs); + arch_dma_map_phys_direct(dev, phys + size)) + addr = dma_direct_map_phys(dev, phys, size, dir, attrs); else if (use_dma_iommu(dev)) addr = iommu_dma_map_phys(dev, phys, size, dir, attrs); else @@ -187,8 +187,8 @@ void dma_unmap_page_attrs(struct device *dev, dma_addr_t addr, size_t size, BUG_ON(!valid_dma_direction(dir)); if (dma_map_direct(dev, ops) || - arch_dma_unmap_page_direct(dev, addr + size)) - dma_direct_unmap_page(dev, addr, size, dir, attrs); + arch_dma_unmap_phys_direct(dev, addr + size)) + dma_direct_unmap_phys(dev, addr, size, dir, attrs); else if (use_dma_iommu(dev)) iommu_dma_unmap_phys(dev, addr, size, dir, attrs); else -- 2.49.0