From patchwork Mon Jun 12 15:31:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 13276869 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 56FC9C7EE2F for ; Mon, 12 Jun 2023 15:33:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EAB7E8E000C; Mon, 12 Jun 2023 11:33:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E5C528E0005; Mon, 12 Jun 2023 11:33:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CFC858E000C; Mon, 12 Jun 2023 11:33:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id BFF528E0005 for ; Mon, 12 Jun 2023 11:33:10 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 7FD9412027A for ; Mon, 12 Jun 2023 15:33:10 +0000 (UTC) X-FDA: 80894489340.30.D4D3DEC Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf23.hostedemail.com (Postfix) with ESMTP id 2FCD614002F for ; Mon, 12 Jun 2023 15:33:06 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf23.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686583987; 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; bh=9Lo5qv7nUQqFKTvriR5A+h+u9COGpgdN5rIa6SgcmHc=; b=S86hJu+wsdq1ZsxelpGhSfn5n+vFeJ7dbZSuLnc6h37CBMd2xxMcjVxpMBEwIMykM4nsqT FxD+CTf9C1e0CKb9Inifh3hp4VXOHCXimwyHbUXKJ0TfZvfdBOOrz48bWboRABxjioz6w5 clyBm0bTlZ2oqtKdy1Iegb+lhvA6U60= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf23.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686583987; a=rsa-sha256; cv=none; b=D9gpPXmwA66VKUmcv4BQ0NZmqF8Fd5alzQdLG04Q8G2wmC31siF/ZWxeAXTN0fFdNRrMS/ 5nuiZxUZufAI94ZTaVXPK3fnj/keIl66o9YY3bsHtFFebWb9Sxq5OAlZpgOK7vXAZuBWfE GN2xdcJYpd02VcxtJWIpEnNJWOO/GAg= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 111CD62AEB; Mon, 12 Jun 2023 15:33:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2EF3FC433A8; Mon, 12 Jun 2023 15:33:01 +0000 (UTC) From: Catalin Marinas To: Andrew Morton , Linus Torvalds Cc: Christoph Hellwig , Robin Murphy , Arnd Bergmann , Greg Kroah-Hartman , Will Deacon , Marc Zyngier , Herbert Xu , Ard Biesheuvel , Isaac Manjarres , Saravana Kannan , Alasdair Kergon , Daniel Vetter , Joerg Roedel , Mark Brown , Mike Snitzer , "Rafael J. Wysocki" , Jonathan Cameron , Vlastimil Babka , linux-mm@kvack.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Jerry Snitselaar , Logan Gunthorpe Subject: [PATCH v7 13/17] dma-mapping: Name SG DMA flag helpers consistently Date: Mon, 12 Jun 2023 16:31:57 +0100 Message-Id: <20230612153201.554742-14-catalin.marinas@arm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230612153201.554742-1-catalin.marinas@arm.com> References: <20230612153201.554742-1-catalin.marinas@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 2FCD614002F X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: od7fq77yf3tgeuqt35dffcx5tuu8md3p X-HE-Tag: 1686583986-18093 X-HE-Meta: U2FsdGVkX1+6qFJ/LCeoM+ofsGlYgl1NFoyyfuHbEzc532OyYeUxwXiY5t+E1oojddhUUOEOAcxtz3wa4B9YRoGvHheqanPiDHQ/uiIlLWDov8E0HJPdbdt23LFYZbUA90azqxaySd0OmpS5yWW8Mo0aurbUOZPPMJzui6sKakjtfKXlEpTgFrmnDgAKpt5gIJTfQIADqGL6Aoz0ivglCT8m/dPebUxh7+b4L+igl4Bd1DGoEluUnl1d0JZ4mjUQEF0BjHlaTbo32be1l1nqw8dmJHz5OsFzQknc5tKKy0bnT1ef6/YY50O6ZgI+WjJ01hCR2TI6DcwIt8CWI0K2yVp5N8V7ol7fryaJjp59Mr3dqgPQwCJQvNVPGWgklfD2Y4Iw1pezDCpLREo84rqA8mjDqR2TH+sb6SNEcSFnceKwOJ+RQphX9JUJ1/JWd4rHjIEkQkMIBO9ZNQftct71SvSdLwxfKHlvyH3g3CwiLuZi/qv4L+mOcSP7LDhr71ZWlennKeWeurtT9WA22n8pj29e1RitkHl5W36YL3fsKJHdup5xK1PPvtQtHDvIl5Toty7/UNvu+KS7QukTmMjVN9YoMqweDcDr4kmB1wzM324/mOZSh7a8YYgsZvLnkgkSt3V0D8YfatRhrq0ZQ+IyX7VQYHJVxmLxyDlU9pf1Xoxy4O7RVPKzo3/jIm9+t9NinScTB0mUwaBa/tmfBehm8gm5oYrHB/bPXC7OR/L/8M+nRPnjgUSLQJRk3lcT84Z3mR++RSl/M371aXZLKQyxKVwWBn5JT8cbZR1kbvLc+3M5jramdkoJjCY25qh+rrsoWhDHMVWNz77+AEVeP3wj873abSyaGwUI0pq6zeAXiVzF/0FAuFllz2vmnzrpUh/H0ekxB0BhpZbcGfTs6PM0L9SG8x2BAuCZ2AhUGoGfBV1n0nz+Mya5f6zusoXq+XYQYbS1zUzBt1Mr452MtG5 AGo0o+zD KRG/bLqCiCI5pjwyruAkYIU4CQ8ZnqJvQmUMf02bPsU1pqNgduywh2w3+PdHchhv2JaJ6DocbH+uetJtnNxGSu29QgJ4XUl+hnpVo4q122v51cgI1KqnsVc9Rz0KjQYWN7bySDCgj0DleIEgtzV+nqLa9VkHbfvfKwU3JlTOIE2TKvbhDCNQX+tTjk5+UmmheZxgQ/mOh5TMJ4+nEujSx/WjU0L6bCEIzZ7hNw25SYvB+DP+9Ewp/d00atqswgaKz3GF/sIt3S1trQcoPIElE+tfptwFDGcaaSg21dOltgAwwWBzOk3usBdARkEhk3mHmlS8w3Wj7MVevfCoRL6riXFRf3Bw53SPfEWmGkqxAbWSo95AOFWr2S7entbnP5UgQmMyKKq0pO7BABrvQDnLggF2KclgghMfWF81zVT51MRdbXJi/NRwOln05ZLrErXhcWTgR3DMJ/cDDtVY4JXTSNKwtvvuCGnoW7LFL5SyfD+GAWFJ8HeQ0FAIT2HXLRvy9Vo9zd9TEdsDrBIf2yM0uSmLP1izJHjuWpbRRukS1xWway+lko7i5pVipJznWh6suJSL5C607LLjpoakMRl25hHXAeX6BVvojzrLgAyqozzPt3G1POhQNQmDFP3VR52JESeyI 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: From: Robin Murphy sg_is_dma_bus_address() is inconsistent with the naming pattern of its corresponding setters and its own kerneldoc, so take the majority vote and rename it sg_dma_is_bus_address() (and fix up the missing underscores in the kerneldoc too). This gives us a nice clear pattern where SG DMA flags are SG_DMA_, and the helpers for acting on them are sg_dma__(). Signed-off-by: Robin Murphy Reviewed-by: Christoph Hellwig Reviewed-by: Jerry Snitselaar Reviewed-by: Logan Gunthorpe Link: https://lore.kernel.org/r/fa2eca2862c7ffc41b50337abffb2dfd2864d3ea.1685036694.git.robin.murphy@arm.com Signed-off-by: Catalin Marinas Tested-by: Isaac J. Manjarres --- drivers/iommu/dma-iommu.c | 8 ++++---- drivers/iommu/iommu.c | 2 +- include/linux/scatterlist.h | 8 ++++---- kernel/dma/direct.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 7a9f0b0bddbd..b8bba4aa196f 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -1080,7 +1080,7 @@ static int __finalise_sg(struct device *dev, struct scatterlist *sg, int nents, sg_dma_address(s) = DMA_MAPPING_ERROR; sg_dma_len(s) = 0; - if (sg_is_dma_bus_address(s)) { + if (sg_dma_is_bus_address(s)) { if (i > 0) cur = sg_next(cur); @@ -1136,7 +1136,7 @@ static void __invalidate_sg(struct scatterlist *sg, int nents) int i; for_each_sg(sg, s, nents, i) { - if (sg_is_dma_bus_address(s)) { + if (sg_dma_is_bus_address(s)) { sg_dma_unmark_bus_address(s); } else { if (sg_dma_address(s) != DMA_MAPPING_ERROR) @@ -1329,7 +1329,7 @@ static void iommu_dma_unmap_sg(struct device *dev, struct scatterlist *sg, * just have to be determined. */ for_each_sg(sg, tmp, nents, i) { - if (sg_is_dma_bus_address(tmp)) { + if (sg_dma_is_bus_address(tmp)) { sg_dma_unmark_bus_address(tmp); continue; } @@ -1343,7 +1343,7 @@ static void iommu_dma_unmap_sg(struct device *dev, struct scatterlist *sg, nents -= i; for_each_sg(tmp, tmp, nents, i) { - if (sg_is_dma_bus_address(tmp)) { + if (sg_dma_is_bus_address(tmp)) { sg_dma_unmark_bus_address(tmp); continue; } diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index f1dcfa3f1a1b..eb620552967b 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -2567,7 +2567,7 @@ ssize_t iommu_map_sg(struct iommu_domain *domain, unsigned long iova, len = 0; } - if (sg_is_dma_bus_address(sg)) + if (sg_dma_is_bus_address(sg)) goto next; if (len) { diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h index 19833fd4113b..2f06178996ba 100644 --- a/include/linux/scatterlist.h +++ b/include/linux/scatterlist.h @@ -258,7 +258,7 @@ static inline void sg_unmark_end(struct scatterlist *sg) #define SG_DMA_BUS_ADDRESS (1 << 0) /** - * sg_dma_is_bus address - Return whether a given segment was marked + * sg_dma_is_bus_address - Return whether a given segment was marked * as a bus address * @sg: SG entry * @@ -266,13 +266,13 @@ static inline void sg_unmark_end(struct scatterlist *sg) * Returns true if sg_dma_mark_bus_address() has been called on * this segment. **/ -static inline bool sg_is_dma_bus_address(struct scatterlist *sg) +static inline bool sg_dma_is_bus_address(struct scatterlist *sg) { return sg->dma_flags & SG_DMA_BUS_ADDRESS; } /** - * sg_dma_mark_bus address - Mark the scatterlist entry as a bus address + * sg_dma_mark_bus_address - Mark the scatterlist entry as a bus address * @sg: SG entry * * Description: @@ -300,7 +300,7 @@ static inline void sg_dma_unmark_bus_address(struct scatterlist *sg) #else -static inline bool sg_is_dma_bus_address(struct scatterlist *sg) +static inline bool sg_dma_is_bus_address(struct scatterlist *sg) { return false; } diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 5595d1d5cdcc..d29cade048db 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -463,7 +463,7 @@ void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sgl, int i; for_each_sg(sgl, sg, nents, i) { - if (sg_is_dma_bus_address(sg)) + if (sg_dma_is_bus_address(sg)) sg_dma_unmark_bus_address(sg); else dma_direct_unmap_page(dev, sg->dma_address,