From nobody Wed Oct 8 19:07:26 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D9501263F44; Wed, 25 Jun 2025 13:19:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750857560; cv=none; b=cuA5Gn/ZyTW0uO9bkJA99oHc/Y+XJklGa4GOXc2gRLlnmdDpPnsMCqeAuaBMQQ93gcGVJD9pW6c3SCsLd57xnvJfQsNqcEH03Ec4b9x7IYKHc/lhI92ITg7lYAPbiVop6+5UACNat8S/WYk8ppEJ31eyVSDnQOkFqe2WtaVmO7U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750857560; c=relaxed/simple; bh=NIDOlrCq60G6a/TA90rMLwhsxxCVvA6QvqpyNPRE6dE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=olhPSPUHscUESeLU/3bIw4TJTAIrkjRSAFJkBYNiLZby5VLPDd1MDmdNV8qzRXYUf8n5C3xjILBBlJAFJKPlmNB0mJyHLRdQCxwv92lIXfw1GT0Zq/cE07m6EwOMgcvoctAbLTGJ5pNBDJYum6gYOKghKsKOenfPQyG13VeGzxo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=achChjnk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="achChjnk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC7D6C4CEEA; Wed, 25 Jun 2025 13:19:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750857559; bh=NIDOlrCq60G6a/TA90rMLwhsxxCVvA6QvqpyNPRE6dE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=achChjnkCeieBOqf5CqoBu/vsW6+Iyvm5O0EDsXQ/4WO6NnY2BWu6KsOYMhHd/b3X ykPEPKLOIU8t7AcKOjSUpOQimPLcx7vixG1d3xze0/zwlp3U+4OQSxQtWGPvlQycjQ OWS915IcqbbkKJq4IIw7obupxEk8T+QN4miTbqHT1ZX4aq8+UqMQuBHFcO8ZovUCP5 3LmjkJboG1YrX9yEsbKP+AnPW8zgwjcqP5YUZmv7ZhOXSoo2qOSl9tqLlKAYEWkNY9 YWXQvn9eVjvK6dYEkHbf3o3ybAz3E7j9r8iOzilczLmtkkcegtOG2I10VMYL5VUYda 3gQ7OgAZKeaLQ== 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 2/8] dma-mapping: rename trace_dma_*map_page to trace_dma_*map_phys Date: Wed, 25 Jun 2025 16:18:59 +0300 Message-ID: <23ef1117e09e3ca8c51ef2700e902f340856b8b0.1750854543.git.leon@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Leon Romanovsky As a preparation for following map_page -> map_phys API conversion, let's rename trace_dma_*map_page() to be trace_dma_*map_phys(). Signed-off-by: Leon Romanovsky --- include/trace/events/dma.h | 4 ++-- kernel/dma/mapping.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/trace/events/dma.h b/include/trace/events/dma.h index d8ddc27b6a7c..c77d478b6deb 100644 --- a/include/trace/events/dma.h +++ b/include/trace/events/dma.h @@ -71,7 +71,7 @@ DEFINE_EVENT(dma_map, name, \ size_t size, enum dma_data_direction dir, unsigned long attrs), \ TP_ARGS(dev, phys_addr, dma_addr, size, dir, attrs)) =20 -DEFINE_MAP_EVENT(dma_map_page); +DEFINE_MAP_EVENT(dma_map_phys); DEFINE_MAP_EVENT(dma_map_resource); =20 DECLARE_EVENT_CLASS(dma_unmap, @@ -109,7 +109,7 @@ DEFINE_EVENT(dma_unmap, name, \ enum dma_data_direction dir, unsigned long attrs), \ TP_ARGS(dev, addr, size, dir, attrs)) =20 -DEFINE_UNMAP_EVENT(dma_unmap_page); +DEFINE_UNMAP_EVENT(dma_unmap_phys); DEFINE_UNMAP_EVENT(dma_unmap_resource); =20 DECLARE_EVENT_CLASS(dma_alloc_class, diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c index 4c1dfbabb8ae..fe1f0da6dc50 100644 --- a/kernel/dma/mapping.c +++ b/kernel/dma/mapping.c @@ -173,7 +173,7 @@ dma_addr_t dma_map_page_attrs(struct device *dev, struc= t page *page, else addr =3D ops->map_page(dev, page, offset, size, dir, attrs); kmsan_handle_dma(page, offset, size, dir); - trace_dma_map_page(dev, phys, addr, size, dir, attrs); + trace_dma_map_phys(dev, phys, addr, size, dir, attrs); debug_dma_map_phys(dev, phys, size, dir, addr, attrs); =20 return addr; @@ -193,7 +193,7 @@ void dma_unmap_page_attrs(struct device *dev, dma_addr_= t addr, size_t size, iommu_dma_unmap_page(dev, addr, size, dir, attrs); else ops->unmap_page(dev, addr, size, dir, attrs); - trace_dma_unmap_page(dev, addr, size, dir, attrs); + trace_dma_unmap_phys(dev, addr, size, dir, attrs); debug_dma_unmap_phys(dev, addr, size, dir); } EXPORT_SYMBOL(dma_unmap_page_attrs); --=20 2.49.0