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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (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 7FD09C43458 for ; Wed, 1 Jul 2026 05:53:18 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4gqq1n1klHz2yjR; Wed, 01 Jul 2026 15:53:17 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2600:3c0a:e001:78e:0:1991:8:25" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1782885197; cv=none; b=HGT+hcyDfJP8Duen04vYfDKgRm6yv+QNKU6+091tJ46UTiNSYcmcgeMPyRpjU3dgHieheL/WQbaA1pwCPvYQR356JDJkYbb0KODZ6oJINMct0B8S0v7BEX0lO+4bnJSiGQyEJClETBXd/xQE4HdL36l50KZJPT/Y490vhLUFYB+Q0l6W7l1r2c/mfQ9PL4qO02aodWq/XYACXzAnGeQG4oUOTESNujQx0aYsd3jzB2gdAu2oqSn0laKP/iqt6zGU6ExrDn/JKiKex4jWDQhOm7Bc412faO4aTuu7+QHH+CANcb9QMklJ5MX5YxrfKCbUIMcEwSTn2JImYjKUTG+r9w== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1782885197; c=relaxed/relaxed; bh=sFy0T0BPD4FTs9VATm8J4K174dhU5J4SovBu98CGNDs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fxHgKkSRGjU9VBywJqD2COjxqzQ15Y1PjNl7cGZ+5sQzqMdJujvbxPfwVhnzMMr512aTMvUQ4RHYenT76oy6vWBWRPZgPUWNzF6H0KOQYpJmTOSzskQhseCRcPvMpWaqqverwfUwnlXhaeAeJ6LwTM8ZZCnJhJvc8eh8NK8VS36xHr0jxgDIIXVJtdnqc0tmeSKWMT2mgzFsh9D1uMBbWdAzBn4XZUpZn71J0IZ2OG8cKcPig/8hda+emdkFY5J7RuWzkaRGzWSBHDqP5rY/QbO8nhQy2iRPr7ZHOYjYBAwGo/EdVqRDuJgKo09KxOESlc9CDcQ1C29pFr4ZqkKiag== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=UWddKrSb; dkim-atps=neutral; spf=pass (client-ip=2600:3c0a:e001:78e:0:1991:8:25; helo=sea.source.kernel.org; envelope-from=aneesh.kumar@kernel.org; receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=UWddKrSb; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=2600:3c0a:e001:78e:0:1991:8:25; helo=sea.source.kernel.org; envelope-from=aneesh.kumar@kernel.org; receiver=lists.ozlabs.org) Received: from sea.source.kernel.org (sea.source.kernel.org [IPv6:2600:3c0a:e001:78e:0:1991:8:25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4gqq1m2dy2z2yjN for ; Wed, 01 Jul 2026 15:53:16 +1000 (AEST) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id AD4334114B; Wed, 1 Jul 2026 05:53:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D0341F00A3A; Wed, 1 Jul 2026 05:53:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1782885193; bh=sFy0T0BPD4FTs9VATm8J4K174dhU5J4SovBu98CGNDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UWddKrSbxtDPe8luUGelJ6MWY43nC08Ww28qDX/t8paeV1iCBGOMgyIJdzf/Zsx3m s+IGdDeNDlY5mH3YTZnYimC3lGcYM7Hymvm2AHC7gTMObt2nOgVRnbR/s9bdqk5HkZ 3/sz79b1U7XUDdfJdEToG7MroG20KL2fzyQlnrNuJBF2+lX19gyfM/HtwAHfyyo9J+ smSD0rHkzoDQDnbJlY6zScx8po3RzeV1VTfnRnHA281BHiYO+E+J/kOYGdqxSupgso rbbKRMQnvfSrlanhMnZ2AxlwqJoUuHPFNywBBh5qHPopLmQ7F/gSEeT/J2UyGkDfqp lA1nezz2ylFXQ== From: "Aneesh Kumar K.V (Arm)" To: iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev Cc: "Aneesh Kumar K.V (Arm)" , Robin Murphy , Marek Szyprowski , Will Deacon , Marc Zyngier , Steven Price , Suzuki K Poulose , Catalin Marinas , Jiri Pirko , Jason Gunthorpe , Mostafa Saleh , Petr Tesarik , Alexey Kardashevskiy , Dan Williams , Xu Yilun , linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , "Christophe Leroy (CS GROUP)" , Alexander Gordeev , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Sven Schnelle , x86@kernel.org, Michael Kelley Subject: [PATCH v7 19/22] dma-direct: rename ret to cpu_addr in alloc helpers Date: Wed, 1 Jul 2026 11:19:23 +0530 Message-ID: <20260701054926.825925-20-aneesh.kumar@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260701054926.825925-1-aneesh.kumar@kernel.org> References: <20260701054926.825925-1-aneesh.kumar@kernel.org> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ret in dma_direct_alloc() and dma_direct_alloc_pages() holds the returned CPU mapping, not a generic return value. Rename it to cpu_addr and update the remaining uses to match. This makes the allocation paths easier to follow and keeps the local naming consistent with what the variable actually represents. Tested-by: Michael Kelley Tested-by: Mostafa Saleh Reviewed-by: Petr Tesarik Signed-off-by: Aneesh Kumar K.V (Arm) --- kernel/dma/direct.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 23138519cf22..9575d68571bf 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -204,7 +204,7 @@ void *dma_direct_alloc(struct device *dev, size_t size, bool mark_mem_decrypt = false; bool allow_highmem = true; struct page *page; - void *ret; + void *cpu_addr; if (force_dma_unencrypted(dev)) attrs |= __DMA_ATTR_ALLOC_CC_SHARED; @@ -261,9 +261,10 @@ void *dma_direct_alloc(struct device *dev, size_t size, */ if ((remap || (attrs & __DMA_ATTR_ALLOC_CC_SHARED)) && dma_direct_use_pool(dev, gfp)) { - page = dma_direct_alloc_from_pool(dev, size, dma_handle, - &ret, gfp, attrs); - return page ? ret : NULL; + page = dma_direct_alloc_from_pool(dev, size, + dma_handle, &cpu_addr, + gfp, attrs); + return page ? cpu_addr : NULL; } if (is_swiotlb_for_alloc(dev)) { @@ -310,34 +311,33 @@ void *dma_direct_alloc(struct device *dev, size_t size, arch_dma_prep_coherent(page, size); /* create a coherent mapping */ - ret = dma_common_contiguous_remap(page, size, prot, - __builtin_return_address(0)); - if (!ret) + cpu_addr = dma_common_contiguous_remap(page, size, prot, + __builtin_return_address(0)); + if (!cpu_addr) goto out_encrypt_pages; } else { - ret = page_address(page); + cpu_addr = page_address(page); } - memset(ret, 0, size); + memset(cpu_addr, 0, size); if (set_uncached) { void *uncached_cpu_addr; arch_dma_prep_coherent(page, size); - uncached_cpu_addr = arch_dma_set_uncached(ret, size); + uncached_cpu_addr = arch_dma_set_uncached(cpu_addr, size); if (IS_ERR(uncached_cpu_addr)) goto out_free_remap_pages; - ret = uncached_cpu_addr; + cpu_addr = uncached_cpu_addr; } *dma_handle = phys_to_dma_direct(dev, page_to_phys(page), !!(attrs & __DMA_ATTR_ALLOC_CC_SHARED)); - return ret; - + return cpu_addr; out_free_remap_pages: if (remap) - dma_common_free_remap(ret, size); + dma_common_free_remap(cpu_addr, size); out_encrypt_pages: if (mark_mem_decrypt && @@ -429,21 +429,21 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size, { unsigned long attrs = 0; struct page *page; - void *ret; + void *cpu_addr; if (force_dma_unencrypted(dev)) attrs |= __DMA_ATTR_ALLOC_CC_SHARED; if ((attrs & __DMA_ATTR_ALLOC_CC_SHARED) && dma_direct_use_pool(dev, gfp)) return dma_direct_alloc_from_pool(dev, size, dma_handle, - &ret, gfp, attrs); + &cpu_addr, gfp, attrs); if (is_swiotlb_for_alloc(dev)) { page = dma_direct_alloc_swiotlb(dev, size, attrs); if (!page) return NULL; - ret = page_address(page); + cpu_addr = page_address(page); goto setup_page; } @@ -451,12 +451,12 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size, if (!page) return NULL; - ret = page_address(page); + cpu_addr = page_address(page); if ((attrs & __DMA_ATTR_ALLOC_CC_SHARED) && - dma_set_decrypted(dev, ret, size)) + dma_set_decrypted(dev, cpu_addr, size)) goto out_leak_pages; setup_page: - memset(ret, 0, size); + memset(cpu_addr, 0, size); *dma_handle = phys_to_dma_direct(dev, page_to_phys(page), !!(attrs & __DMA_ATTR_ALLOC_CC_SHARED)); return page; -- 2.43.0