From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 DC3441FB8 for ; Mon, 11 Dec 2023 00:53:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="05x46H5R" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A373CC433C8; Mon, 11 Dec 2023 00:53:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1702256035; bh=LOKpMJyOz3pAPNUHedm5Uz+XvMMLtzDR/odzqyftwhA=; h=Date:To:From:Subject:From; b=05x46H5Rgd0VtyvEeO+GsedGunou2KTFNy+ND0O8WldmFnL5K6Zv3rLeAnlTwjfXX w2qc510SDT9IIdLM/BICz2K04WgM/mmfRzQ+XYOYJ4zWWGqDs4fbCS7RK41bRvqqAS 3BKZiHV46WhHyTPj7NNnDTejc269gEikBW1QCPfE= Date: Sun, 10 Dec 2023 16:53:55 -0800 To: mm-commits@vger.kernel.org,willy@infradead.org,surenb@google.com,peterz@infradead.org,npiggin@gmail.com,mst@redhat.com,mjguzik@gmail.com,michael.christie@oracle.com,mathieu.desnoyers@efficios.com,Liam.Howlett@oracle.com,corbet@lwn.net,brauner@kernel.org,zhangpeng.00@bytedance.com,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] maple_tree-skip-other-tests-when-bench-is-enabled.patch removed from -mm tree Message-Id: <20231211005355.A373CC433C8@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: maple_tree: skip other tests when BENCH is enabled has been removed from the -mm tree. Its filename was maple_tree-skip-other-tests-when-bench-is-enabled.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Peng Zhang Subject: maple_tree: skip other tests when BENCH is enabled Date: Fri, 27 Oct 2023 11:38:42 +0800 Skip other tests when BENCH is enabled so that performance can be measured in user space. Link: https://lkml.kernel.org/r/20231027033845.90608-8-zhangpeng.00@bytedance.com Signed-off-by: Peng Zhang Reviewed-by: Liam R. Howlett Cc: Christian Brauner Cc: Jonathan Corbet Cc: Mateusz Guzik Cc: Mathieu Desnoyers Cc: Matthew Wilcox Cc: Michael S. Tsirkin Cc: Mike Christie Cc: Nicholas Piggin Cc: Peter Zijlstra Cc: Suren Baghdasaryan Signed-off-by: Andrew Morton --- lib/test_maple_tree.c | 8 ++++---- tools/testing/radix-tree/maple.c | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) --- a/lib/test_maple_tree.c~maple_tree-skip-other-tests-when-bench-is-enabled +++ a/lib/test_maple_tree.c @@ -3585,10 +3585,6 @@ static int __init maple_tree_seed(void) pr_info("\nTEST STARTING\n\n"); - mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE); - check_root_expand(&tree); - mtree_destroy(&tree); - #if defined(BENCH_SLOT_STORE) #define BENCH mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE); @@ -3647,6 +3643,10 @@ static int __init maple_tree_seed(void) #endif mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE); + check_root_expand(&tree); + mtree_destroy(&tree); + + mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE); check_iteration(&tree); mtree_destroy(&tree); --- a/tools/testing/radix-tree/maple.c~maple_tree-skip-other-tests-when-bench-is-enabled +++ a/tools/testing/radix-tree/maple.c @@ -36299,7 +36299,9 @@ void farmer_tests(void) void maple_tree_tests(void) { +#if !defined(BENCH) farmer_tests(); +#endif maple_tree_seed(); maple_tree_harvest(); } _ Patches currently in -mm which might be from zhangpeng.00@bytedance.com are maple_tree-move-the-check-forward-to-avoid-static-check-warning.patch maple_tree-avoid-ascending-when-mas-min-is-also-the-parents-minimum.patch maple_tree-remove-an-unused-parameter-for-ma_meta_end.patch maple_tree-delete-one-of-the-two-identical-checks.patch maple_tree-simplify-mas_leaf_set_meta.patch