From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795030955; b=dNtoUfkcZBp/yKHZduhEeVagQTSaI/1ZiIwb6qgDNmyEga5Ikpio8alyzB+HJ4uivUhF YTkFx6e8bscIfjIpi19VTnc9Cf16Eok5zzx3EGW1e1ZuL9IfYzO90RsmyuSM2qliOL1JV ot+CYh3f3bjuRlEOerA0gpBotmAcGmkJ6PIiGo9HWUZH+qaBN0tJxFFCcAJIZVUXBvqVJ /9TgpqTkO6ZhongMgaC7Ktx9GBeU8OctHUoHNKIi1Lj6U0vGC/VFytnoFay1zKLeNQtzZ zem0BRKy/u/uRBMUZtQubzqHf6Rb6TqZ+TiRU24DIEk6Hy3VVtFhFoWMMHp14lEIyow== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795030955; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Hft/u7SMlDrk/tGN8LU9LLKZ5XzOgGKE8a7cusUW2Nk=; b=n2W3X/NT/UBLqy/DlQ0MEsH1Duk8zgrM3AdxhYjklHzcba+QxKvOvaSW9KmPzuglMhYi SXdB86/vE7k0rD5wk9VhmOUd75/KeGMLsEIlVmAKFDAToXZXdM/sDRe6MbQ/uSdsHsqvR E0FF0UqTxIrZ32fVdhB/gfPlC9MnTDSSESRhZ/1SNgUVrqYgpz3ntMGSRmCnRscTNadXV kRQyFUbS9xw7pd4HDQs6BbIeZ1jtGq+JdIrglJ0LyeYrIcxzxlh2D8tZt6av7m5cYok6L IjIm2buumFRj1JXXVt2cdQJzDiewJrHtP7h18rc3T4ZfQu7QZAvvY+RsxH0DkyczOdQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=EzQRhANJ; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 98100606A900; Wed, 18 Nov 2026 19:42:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=EzQRhANJ Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEA9A1F000C4; Wed, 18 Nov 2026 19:42:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795030955; bh=Hft/u7SMlDrk/tGN8LU9LLKZ5XzOgGKE8a7cusUW2Nk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EzQRhANJi9TnvktI+QkpC7BG38mwWMYtezcYOJ32Wcc+ubP8ztWkQdC5TI/o8lZQS Zkccumc8gUo0B01h+nnbGM+WDuVr5Hbc4JEKagO/Bd5R62IBL6dQ6fNPBjmGOf5Sl1 K+wZaaWoAf+BDgXZPUq3SlvjCLTrDTGQpQD1pUNk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, sashiko-bot@kernel.org, Frank Li , Linus Walleij , Vinod Koul , Sasha Levin Subject: [PATCH 6.12 0888/1756] dmaengine: ste_dma40: Fix LCLA allocation order Date: Wed, 18 Nov 2026 15:50:15 +0100 Message-ID: <20261118150045.102892355@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Linus Walleij [ Upstream commit 7d4dc355c574d414d2402ac481a2fc4ee51e2771 ] d40_lcla_allocate() calculates the number of pages needed for LCLA, but passes that raw page count as the allocation order to __get_free_pages(). The same value is later passed to free_pages(). Store the allocation order with get_order() instead, and use a separate byte size for allocation diagnostics, fallback kmalloc() sizing and DMA mapping. Fixes: 508849ade23c ("DMAENGINE: ste_dma40: allocate LCLA dynamically") Reported-by: sashiko-bot@kernel.org Closes: https://lore.kernel.org/dmaengine/20260819225114.AE1511F000E9@smtp.kernel.org/ Assisted-by: LLM Reviewed-by: Frank Li Signed-off-by: Linus Walleij Link: https://patch.msgid.link/20260927-dma40-fixes-v7-12-89f595e8851d@kernel.org Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/ste_dma40.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index c7c727411a275..9b38672db3d90 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -411,8 +411,8 @@ struct d40_desc { * @dma_addr: DMA address, if mapped * @base_unaligned: The original kmalloc pointer, if kmalloc is used. * This pointer is only there for clean-up on error. - * @pages: The number of pages needed for all physical channels. - * Only used later for clean-up on error + * @alloc_order: Order used for the LCLA page allocation. + * Only used later for clean-up on error. * @lock: Lock to protect the content in this struct. * @alloc_map: big map over which LCLA entry is own by which job. */ @@ -420,7 +420,7 @@ struct d40_lcla_pool { void *base; dma_addr_t dma_addr; void *base_unaligned; - int pages; + unsigned int alloc_order; spinlock_t lock; struct d40_desc **alloc_map; }; @@ -3438,6 +3438,7 @@ static void __init d40_hw_init(struct d40_base *base) static int __init d40_lcla_allocate(struct d40_base *base) { struct d40_lcla_pool *pool = &base->lcla_pool; + size_t lcla_size = SZ_1K * base->num_phy_chans; unsigned long *page_list; int i, j; int ret; @@ -3453,20 +3454,20 @@ static int __init d40_lcla_allocate(struct d40_base *base) if (!page_list) return -ENOMEM; - /* Calculating how many pages that are required */ - base->lcla_pool.pages = SZ_1K * base->num_phy_chans / PAGE_SIZE; + base->lcla_pool.alloc_order = get_order(lcla_size); for (i = 0; i < MAX_LCLA_ALLOC_ATTEMPTS; i++) { page_list[i] = __get_free_pages(GFP_KERNEL, - base->lcla_pool.pages); + base->lcla_pool.alloc_order); if (!page_list[i]) { - d40_err(base->dev, "Failed to allocate %d pages.\n", - base->lcla_pool.pages); + d40_err(base->dev, "Failed to allocate %zu bytes.\n", + lcla_size); ret = -ENOMEM; for (j = 0; j < i; j++) - free_pages(page_list[j], base->lcla_pool.pages); + free_pages(page_list[j], + base->lcla_pool.alloc_order); goto free_page_list; } @@ -3476,7 +3477,7 @@ static int __init d40_lcla_allocate(struct d40_base *base) } for (j = 0; j < i; j++) - free_pages(page_list[j], base->lcla_pool.pages); + free_pages(page_list[j], base->lcla_pool.alloc_order); if (i < MAX_LCLA_ALLOC_ATTEMPTS) { base->lcla_pool.base = (void *)page_list[i]; @@ -3486,10 +3487,9 @@ static int __init d40_lcla_allocate(struct d40_base *base) * alignment, try with allocating a big buffer. */ dev_warn(base->dev, - "[%s] Failed to get %d pages @ 18 bit align.\n", - __func__, base->lcla_pool.pages); - base->lcla_pool.base_unaligned = kmalloc(SZ_1K * - base->num_phy_chans + + "[%s] Failed to get %zu bytes @ 18 bit align.\n", + __func__, lcla_size); + base->lcla_pool.base_unaligned = kmalloc(lcla_size + LCLA_ALIGNMENT, GFP_KERNEL); if (!base->lcla_pool.base_unaligned) { @@ -3501,8 +3501,7 @@ static int __init d40_lcla_allocate(struct d40_base *base) LCLA_ALIGNMENT); } - pool->dma_addr = dma_map_single(base->dev, pool->base, - SZ_1K * base->num_phy_chans, + pool->dma_addr = dma_map_single(base->dev, pool->base, lcla_size, DMA_TO_DEVICE); if (dma_mapping_error(base->dev, pool->dma_addr)) { pool->dma_addr = 0; @@ -3744,7 +3743,7 @@ static int __init d40_probe(struct platform_device *pdev) if (!base->lcla_pool.base_unaligned && base->lcla_pool.base) free_pages((unsigned long)base->lcla_pool.base, - base->lcla_pool.pages); + base->lcla_pool.alloc_order); kfree(base->lcla_pool.base_unaligned); -- 2.53.0