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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD051C6FA8F for ; Wed, 30 Aug 2023 12:57:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 75CF7440154; Wed, 30 Aug 2023 08:57:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 70C65440152; Wed, 30 Aug 2023 08:57:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5AD54440154; Wed, 30 Aug 2023 08:57:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 47D5A440152 for ; Wed, 30 Aug 2023 08:57:55 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 264EDC0154 for ; Wed, 30 Aug 2023 12:57:55 +0000 (UTC) X-FDA: 81180773310.22.ABAA061 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf25.hostedemail.com (Postfix) with ESMTP id 2CC89A0024 for ; Wed, 30 Aug 2023 12:57:52 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=bHI7jP9P; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf25.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693400273; a=rsa-sha256; cv=none; b=LeC+bqGskupq63myhAXY4vgcaUm3vnmjOSIMsmVzySIIsQTlyJfp42MvUemXq8XY0wOZB4 Ex3YlJOH54UPxtyCZTfGqS7MsuWIXGJkEySf7hs6pEn9Y6I9n5hQXFyysgt7SGMJCUARG7 stAlKsbgsK621kKnyrL37gbwLxSB29A= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=bHI7jP9P; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf25.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1693400273; 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:dkim-signature; bh=likGmWzdcl79JyC0G273JC8fCg1Z1MuweBHmHeu5k34=; b=LnjOUzKkgZw7ApJ1Kj2A8HE2I5MAoSZtlL8BORxKEL+PxUdAaDqwlDF5RPs9mkfyzyc1kl Jiyl/Ea8MEHMkEcUqC4qMICV8HBXJht57cP/PqHI4R0MeZlzJbal+qlhAQlWG5+8nZsXh+ rvonGFCFN58MYGmLe4i0cjx/dN8qL/Y= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1bf57366ccdso5872415ad.1 for ; Wed, 30 Aug 2023 05:57:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1693400272; x=1694005072; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=likGmWzdcl79JyC0G273JC8fCg1Z1MuweBHmHeu5k34=; b=bHI7jP9PDSTQjPdckHP+nVE2smx30uCrB4kwSVUYfICmldmczu5MF/ljYQ6gscQKn7 B2C0xLyB1tu+WquJKTp5xZ66HML47L9spWgUDr9lALd93hp7n03iNJjEDkOSU5/IIFzk TUWIxNxmUMicaUmQOEEw6pMOcTb/kiqE8fJT75Iozrna2T/fY+oNjEmo6ywrSnNrEWuM v7vk/G68Z1nK7vMA/+jjziQCVW2jQVRojg7426PcuCCz2tTsp/GWPwRqUO4A/ZkmpgSU h9huv3eJmGHQmdJgJL2zHkYMz9FkDgiEYg6N+fjnt+xZlu9QcrgAtgDsIHcDHTKtamtZ UNdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693400272; x=1694005072; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=likGmWzdcl79JyC0G273JC8fCg1Z1MuweBHmHeu5k34=; b=QZ+WfARhwrvYH+g3/7Gf0MNtJ5NseHFkPyrbBKQL23WWUUJ/p8UM2txuWR2waIVwVs qVvYFV8srOJ8la5aSUWYQ/HrM2TrjEt22FhpfoaA1pwXXe9hXvxx4RMdiPWiAX0Blp2G pygsWmMfz28Z/jk2+QMtiacYtgqiYFFG1qEQlMm1zHutnp2WzNuiUl61srpUhfIZOusJ c4QcUXHiq/FPdmXtUPB/nT6QLTnd4cQUvb2jg+XS4tzD0qQeG5MtbKxKw+rfaiWCFJlp CuR1pjSqovFg1Ia4hmAn8i4ltwfFLr+pKdtDs8kvzGXGPmugAydNXvTbRcGYtobJE2H0 e7rQ== X-Gm-Message-State: AOJu0Yx8zfwNkszZAQTsxwK+/9+mX+WdHTOC1nVhDJExE2/X/ytUw48e hStluZhY/yM8irowHppDxzAVYQ== X-Google-Smtp-Source: AGHT+IHEZW1hekFijghmb4eDJa5CJeFIwOgrvu16t1pBzdglsm2NfGWuHdAFed9GN5ly19C8PHDQDQ== X-Received: by 2002:a17:903:228f:b0:1bc:4415:3c1 with SMTP id b15-20020a170903228f00b001bc441503c1mr8693507plh.7.1693400272035; Wed, 30 Aug 2023 05:57:52 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.247]) by smtp.gmail.com with ESMTPSA id iw1-20020a170903044100b001bbd8cf6b57sm11023265plb.230.2023.08.30.05.57.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 30 Aug 2023 05:57:51 -0700 (PDT) From: Peng Zhang To: Liam.Howlett@oracle.com, corbet@lwn.net, akpm@linux-foundation.org, willy@infradead.org, brauner@kernel.org, surenb@google.com, michael.christie@oracle.com, peterz@infradead.org, mathieu.desnoyers@efficios.com, npiggin@gmail.com, avagin@gmail.com Cc: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Peng Zhang Subject: [PATCH v2 5/6] maple_tree: Update check_forking() and bench_forking() Date: Wed, 30 Aug 2023 20:56:53 +0800 Message-Id: <20230830125654.21257-6-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230830125654.21257-1-zhangpeng.00@bytedance.com> References: <20230830125654.21257-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 2CC89A0024 X-Stat-Signature: ws4deqf3rx98baebmfhnhk4q7ocawt45 X-HE-Tag: 1693400272-498839 X-HE-Meta: U2FsdGVkX19YnL21GJXPavzXvcBsWff5BNluCg6sayd3tJMMlbPG+pmS6fDjQ9Qw30Li9YQG+nfbtX62nkh0j/24pwhYvYxISyhXsc+wXoJx+ELUjowQ03DKlxUiUJnp2gyeHsmZvfIsqwg4505L6D5v8dS6m4QwGP1W9HJ2HklBAvhfk9n4BIbMPZvy4ArN7iY84oTdQbzbhzZ4qQMe6OBzXYKkstZkHosn33qabCWui22yf/uhOftXb8ZwPuFK3Qkm0Ekp5GZHAVIefe5Ijhn9eus8AgBf1rCBrJjtOuKNihjz27f+ib1X9rQ57SmCxT7/gk41mJXmgO711uTPP5srqkMqRbHPQvu5y5xhJdD1fala8cAKD9TEekTesonMFSTW0NhIkYjiSwe0u9hQG2jauix9DaVRTJtNMmrOaSQY2WCIRwt9CHOUiIecetAq02q2GnGe3bux6QihrWAvxYbuSs8BUGgAWrcqLYpTEAmX/5AmKiYGx9XAPjly0uol6Su+41M6qQKyC8yB2vKHFhfK1scqqYsJVoofbKZ9kwHOLdgohs/o6KyhYKTpaaZCOwF88pgTiQC24jOI+aP/mMXQPMMHj8wQ9S4rVuzTeM5G6BANlIXdcx8m9H4mtoIgZtv6EUIirupX0bALHbqUzFhlahcH6KeHFLwkacLWfZ5O7q48BHNRc5JBUIIWlkEULlXISHIreXG5Ljeb1N026LOJpBNZwaA1pKbtUOyVVE1xOaCc/0cqMPQHZEhVax1y4VHKwV+ULQSW3TYAsvMOQsQ020eb75tnPZX5KjTDlktEIpkUgNv8SaPmCAueSELTp5c8DsIza9lWGx9bkpaRwkKnwiqmZKi0wY0reY+FwhfiMnzswqGgEnj6RF3vqpY0lvcMYHcq9E4QbfTMysx82r0pQoIPRj5Hcjb/t+jTUAB2yV83KjjzumO44XrkGI3C4EX0aXi1tlq+N7JBopQ qSdabgEu YiHXeienUGA26n7qgrX4KqCC1PyW3lmRnqcHa+vB0qnGMcpaFzF1SSogvwNZJH1xkcDQkXjKwZJsKsEi7LjDpv/sGjrugYn27MbILN1pf4j1ld3VK48Uh27r/ZEGZ7iF7R83cDgW8Y1gTwVLC5rEuMcfX8mvp3YcQzveX6cHvBRGPGomXi5RNDdHYopJVpzVGdcTHsr0Bpa1Z5TbOSPLdXK+HAcoJWEhmBomoKp2kBxmvyscc1lIIZIoD5zW7MGQLGNKMhe84pgEaaBznpKooqJRHwcV0E1xUIRp14jJJmGDNRRArq2DGZjHi2CdcToHObbtGSwHJk36Nr4Y5rqVf8ZJC6UuZZaJLsJd6dRNViuAvuGBItOHhAhMzEsxdoVKHKCeKxrmMTDIFe2M4hSAVf73pvzn73nsNNk+ahS+UBnEQ8VSFWO2hKXWJf64GrhYL2SdvXzSnyi/Zw5FCG0FJFnw8aQ== 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: Updated check_forking() and bench_forking() to use __mt_dup() to duplicate maple tree. Also increased the number of VMAs, because the new way is faster. Signed-off-by: Peng Zhang --- lib/test_maple_tree.c | 61 +++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c index 0ec0c6a7c0b5..72fba7cce148 100644 --- a/lib/test_maple_tree.c +++ b/lib/test_maple_tree.c @@ -1837,36 +1837,37 @@ static noinline void __init check_forking(struct maple_tree *mt) { struct maple_tree newmt; - int i, nr_entries = 134; + int i, nr_entries = 300, ret; void *val; MA_STATE(mas, mt, 0, 0); - MA_STATE(newmas, mt, 0, 0); + MA_STATE(newmas, &newmt, 0, 0); + + mt_init_flags(&newmt, MT_FLAGS_ALLOC_RANGE); for (i = 0; i <= nr_entries; i++) mtree_store_range(mt, i*10, i*10 + 5, xa_mk_value(i), GFP_KERNEL); + mt_set_non_kernel(99999); - mt_init_flags(&newmt, MT_FLAGS_ALLOC_RANGE); - newmas.tree = &newmt; - mas_reset(&newmas); - mas_reset(&mas); mas_lock(&newmas); - mas.index = 0; - mas.last = 0; - if (mas_expected_entries(&newmas, nr_entries)) { + mas_lock(&mas); + + ret = __mt_dup(mt, &newmt, GFP_NOWAIT | __GFP_NOWARN); + if (ret) { pr_err("OOM!"); BUG_ON(1); } - rcu_read_lock(); - mas_for_each(&mas, val, ULONG_MAX) { - newmas.index = mas.index; - newmas.last = mas.last; + + mas_set(&newmas, 0); + mas_for_each(&newmas, val, ULONG_MAX) { mas_store(&newmas, val); } - rcu_read_unlock(); - mas_destroy(&newmas); + + mas_unlock(&mas); mas_unlock(&newmas); + + mas_destroy(&newmas); mt_validate(&newmt); mt_set_non_kernel(0); mtree_destroy(&newmt); @@ -1974,12 +1975,11 @@ static noinline void __init check_mas_store_gfp(struct maple_tree *mt) #if defined(BENCH_FORK) static noinline void __init bench_forking(struct maple_tree *mt) { - struct maple_tree newmt; - int i, nr_entries = 134, nr_fork = 80000; + int i, nr_entries = 300, nr_fork = 80000, ret; void *val; MA_STATE(mas, mt, 0, 0); - MA_STATE(newmas, mt, 0, 0); + MA_STATE(newmas, &newmt, 0, 0); for (i = 0; i <= nr_entries; i++) mtree_store_range(mt, i*10, i*10 + 5, @@ -1988,25 +1988,24 @@ static noinline void __init bench_forking(struct maple_tree *mt) for (i = 0; i < nr_fork; i++) { mt_set_non_kernel(99999); mt_init_flags(&newmt, MT_FLAGS_ALLOC_RANGE); - newmas.tree = &newmt; - mas_reset(&newmas); - mas_reset(&mas); - mas.index = 0; - mas.last = 0; - rcu_read_lock(); + mas_lock(&newmas); - if (mas_expected_entries(&newmas, nr_entries)) { - printk("OOM!"); + mas_lock(&mas); + ret = __mt_dup(mt, &newmt, GFP_NOWAIT | __GFP_NOWARN); + if (ret) { + pr_err("OOM!"); BUG_ON(1); } - mas_for_each(&mas, val, ULONG_MAX) { - newmas.index = mas.index; - newmas.last = mas.last; + + mas_set(&newmas, 0); + mas_for_each(&newmas, val, ULONG_MAX) { mas_store(&newmas, val); } - mas_destroy(&newmas); + + mas_unlock(&mas); mas_unlock(&newmas); - rcu_read_unlock(); + + mas_destroy(&newmas); mt_validate(&newmt); mt_set_non_kernel(0); mtree_destroy(&newmt); -- 2.20.1