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 76418C76196 for ; Tue, 11 Apr 2023 03:55:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229853AbjDKDzv (ORCPT ); Mon, 10 Apr 2023 23:55:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229523AbjDKDzv (ORCPT ); Mon, 10 Apr 2023 23:55:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 505D21BE8 for ; Mon, 10 Apr 2023 20:55:50 -0700 (PDT) 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 D950A60B84 for ; Tue, 11 Apr 2023 03:55:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3AF5EC433EF; Tue, 11 Apr 2023 03:55:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1681185349; bh=C6uAGu/pKfqdcATOVjDvhl217AR/w3Ksk1neFONUO+I=; h=Date:To:From:Subject:From; b=B0guiwSGrNgv7pqBXJ1TBbXBGIgZg3lOMojFbPOC61PelfxFdXX1ByX2jOVjofN0o mwzMZ4ELfhinYcYhonNQxaMm1nSJXshny9RqMABmpwERTsRosDZ8rIffX0dyI8jkLB yb30okeDhbBHnR/cFRknI3FNpZlRsjHG69TCfxGs= Date: Mon, 10 Apr 2023 20:55:48 -0700 To: mm-commits@vger.kernel.org, Liam.Howlett@Oracle.com, zhangpeng.00@bytedance.com, akpm@linux-foundation.org From: Andrew Morton Subject: [to-be-updated] maple_tree-add-a-test-case-to-check-maple_alloc.patch removed from -mm tree Message-Id: <20230411035549.3AF5EC433EF@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: maple_tree: add a test case to check maple_alloc has been removed from the -mm tree. Its filename was maple_tree-add-a-test-case-to-check-maple_alloc.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Peng Zhang Subject: maple_tree: add a test case to check maple_alloc Date: Fri, 7 Apr 2023 12:07:17 +0800 Add a test case to check whether the number of maple_alloc structures is actually equal to mas->alloc->total. Link: https://lkml.kernel.org/r/20230407040718.99064-1-zhangpeng.00@bytedance.com Signed-off-by: Peng Zhang Cc: Liam R. Howlett Signed-off-by: Andrew Morton --- tools/testing/radix-tree/maple.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) --- a/tools/testing/radix-tree/maple.c~maple_tree-add-a-test-case-to-check-maple_alloc +++ a/tools/testing/radix-tree/maple.c @@ -55,6 +55,28 @@ struct rcu_reader_struct { struct rcu_test_struct2 *test; }; +static int get_alloc_node_count(struct ma_state *mas) +{ + int count = 1; + struct maple_alloc *node = mas->alloc; + + if (!node || ((unsigned long)node & 0x1)) + return 0; + while (node->node_count) { + count += node->node_count; + node = node->slot[0]; + } + return count; +} + +static void check_mas_alloc_node_count(struct ma_state *mas) +{ + mas_node_count_gfp(mas, MAPLE_ALLOC_SLOTS + 1, GFP_KERNEL); + mas_node_count_gfp(mas, MAPLE_ALLOC_SLOTS + 3, GFP_KERNEL); + MT_BUG_ON(mas->tree, get_alloc_node_count(mas) != mas->alloc->total); + mas_destroy(mas); +} + /* * check_new_node() - Check the creation of new nodes and error path * verification. @@ -69,6 +91,8 @@ static noinline void check_new_node(stru MA_STATE(mas, mt, 0, 0); + check_mas_alloc_node_count(&mas); + /* Try allocating 3 nodes */ mtree_lock(mt); mt_set_non_kernel(0); _ Patches currently in -mm which might be from zhangpeng.00@bytedance.com are maple_tree-use-correct-variable-type-in-sizeof.patch mm-kfence-improve-the-performance-of-__kfence_alloc-and-__kfence_free.patch maple_tree-simplify-mas_wr_node_walk.patch