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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 B1D95CD5BAF for ; Fri, 22 May 2026 04:31:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=UPVhX+V6bjt+jEYXx2EEvMCCL/8FtnLC6xq+shkO+d4=; b=e4htcVM6RW/OVIa7Ma9e7lGC5r gD7zgGx04bmwCCdJf8hBcWWAiPwKfQZougc0GvASnME77KZ3A1p6Kmj2/gFOrAYEySuRXNX4QE1kf LpXler/36jHKEiEf3pW2eDB5WsX107chxmLflMnbK2k6WWB4tGgxVoAWKIntXq2dU6x82FJjcbes5 y0D5eRUmM3MJqRUkyI2yPcD3SEhSGNZFwiPzbAIEzGq+eMSQOBhBbsQxZFAZxXxFRj8mu4KsnJzkn 1fKAlLmWLnv1Cb3lELLsWHTkHPHgjJ9hfFXIupNS6s8wHneCj51zzdRF3IzgR/BBEnUz1+lhHtQNn xCtxXNxQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wQHXl-00000009kkv-2VYk; Fri, 22 May 2026 04:31:29 +0000 Received: from tor.source.kernel.org ([172.105.4.254]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wQHXk-00000009kkT-2ks1 for linux-arm-kernel@lists.infradead.org; Fri, 22 May 2026 04:31:28 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 1457F60172; Fri, 22 May 2026 04:31:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1386E1F000E9; Fri, 22 May 2026 04:31:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779424287; bh=UPVhX+V6bjt+jEYXx2EEvMCCL/8FtnLC6xq+shkO+d4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=a6H9HzejgTanmuvGyP7VJaa5Gx2QiHLNOK3GFUWd0ZZvC/lxq60uptNh63/1uLIDF r8wOVVv3MLgOfgtVaDvbHBKq/7aCkp+YcjtPbsHLYs4a4pvyalLKpsZmd4QVqtaVBo ztu2tfrIP3SjlJHE/nZDZaIUOFbCXMNTz7XX0a9hxs+SPMzy3P+vjSWis5FZbQpnkF 2B4rv2K5RaDKUOhKP4Q1Uiz5kc6EXjJNFu59BnZUUT3xzNpn6oTaNK9i8YJixThzJJ kGgq4gQihEdciMu0b4qIrYdc0g8hTxmYnnJfk3XnhnXtdq9j98LguDscHIfx4bYYHk qBbfoTpTTqZ1Q== 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, stable@vger.kernel.org Subject: [PATCH v5 15/20] dma-direct: return struct page from dma_direct_alloc_from_pool() Date: Fri, 22 May 2026 09:58:10 +0530 Message-ID: <20260522042815.370873-16-aneesh.kumar@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260522042815.370873-1-aneesh.kumar@kernel.org> References: <20260522042815.370873-1-aneesh.kumar@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit 5b138c534fda ("dma-direct: factor out a dma_direct_alloc_from_pool helper") changed dma_direct_alloc_from_pool() to return the CPU address from dma_alloc_from_pool(). That fits dma_direct_alloc(), but dma_direct_alloc_pages() also uses the helper and expects a struct page *. Fix this by making dma_direct_alloc_from_pool() return the struct page * again, and pass the CPU address back through an out-parameter for the dma_direct_alloc() caller. Fixes: 5b138c534fda ("dma-direct: factor out a dma_direct_alloc_from_pool helper") Cc: stable@vger.kernel.org Signed-off-by: Aneesh Kumar K.V (Arm) --- kernel/dma/direct.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 6b00c7f4a78b..907c6084c616 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -157,24 +157,24 @@ static bool dma_direct_use_pool(struct device *dev, gfp_t gfp) return !gfpflags_allow_blocking(gfp) && !is_swiotlb_for_alloc(dev); } -static void *dma_direct_alloc_from_pool(struct device *dev, size_t size, - dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs) +static struct page *dma_direct_alloc_from_pool(struct device *dev, size_t size, + dma_addr_t *dma_handle, void **cpu_addr, gfp_t gfp, + unsigned long attrs) { struct page *page; u64 phys_limit; - void *ret; if (WARN_ON_ONCE(!IS_ENABLED(CONFIG_DMA_COHERENT_POOL))) return NULL; gfp |= dma_direct_optimal_gfp_mask(dev, &phys_limit); - page = dma_alloc_from_pool(dev, size, &ret, gfp, attrs, + page = dma_alloc_from_pool(dev, size, cpu_addr, gfp, attrs, dma_coherent_ok); if (!page) return NULL; *dma_handle = phys_to_dma_direct(dev, page_to_phys(page), !!(attrs & DMA_ATTR_CC_SHARED)); - return ret; + return page; } static void *dma_direct_alloc_no_mapping(struct device *dev, size_t size, @@ -270,9 +270,12 @@ void *dma_direct_alloc(struct device *dev, size_t size, * the atomic pools instead if we aren't allowed block. */ if ((remap || (attrs & DMA_ATTR_CC_SHARED)) && - dma_direct_use_pool(dev, gfp)) - return dma_direct_alloc_from_pool(dev, size, dma_handle, - gfp, attrs); + dma_direct_use_pool(dev, gfp)) { + 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)) { page = dma_direct_alloc_swiotlb(dev, size, attrs); @@ -445,7 +448,7 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size, if ((attrs & DMA_ATTR_CC_SHARED) && dma_direct_use_pool(dev, gfp)) return dma_direct_alloc_from_pool(dev, size, dma_handle, - gfp, attrs); + &cpu_addr, gfp, attrs); if (is_swiotlb_for_alloc(dev)) { page = dma_direct_alloc_swiotlb(dev, size, attrs); -- 2.43.0