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 AA504C001DC for ; Wed, 26 Jul 2023 08:10:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4BEA86B007E; Wed, 26 Jul 2023 04:10:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 447756B0080; Wed, 26 Jul 2023 04:10:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2E8516B0081; Wed, 26 Jul 2023 04:10:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 1DD586B007E for ; Wed, 26 Jul 2023 04:10:44 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id EC0CD80CDB for ; Wed, 26 Jul 2023 08:10:43 +0000 (UTC) X-FDA: 81053041566.15.25329DA Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by imf11.hostedemail.com (Postfix) with ESMTP id 16EFA4001E for ; Wed, 26 Jul 2023 08:10:41 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=hDJE8eg6; spf=pass (imf11.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690359042; 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=La30n3p8fENYrfJWqtvIRjpZvPcttyQzv7ZUcu4OWh0=; b=vLltKl03sEaRIoGphTMGOEacILEUi02p0LF/lBOp0ltxCXk1HSzrovzlgo7xTtDZVb0Bs1 8vMQausMh2cIqsJzlCtO8OhCrP5lBnAp6emjqj7WZRNz30ZVcj1S19sIGym/91BMVvrtbc VfKf1bv6zfROFqi5E2V/Jzz8eiL/0Xc= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=hDJE8eg6; spf=pass (imf11.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.216.45 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690359042; a=rsa-sha256; cv=none; b=2sr2ytJ0dX4Ew1ZER7uSk2TplabnWtq7jDP12e3BOkmwqyADk3mF6d2FDvNrzRVe0iGknf lhAvW45y1EipWaAwN9cKt6ljVCPxnZ0uxcCOv5pyVRZ0gZA3maNB4qo6X3hRGJQKGTIn+C wqZzEN449jzw5OsChsjEZm/RYS0Myxg= Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-26598fc0825so487463a91.0 for ; Wed, 26 Jul 2023 01:10:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690359041; x=1690963841; 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=La30n3p8fENYrfJWqtvIRjpZvPcttyQzv7ZUcu4OWh0=; b=hDJE8eg6JhSqyFPBgmdPFLb2NvreqZRkoQ0fdGojtOrd++HIHNVUOcYmZwlfCxm5K+ 7S9/adYQ+mg7sePuGXIBKc3RGbqqWjQTdPhVgF9gclNb+ndj+3HGIaBgnMq+mTnEsAfS nN2TDe1AymKzfNIyX0pmL+9gSFtSZWjLFgJDdDBiEQVKijpSxGzTzdDVwHZxORnAaQUU +Ccnk2vlrYUp96CC7W9TS8BkgThX3dUut8NY2hntTU6eCEHXncFT/nxcYtcUKsiEhorE tPaMsoIeutpOBq+cJKv6F4JMmekbuoNmYseftMJvCzZYYszTS4YyUs6sAV+hYDzi/ty6 YQHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690359041; x=1690963841; 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=La30n3p8fENYrfJWqtvIRjpZvPcttyQzv7ZUcu4OWh0=; b=eR/vQ9Hy6kQrUu0R597RgnEyMlo+R9Z9jMC3NcWgnK3k7pP+XprpUj0maH0NRqlTnP an38WR7X6I+vNyRJABSJh1ZfvTUE/lN7JRRvmbTVDi2nfkzbKyivXu8X+NodHml0VnNF v7782GzY6nVNZiAxxZ7lOvFuvU0G3CQs+JUmb3cbRAoGzLqnuMN9ZRk7sNKxBeQw8hV0 bDtQvJVDXREORsVql9NS0x6VS24wlHOOlh9/UPl72PSHbd4WrLahEYDHh09kEv3Hz0g0 CncXmzpiPHp0U/3YbEu6xKi/yg4ym8F3sFU22+0KrRfVk3/Tgo6i9GHkapNfs+NnVvYF 4i0A== X-Gm-Message-State: ABy/qLYID+UAFBKDBwT8/nVcBNC249TBQDdI8PwzvZudOv3am3EVNp+q xGlKYRiPSUgG/V5jfObtE4z3UQ== X-Google-Smtp-Source: APBJJlE8cIpYZ+sTitqIk/v4pR8PRlkevNUmvEDeqPpuFom8xFn2KAvQVis6NXMadCyNx4ljN105gA== X-Received: by 2002:a17:90b:8cf:b0:25c:18ad:6b82 with SMTP id ds15-20020a17090b08cf00b0025c18ad6b82mr1683093pjb.21.1690359040966; Wed, 26 Jul 2023 01:10:40 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id gc17-20020a17090b311100b002680b2d2ab6sm756540pjb.19.2023.07.26.01.10.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 26 Jul 2023 01:10:40 -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 09/11] maple_tree: Update check_forking() and bench_forking() Date: Wed, 26 Jul 2023 16:09:14 +0800 Message-Id: <20230726080916.17454-10-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230726080916.17454-1-zhangpeng.00@bytedance.com> References: <20230726080916.17454-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 16EFA4001E X-Rspam-User: X-Stat-Signature: 4shreagydg8ynmtiyrjzi1rhhqgj7hm4 X-Rspamd-Server: rspam01 X-HE-Tag: 1690359041-944704 X-HE-Meta: U2FsdGVkX1+vhb8qqEjgR/bfnqJ4sM0LBjp9/xQsrd6FOP8vAY0aaRzGodatim8e0raO+kh4/k77Vrqg5jfSX2SEquQWhK9yaBu/xj1MepB01bFne5DGBJBm2zqVfWAdsRwE2Tj1S59GXRje23puN14PSqjkM+7JX3ic2C7e0/oaiWnpJ+Oncw/8J2scIJA48dTSG99RUGfIPo7PoYjcjjRYoFcTifLZFRR69RpcYzczf6dzJ+e28qFaRVGPR/Z3UWQ085W1uccJ76d5uXOCI3eLbc4YtEELu1DVO2vcw8nCMyz7TOH2ZIVM6fF4V0AgSIffEj+0El/LIuEjopCOo5PYcYi22ODkZQcKLOQs6hc+nc6DllS9yw05X/HpVaGWEqPtM2oHJ7kj3dmUUqW8D5QQeOdNXkvXt2QHH+85gb5Wncy+0naMM0e0vaAhYji3ZBphSlP3JkKm016k2FFAh4qsu58neZjtU/Q4qM6g5nBQVx6+dsGLCLvB/lyg6VB1tRMTWlKHvyy6wlfzFVv1PfMPT+0hVp+WjBvJF5brZ+x063524aEsfbTg7duAE9jAo9reeiek6SJCXdSC7zrjxX8oYnYsh9pWB7kiLgy7Fp0AnWlnRciBUMq67DZhc2nXKXuxImU3MJ7z0tiEjqK89wllbdmU9q18Onz4sv6AgvTsBz5KujIcERoMhnaGG3OuK03VtpPMoyq60aoYunj3G8hsDUARbDfQpVKUsegNkqiGd9ukO4mIRSI6q/M7ydlGkGb8C8hGAlA9hODrVqvEMXmyw7sq9HYJbZ+mgdBbY0z5pY0dCHi/ZpvqTawATbSV99DVh6KEVERU86JmtQUl9NxiWBxl76xhRloil7yZip7+pKyRX2NC+Y8jBtr/boYJ4Ru/JrYCpCrX/ys6jMWV20IlD5Oq5OR5fXmKR29VgtvBNlEIGHL1pbS0+uOl7Vm5iDcPpljB9vfIFy32z3O gJYlPhpg WuRQt/rdbiqL9nHZRQwVh8SW5b0zrp1lDQLaVYA3Cx6cOWP28+zmfTh+5V3uhDizRXTXrZQOxIuvYfirxEcIehrg9TeaGsqN6qHRC2xM3HsvKCQzpyIy7KVumIQP20CeA349tYu+KmctxkHuvg9yIioG+98fOvwqME2hdUlNlUpkSpSRUunB73ZMTcW4JpHRua6olcc8kHe0an+PmfehVwlO/DrYpdLZoFE4Lc62CfBQNeSJtyScYcg04QXY4Ht5VkKnYtGNralX1J48fTq1J+P2D8o3AK9yIGcwneyuI0tijhrbHwGrmVoyfduxDEagklf3dThMdlp6XKTusSiL+p2e4AS1iGp15U4KQwMqKZEa/Usn8VapBshMJrvl/UM3wy17uR4vUdSVhTwmFU5KKbclO0kbEFGDhAaKFQ8mFFw65vBU9sKpQFLzBTJ294gA9lCzu3U95FA+sp5g5Jkf45AYubA== 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 | 59 ++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 34 deletions(-) diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c index 0ec0c6a7c0b5..bbdac08927c6 100644 --- a/lib/test_maple_tree.c +++ b/lib/test_maple_tree.c @@ -1837,7 +1837,7 @@ 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); @@ -1847,26 +1847,22 @@ static noinline void __init check_forking(struct maple_tree *mt) 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_store(&newmas, val); + + mas_set(&newmas, 0); + mas_for_each(&newmas, val, ULONG_MAX) { + mas_replace_entry(&newmas, val); } - rcu_read_unlock(); + + mas_unlock(&mas); + mas_destroy(&newmas); - mas_unlock(&newmas); mt_validate(&newmt); mt_set_non_kernel(0); mtree_destroy(&newmt); @@ -1974,9 +1970,8 @@ 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); @@ -1987,26 +1982,22 @@ 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_store(&newmas, val); + + mas_set(&newmas, 0); + mas_for_each(&newmas, val, ULONG_MAX) { + mas_replace_entry(&newmas, val); } + + mas_unlock(&mas); + mas_destroy(&newmas); - mas_unlock(&newmas); - rcu_read_unlock(); mt_validate(&newmt); mt_set_non_kernel(0); mtree_destroy(&newmt); -- 2.20.1