From patchwork Mon Sep 25 03:56:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13397207 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 A6297CE7A89 for ; Mon, 25 Sep 2023 03:58:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 48FB58D0003; Sun, 24 Sep 2023 23:58:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4185E8D0001; Sun, 24 Sep 2023 23:58:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 292308D0003; Sun, 24 Sep 2023 23:58:37 -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 0FB4D8D0001 for ; Sun, 24 Sep 2023 23:58:37 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C3BF814097D for ; Mon, 25 Sep 2023 03:58:36 +0000 (UTC) X-FDA: 81273763032.18.CFCBD2D Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by imf03.hostedemail.com (Postfix) with ESMTP id ECAE420004 for ; Mon, 25 Sep 2023 03:58:34 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=ZgJpC9bV; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf03.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.167.179 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=1695614315; 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=WdG6oUlthPIzD1rC2JhHIaoZzeLYPv1w9Sr7ZAA5CbQ=; b=w58Z94G7b/U5M6zShLkb6zh4Ru9RQ3wTvD1fz7U80mC9uvVkU1g7YVkVfHFFWy0LLB/ssp GV4sD7vN8MI16PgYIdRWgT+SIkuhldnOrmppTkGon2iefW/fVEH8TfCDYa21xJovmehmgI Q90TbsTCrev1lULDSXVi01UeqKOr4V4= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=ZgJpC9bV; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf03.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.167.179 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695614315; a=rsa-sha256; cv=none; b=LctdHf6CLERJTovsZP280YQB/vEYMynT6YBgWq2ag6BuKlgRkObSSawtRDoOQjVT+uEoui yBRR3nnm11atnWjqPRqME/nyBNlle3E+wttfpwIalJ+PRtihHTqQM+MDl6o7J35s/HlPSM PO3L1h8MaaWwBfpDxeJzSy1V5slLRnU= Received: by mail-oi1-f179.google.com with SMTP id 5614622812f47-3ab244e7113so3668526b6e.3 for ; Sun, 24 Sep 2023 20:58:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1695614314; x=1696219114; 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=WdG6oUlthPIzD1rC2JhHIaoZzeLYPv1w9Sr7ZAA5CbQ=; b=ZgJpC9bVUV5AxIKRsN46zlbNtJuVZCY7PgxdrS9ANttSBQUV8dFwLP+rvYFmKEc+GP Iw1qHlhmImm+4ho8foLv85/Qtb0yrQI/mJ8bXi+ZKkO37gneHs23W2+tftYUjk+2bWxi 9rE+dZsVGCGd/z8/iecEUP+CicKxnmSVB6UWXlss4eG/CG+7sLTQ8I7fV15/loWVh3Iy 3wi6ba262LKIQ4sy67JU+4OFr17JrCFP9bfS3bQorzs5EYs7Rdc1PsL1dzmyvaT7ZdsN sr+4zmkHBA9QhnKnwMupVEFwlOWzClT6CyLgcDtXKq25nNEu6Kt/hImlb0gM7b/Ds9xD nvXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695614314; x=1696219114; 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=WdG6oUlthPIzD1rC2JhHIaoZzeLYPv1w9Sr7ZAA5CbQ=; b=CAgHW/TvT7AhKdzZAhnBGDSzgS/GB4z/uTU3pcG0JRRksfbwwEOJSS6a2G0ViBEHuI H/F/byco5wyE3YaHYdH7GoKHotWl33JaswwWmvwCRwmlUjAX740T1SD3bnLqdXZ6KihA iGh8uJa3viIZAfq9FxHLMZTxQsI8V/y3i4wv91a31nzrnuLdr2JJeQcMnTyb41WMscsx T/Z3nlveSEdoWoKwcDGGaNd2WE9sGbDFN+0/G93QgqmtDfDl5SWL2YybSUtAjFkQWwHe 4q8J1G84eB6+E/NTIXzupYHzudtWoXVaW5xo0NLygfrdTyd7407h3ySijP024mdCyHkR VR/g== X-Gm-Message-State: AOJu0Yx8q5ZaFpFNUVmP5N+GhTnv39n5tWi69GpmmqdgvY8KCa1J9Rgr NfyUGCFjYFhLxAKGxO/xHv2PJg== X-Google-Smtp-Source: AGHT+IHz2ndjLi4p0Gje1YthvgpBIruj0G0SKyaU/Zdnp5MehEAkCxmAplzbTbydiUzzRnW+WyU8Mg== X-Received: by 2002:a05:6808:130e:b0:3a9:cfb5:4641 with SMTP id y14-20020a056808130e00b003a9cfb54641mr7842375oiv.48.1695614314045; Sun, 24 Sep 2023 20:58:34 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id fm1-20020a056a002f8100b00679a4b56e41sm7025387pfb.43.2023.09.24.20.58.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 24 Sep 2023 20:58:33 -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, mjguzik@gmail.com, mathieu.desnoyers@efficios.com, npiggin@gmail.com, peterz@infradead.org, oliver.sang@intel.com Cc: zhangpeng.00@bytedance.com, maple-tree@lists.infradead.org, linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v3 7/9] maple_tree: Update check_forking() and bench_forking() Date: Mon, 25 Sep 2023 11:56:15 +0800 Message-Id: <20230925035617.84767-8-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230925035617.84767-1-zhangpeng.00@bytedance.com> References: <20230925035617.84767-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: ECAE420004 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: g18mjxgg8atwg48sw5dtnsawjds6s9r7 X-HE-Tag: 1695614314-675928 X-HE-Meta: U2FsdGVkX1+AYDf8yw5zyOEwgrc9JHiFyirprtnCPgOR+vHmHX6pP3S1h6FDluWJ2AXzGxbIsbGd6oR98Jd92y84spt0+N7XSvlyFWhl7doCVJi7qDgmQUaHftmMDH7xC76di/9uAcwKKxcMdOY9eWyUGjkOrwumS2fnMNfsojFeIlpCWsflbYAbsP/8XyR/dnhUpnMMioibQCd0TiLvIPDtDEe7l78hT2WAHRMVcPkwJ5PN6m8+g4mQpGhqol4vsEgyXGKKXpHpmDCo5vxGQCTak/jo9L+e/iyDIXHk1ku4T6rjKw7AB4ILFx1X1u/FB2Nbycs6OPDl0dgJfPNkScmXVH8j9FxMYO3rYfK2uz/iuqzN5rpdSaFc1C1hlNCoPOIDek3HDSl2lD+FmvcnGslx6bz5VKdH6LUtWEx/nRQV+ZBGRPq+IbV/DjI6Nsf84ldbbHBtgmMifzHnAYzp3QtSHOsIUJeeofkqaWM99hycXTDAfU5NLP1Ko/N0+EaRxJxnSWXp/vTLuDoA04K0AVB2JUi5tVc5pOAQXXZIqI0TrjwkJflcUEMYvdndnFBfqYdZ6NoctTencZiCjLZi6L3HFsnwCKuYle48BDLkey9t084z8xdhm4o13F7fhjkvyQQiviDMETvp/8W4VAtFOp+VaDv5REbzst0mQ0lvv3QPi11XUf2VeXg4fWxzHDHHGY0JRaBNZAQUpB01FHDa2Hg7RLh0ic9YY7dtTfeJbU86MfxO0AWSjwkSYG+ylA9K/Ua6SpqadVPolzO1UwD6WBqD3I6Gam2fcLDYCGtkn0OwUYib7LjSqgpDs1ns+DDd8wvS+qZgZizji6HsAZyhJY4vG8sqZQ6xixRiZ5aigxz+gP0h9c2oOfTEr8sIRZ6F30j/HDlGJLh/bPkTX4B+ewmwIAfR8TMibZxmIQkhmx4zkENoxsjuWQjqKn1O/YCr7PTdMUmxGYa1LK6A+5c fgzqcfYD Nh7b/naqLVNRHg8/gY084WXbl9aBZla0JrC4PvrPNo+uDt1QxdttskUyImdPJTxjsQL3qXDbRCi+EqRYeQrpLpDfs36hRpWOT4lPfxlNvNk2ktmm21CzTb3OfrcBMMmoeRyUD6DJ/BUZXGejW9SK2Gioac29D4HU/Ul+ipfpMeLx02hyt5Mvl/J94FhapMQypxyeNtWrWfZpVZCioXD9rPHfBx7SEWeA6zmQZn7AEV5eYqS7x4FmXvbNA+YofYLQU7D+wH0GKUQu+uA8hysAdHOM5K+TBVmT/U1MWBIx/pZQ2ZaEcuyijH14XC94NawxFezhykHuioifrPmiWKmGmFUyNY8Hx3kIPGeJCo3aUBgDGHCwDVO0wTHBouWQ/WXbELxe4FQ4d8+5rF966EFkO5Yc3BmiZWjnmlEwdl/oascZ49qKtsf3nko6z5e6CXKZunVy7v/AthPKYzOj/f3HwJn5TEg== 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. 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..485d308a1ca7 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 = 134, 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_nested(&mas, SINGLE_DEPTH_NESTING); + + 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 = 134, 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_nested(&mas, SINGLE_DEPTH_NESTING); + 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);