From patchwork Thu Oct 24 13:19:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 13848995 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50091CE8E70 for ; Thu, 24 Oct 2024 13:23:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E12766B009D; Thu, 24 Oct 2024 09:23:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B86D86B00A0; Thu, 24 Oct 2024 09:23:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 940F76B009F; Thu, 24 Oct 2024 09:23:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 5E14F6B009B for ; Thu, 24 Oct 2024 09:23:06 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id E86F21A1367 for ; Thu, 24 Oct 2024 13:22:32 +0000 (UTC) X-FDA: 82708561320.02.FBC0484 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf17.hostedemail.com (Postfix) with ESMTP id 325D94000E for ; Thu, 24 Oct 2024 13:22:48 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of yukuai1@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=yukuai1@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729776030; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oIvfLfqLUMiJn0L1jqcN26sqY/euWihlroCD6zZ5g8Y=; b=BUsVNasKEdDLwFikoTJVyUGkjWad6wtQLb38tN9F/GBlqR4SIBWNKXZ3T4FZvFtzqgXbZs 9kL5V9+GZzE4dEeoHhfSC9iB20PiMaFa9KobnZjcAWFHauwM4fqeoNOprLu19MSBQ1QPH8 vqxTkcwDVcw1iFjREfK1pghQ9V3O1Hk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729776030; a=rsa-sha256; cv=none; b=pbi2mmvnCZCkjf7XVYxmpXPssRkN0tJAQSRaR0nRIEPW7nCtXfL3VNpT+KVapq+xjTbZ7X bzlCn2/H4ggtBKqbdvEq78e8IqY3+UiqLBjvGgIrUoUmaOrTSiVJULcZCKwDH3qca0kr2q fMut+bAeWTWL1xG9P7JaIQlhgFOp2ho= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of yukuai1@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=yukuai1@huaweicloud.com; dmarc=none Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4XZ66G4XZ6z4f3kpc for ; Thu, 24 Oct 2024 21:22:46 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 0469A1A018D for ; Thu, 24 Oct 2024 21:22:59 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgCHusYpShpn7tb6Ew--.444S8; Thu, 24 Oct 2024 21:22:58 +0800 (CST) From: Yu Kuai To: stable@vger.kernel.org, gregkh@linuxfoundation.org, harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, alexander.deucher@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, viro@zeniv.linux.org.uk, brauner@kernel.org, Liam.Howlett@oracle.com, akpm@linux-foundation.org, hughd@google.com, willy@infradead.org, sashal@kernel.org, srinivasan.shanmugam@amd.com, chiahsuan.chung@amd.com, mingo@kernel.org, mgorman@techsingularity.net, yukuai3@huawei.com, chengming.zhou@linux.dev, zhangpeng.00@bytedance.com, chuck.lever@oracle.com Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, maple-tree@lists.infradead.org, linux-mm@kvack.org, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH 6.6 04/28] maple_tree: skip other tests when BENCH is enabled Date: Thu, 24 Oct 2024 21:19:45 +0800 Message-Id: <20241024132009.2267260-5-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20241024132009.2267260-1-yukuai1@huaweicloud.com> References: <20241024132009.2267260-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgCHusYpShpn7tb6Ew--.444S8 X-Coremail-Antispam: 1UD129KBjvJXoW7WF4DCFykCF18uF13Cr43Awb_yoW8KF1Upw 4xCF1UtF1Iyr4xW3y8tay0gFySgFs5G3WUt3ZrCry7ur93Aw4Iq3ySyF1xZrsxWa4xua4f Cr1Yg3W7J3WDGaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUmq14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2 kIc2xKxwCY1x0262kKe7AKxVWrXVW3AwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkE bVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67 AF67kF1VAFwI0_Wrv_Gr1UMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1l IxAIcVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r 1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIY CTnIWIevJa73UjIFyTuYvjTRAR6zUUUUU X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-Stat-Signature: 1qgsrgftsy4zg8yajorpj1cfkaqup83t X-Rspamd-Queue-Id: 325D94000E X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1729776168-840236 X-HE-Meta: U2FsdGVkX194BB5LmPFvx3dEoWMWvk5ftKmrk7+8VCjuPwi0468MMCj1bfOS6pdp5bmPFS4xYUH59W6r1mWWjK2SLc4R5C5MSrHecI3wMgzm5nloqDDFZTP5+PoeNzzyHGqQgQ0c+vo6MFETw/bP1VS3A168+XmDNLhnT6Q+TjVU+j+fJZk2PA+EyjnymfZgGaNlRiSsk7ZEwdxQlVEREvpckFwhgeGcRQsFSvM5T0l9oMJvnvsv4jZDcJ1EB8XVHq6L3bZ+Adj0YrtubjlX/bxlK4c7MlyB5woqJp27W9Su1IOeyBvNyNb0vY6huDmENbp0RohjLQQXkA8ax5Ud4FIo/hpm4cJ6mKbcb9z8DNUGCaZzcBzKZ+i+i3qVvH2uVmSzVsela82HxJY12SPjJ70hSEyrcAb8sTTGYTquGbXIarwo7Q6I/97GjjcDbr2jhwu3sb2AQ8OSZQ//n5OHubYhQm18rnGDh3PMg0j3OVAcXJtAGE68Dwv4KPmlNoGDrGmlYzV8gX1nBHFWi3eySsCleYxyBDzMzkAZLICdNVDv5DgZmP9OezvZgHNLdjFZM//qRyvSSuLFcNx8oJEIyNUADS8K/oUnu9iSAOuDg9oawnI3FsaeiySgz6QYFAPdmc4lQ6pBbKAvHKordAicFaATlv6/1COkyW9aDoIcXCalU2M+f1BwIpcqclnnqC11wWNLftHKCrKCXiFVg8ON7nAyucyQM8EySa5OauK40nzyfyJv9hWMsBtpkIIjRqkRJDCJogTG76Q91YKh+o4Pd8i/ZrPW2hRDnzo42i4qWg+iqekzKyphfn7zLh/9I0Lewy1jZuLcozzOtc7Uswrp/176aSNcs/ApT2psbZCakspryM8ncRangPqjsKBIgl++Q1eX7cNsap8NzZr/451+7OQdCaaIXt2Z8RqUkJI+iDRE+TsZv7XXclM/vOup1HApBrMdDSa0qjXmGVG6fMQ wJ2Eryp4 P3yxjsEd5MaHxKFaKhv8CwLdQo3GpxbChGrHM79OVWZ5+EYiYNXb0dVfdy9cJTkYlTivN0gg0Ro67mzNo91VZCpe8Wsl7GMt5LvdBlqdAmFe3QasGZGCzLjTmglC2WMjWmmwQRystHp06dhpb6fpLamki+ub4413T7c1k7QS9fvtg5/PKBrWSE7TnnBnW5NvevfuA6mZAuEwilXk4RY+wPj52NUBOk4CkyGXaoq7G+q+kyw5OJcmQSuhLFnAWDWYZ6DzZW6uwzRrsY/lwv3V4y0JJpKu+hC1D9X4SktG3/dZwbdEc++Ud2AipCO8DZhA4vAXAUAYEXW4EoTa/hCkVLcfiSAbbqOFC2MciIMUow7omQ54ww5+oxXOWKrTiCnLJLX9oqaKtHOovj8MhetYNU/L2zO3DPs4y84gWQP2dT172XTdgMCU71rW7p2YJ+pFNKR8whDx8I81chcc+pOFj3F2cP05b4ZI6ZqVNYkXtq8twgC1WvTP539NjqyGflGSRmgy9WQ7OnHvrDjSjVHLtuV1nSbA35FXJ+43xUQcTxiwBgQZ0t5B2bZBTDA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Peng Zhang commit f670fa1caadb4ea532a89012c5451e4c6789bfcc upstream. 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 Signed-off-by: Yu Kuai --- lib/test_maple_tree.c | 8 ++++---- tools/testing/radix-tree/maple.c | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c index 464eeb90d5ad..de470950714f 100644 --- a/lib/test_maple_tree.c +++ b/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); @@ -3646,6 +3642,10 @@ static int __init maple_tree_seed(void) goto skip; #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); diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c index 76a8990bb14e..576b825d6bb1 100644 --- a/tools/testing/radix-tree/maple.c +++ b/tools/testing/radix-tree/maple.c @@ -35938,7 +35938,9 @@ void farmer_tests(void) void maple_tree_tests(void) { +#if !defined(BENCH) farmer_tests(); +#endif maple_tree_seed(); maple_tree_harvest(); }