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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AE0FC64ED6 for ; Sun, 26 Feb 2023 23:17:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229593AbjBZXRi (ORCPT ); Sun, 26 Feb 2023 18:17:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229470AbjBZXRh (ORCPT ); Sun, 26 Feb 2023 18:17:37 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9881612859 for ; Sun, 26 Feb 2023 15:17:36 -0800 (PST) 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 36BCF60C58 for ; Sun, 26 Feb 2023 23:17:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8AD0FC433D2; Sun, 26 Feb 2023 23:17:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1677453455; bh=vdWj9oOb4FpoT41auFhegnxiyK9wYPNbRwFe7iKUqUI=; h=Date:To:From:Subject:From; b=TFk1C7pTKg5pwifX912fRVJ25JNzIeR0lRUosepDc+lo8gvJ9XXuKlRu6Yep2UKUp SKbN8SUQyU2bo/PGarLGL8Pb4li+oJ//bXiTE5mveS9Ch0ImKGGOz59k5AAaX3LAyj 3+zRHsN2sbrohbbHrlyi3rC04RiIgGlmLqpCHQJI= Date: Sun, 26 Feb 2023 15:17:34 -0800 To: mm-commits@vger.kernel.org, hch@infradead.org, bryan.odonoghue@linaro.org, kbusch@kernel.org, akpm@linux-foundation.org From: Andrew Morton Subject: [folded-merged] dmapool-link-blocks-across-pages-fix.patch removed from -mm tree Message-Id: <20230226231735.8AD0FC433D2@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: dmapool: push new blocks in ascending order has been removed from the -mm tree. Its filename was dmapool-link-blocks-across-pages-fix.patch This patch was dropped because it was folded into dmapool-link-blocks-across-pages.patch ------------------------------------------------------ From: Keith Busch Subject: dmapool: push new blocks in ascending order Date: Tue, 21 Feb 2023 08:54:00 -0800 Some users of the dmapool need their allocations to happen in ascending order. The recent optimizations pushed the blocks in reverse order, so restore the previous behavior by linking the next available block from low-to-high. usb/chipidea/udc.c qh_pool called "ci_hw_qh". My initial thought was dmapool isn't the right API if you need a specific order when allocating from it, but I can't readily test any changes to that driver. Restoring the previous behavior is easy enough. Link: https://lkml.kernel.org/r/20230221165400.1595247-1-kbusch@meta.com Fixes: ced6d06a81fb69 ("dmapool: link blocks across pages") Signed-off-by: Keith Busch Reported-by: Bryan O'Donoghue Tested-by: Bryan O'Donoghue Cc: Christoph Hellwig Signed-off-by: Andrew Morton --- --- a/mm/dmapool.c~dmapool-link-blocks-across-pages-fix +++ b/mm/dmapool.c @@ -301,7 +301,7 @@ EXPORT_SYMBOL(dma_pool_create); static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page) { unsigned int next_boundary = pool->boundary, offset = 0; - struct dma_block *block; + struct dma_block *block, *first = NULL, *last = NULL; pool_init_page(pool, page); while (offset + pool->size <= pool->allocation) { @@ -312,11 +312,22 @@ static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page) } block = page->vaddr + offset; - pool_block_push(pool, block, page->dma + offset); + block->dma = page->dma + offset; + block->next_block = NULL; + + if (last) + last->next_block = block; + else + first = block; + last = block; + offset += pool->size; pool->nr_blocks++; } + last->next_block = pool->next_block; + pool->next_block = first; + list_add(&page->page_list, &pool->page_list); pool->nr_pages++; } _ Patches currently in -mm which might be from kbusch@kernel.org are dmapool-add-alloc-free-performance-test.patch dmapool-move-debug-code-to-own-functions.patch dmapool-rearrange-page-alloc-failure-handling.patch dmapool-consolidate-page-initialization.patch dmapool-simplify-freeing.patch dmapool-dont-memset-on-free-twice.patch dmapool-link-blocks-across-pages.patch dmapool-create-destroy-cleanup.patch