From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 B5B7A4908A1 for ; Thu, 10 Sep 2026 14:39:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789051183; cv=none; b=N7Ia53Su40cDpA/+W9sqYVTQXV0GATnXNrlpIc34mQfbNbKKX/xNt8Kfeonn5y1UFeOiS6e4ZcbrK7B3wsoGoNmFUhECuawzLti5YdIceDf6rZDs+H4PWqi+K/IOQLBTmOwNVz+wE6uLFdJenlQA/A69co+sc8brjRtu73dtJcU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789051183; c=relaxed/simple; bh=lo5z5bKA1GM437F+pWCjk3jRCnVVXl/+R5CgQnirSFI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AKmVWO7csgrFhE7wsCCOs1186X+zKk0Psm+uLuLh8Uh/NGNCBG2pdlndLtL0fOOnOLjjGbTReJDE/0gEv0QkD1OmuDJ+yN1Wkv0HWhYlRO9dE4DCM7ove1kFaD/N+nWiKRau7zhnODzkmh8y+2VUmcieguIwH9LwQ+n6nZn3E38= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oVtX2qyq; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oVtX2qyq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCBFF1F00899; Thu, 10 Sep 2026 14:39:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789051181; bh=QRlTJZ7zsmL2X0Rz5rRtU6EgvIqmJmxrFgyT2NttIuY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oVtX2qyqmyn/TPeFJihEqTd+6SrbiY6l7M39MtgFZRQcJolPDiACVNI/11e3b+9ts yEvl9qZZsqI6lcN1098Ff5YyQK8XP/nsJKd2rnkUYARkMuJZdz20lBGKa0d5fD9+/5 t3jnoyYacdLczf+5pATCiwR8zasKFOwJsjRw1d9XtP3dY37t2Nl9eXrIiJiEpWa0mx S7cWc/UawjnPjakApyo3w7gz5ShhN+Dfhc+6lzzr0By7pd8GMXvqINvZmYmDxr/BZQ nOqvpjx09zKgy/JNXZk04TrKHGEEKVHqEPslOJapD3alMS60FxmyUxdF6luOBYcgLC NzU7BWqIo0hfg== From: Sasha Levin To: stable@vger.kernel.org Cc: "Aneesh Kumar K.V (Arm)" , Michael Kelley , Mostafa Saleh , Jason Gunthorpe , Marek Szyprowski , Sasha Levin Subject: [PATCH 5.15.y 10/10] dma-direct: return struct page from dma_direct_alloc_from_pool() Date: Thu, 10 Sep 2026 10:39:31 -0400 Message-ID: <20260910143932.771351-10-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260910143932.771351-1-sashal@kernel.org> References: <2026090811-unwound-smuggler-adf1@gregkh> <20260910143932.771351-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Aneesh Kumar K.V (Arm)" [ Upstream commit 94a04ad732c9f8b9554270fc4038a06737de5c22 ] 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 Tested-by: Michael Kelley Tested-by: Mostafa Saleh Reviewed-by: Jason Gunthorpe Signed-off-by: Aneesh Kumar K.V (Arm) Reviewed-by: Mostafa Saleh Link: https://lore.kernel.org/r/20260717180442.110954-2-aneesh.kumar@kernel.org Signed-off-by: Marek Szyprowski Signed-off-by: Sasha Levin --- kernel/dma/direct.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 30848d158d0a4..f1956ee185405 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -168,22 +168,21 @@ 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) +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) { 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, dma_coherent_ok); + page = dma_alloc_from_pool(dev, size, cpu_addr, gfp, dma_coherent_ok); if (!page) return NULL; *dma_handle = phys_to_dma_direct(dev, page_to_phys(page)); - return ret; + return page; } static void *dma_direct_alloc_no_mapping(struct device *dev, size_t size, @@ -255,8 +254,11 @@ void *dma_direct_alloc(struct device *dev, size_t size, * the atomic pools instead if we aren't allowed block. */ if ((remap || force_dma_unencrypted(dev)) && - dma_direct_use_pool(dev, gfp)) - return dma_direct_alloc_from_pool(dev, size, dma_handle, gfp); + dma_direct_use_pool(dev, gfp)) { + page = dma_direct_alloc_from_pool(dev, size, dma_handle, + &ret, gfp); + return page ? ret : NULL; + } /* we always manually zero the memory once we are done */ page = __dma_direct_alloc_pages(dev, size, gfp & ~__GFP_ZERO, true); @@ -365,7 +367,7 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size, void *ret; if (force_dma_unencrypted(dev) && dma_direct_use_pool(dev, gfp)) - return dma_direct_alloc_from_pool(dev, size, dma_handle, gfp); + return dma_direct_alloc_from_pool(dev, size, dma_handle, &ret, gfp); page = __dma_direct_alloc_pages(dev, size, gfp, false); if (!page) -- 2.53.0