From patchwork Wed May 24 03:12:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13253237 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 5A913C7EE29 for ; Wed, 24 May 2023 03:13:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EEFA6280007; Tue, 23 May 2023 23:13:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E7901280001; Tue, 23 May 2023 23:13:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF381280007; Tue, 23 May 2023 23:13:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id BF7AC280001 for ; Tue, 23 May 2023 23:13:28 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 89E84C05AF for ; Wed, 24 May 2023 03:13:28 +0000 (UTC) X-FDA: 80823678096.04.120270E Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf10.hostedemail.com (Postfix) with ESMTP id AEDF7C0014 for ; Wed, 24 May 2023 03:13:25 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="MAXMrwd/"; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf10.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.171 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=1684898005; 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=E5ruzeEGnj5CNT1/L3jtI3wslKiej4m4uvmLFSF+fv0=; b=wmGQbryOh7ZW0CCHYPwbnNfqKZy1ZWyt7FrlxsmTHfeOKpzrgod/jj9RovkcguZb+m2lUh jH4eyFERfZOjSkvqifVh47aAdzFV/zlYYK7TeddjXWtGaXFE5A+I5IDPTiQwxSg4tneTvc iVQxQnEFChEL0pRRbr8xebPtyTNRl9M= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="MAXMrwd/"; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf10.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684898005; a=rsa-sha256; cv=none; b=rozfM5R6Az7WhmEOGocGPIH0dzKYYJUO96eGmQ2NmrDbT5tVaimJz3HTl3YsEUOBY78XYG N9O/bBiej6cGjyfAljW568X/OlC5pG2MPyPN0oWWS6hkLlqKHo2u9qDMBwlRmATCJlw//V Xj2A3Wc/ijh3cGyHTW7U65aOPDm8hyI= Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1ae851f2a7dso38794585ad.0 for ; Tue, 23 May 2023 20:13:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684898004; x=1687490004; 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=E5ruzeEGnj5CNT1/L3jtI3wslKiej4m4uvmLFSF+fv0=; b=MAXMrwd/Xszur0x1fVAw7betXZi6Nv6iEeLRVE5rWFKAKqojhanpmq36+yY3jJQzsO M9EaO7RCl07OPXG4T0XWZ9VSsKYxu0A23zt5ExwuJrHR4zwdz4j0AmGa1VSOUMO6wVYw qbhvNZyU6dI9n7coOrUlXhim1BD85Jo0/sUOOUpXURBnyIkhz77RCwKkEwgBBXh8yi4h lupqDHDCc8iRhYj0YQ6830133yOLFDVOMIx7nBBQEQIABrD38VhOK6s7jpcSWBsQBTYP IV1HaE09ZjaHvHuTj90fgQdS2QStLY/pP/3jhoEO7eVxczLOyNTW1OWsR4ZkoGp1yHNJ r9VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684898004; x=1687490004; 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=E5ruzeEGnj5CNT1/L3jtI3wslKiej4m4uvmLFSF+fv0=; b=N2+jURBiE1g2wMkstY4OsJ9YwolhOcn1J+AgXA82DQm9S2s3YRoUxQMKZ68I6rVQju mo+6RRa3Z5Ltlr/0gnQAmHG1DdtIfDKXz/DImSyGNp1QbDpB5a+4Z4WxbuBYtgk75W+E e+smA8jI/IucMKT+efzQhnxC9aB0+ciL8eJDN3EHCd0SkKuRWCpuEjj155wOy+2vnN2N y+l47n05QfuzAQyXuQQb96j0SjayPNFjwDQqL3iJ9yqF98sDKuqWfSJGVZxpLXEz6OYw 7GVq4b0WlD/LADX9xgaNBmp2nMT/og+ETNZN+VdBvER631sGbume7KVvhN223tcsL7lT oayQ== X-Gm-Message-State: AC+VfDyeAxIzRk8dFg8biVBe+8q/6zn23crxcPQ7SpyBRUkDjiTXfwjj ZCbI7m7A7jumC4UIrmLINsgq3Q== X-Google-Smtp-Source: ACHHUZ6DAmE3MeGOc5YNkDegpteBBglHsp+EtBuDqz75GpGc17B78j9ExHKLk63janlv3Z40tdQw2w== X-Received: by 2002:a17:903:8c4:b0:1ac:b03c:a58e with SMTP id lk4-20020a17090308c400b001acb03ca58emr20956735plb.25.1684898004536; Tue, 23 May 2023 20:13:24 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.249]) by smtp.gmail.com with ESMTPSA id i4-20020a17090332c400b001ab061e352bsm7480769plr.195.2023.05.23.20.13.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 23 May 2023 20:13:24 -0700 (PDT) From: Peng Zhang To: Liam.Howlett@oracle.com Cc: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org, Peng Zhang Subject: [PATCH v4 04/10] maple_tree: Simplify mas_is_span_wr() Date: Wed, 24 May 2023 11:12:41 +0800 Message-Id: <20230524031247.65949-5-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230524031247.65949-1-zhangpeng.00@bytedance.com> References: <20230524031247.65949-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: AEDF7C0014 X-Stat-Signature: ipq53dxndbsa4fz5m7gsf1az84iqssgi X-Rspam-User: X-HE-Tag: 1684898005-210384 X-HE-Meta: U2FsdGVkX185EvTRgIT7DlLBFg2wGxf5x6nGyZTzHIgxxcRAgvzfWZzpTl0bgnisLSt4xsyLC5W99QLFIvkV7GWW0jYB1NVAbrjdB1hfKCwHVmwgnoQ7v6PyJOwH4kaVq4+2WNSStZRIpbmBBHCzueUdtUdrA2/9q0c3Vw5T581x8g7dm4GrEK/4DK4Z3Ni5DV4Hr+g568EGFEl6hb3sTTLmRFZuLer8FNADGQZxgk5hVj2LZzGWVxv9Cyf/+6jPXzwz8RJzSS/mKFnXFZr1493+RKYwStleAfX/eURYMdZm4huaAUn9KRSU4YTg1UcrLDIZHAC06WjwW9CI/jBsDbyCy+caQakD7cy3mOhxi62bXgbDNDdF8WdZMAgZRQb3YtmZ6o5/K0VVE5qVm5TRLEmGv/vr2Iymy+QL0+zcjZaZzIbmHM3ocLWuBo/Ppdd9PVPPc3ED7sogbBGt3VBVkihl1wK89HJQotBfzry6ltoudDrh0RL4n2IRYvmk1pHXbUQ7Ek3SabfeSNvQljslf0YGACPCdu8P4ZAjN2ZsjoSEYuNoFmS4uRG0felS6Mk3jQVDM2yVMNOJ19h/c1eqGnk1jtVXgPPorGeOp4K2Ci3CEpTy1j4IiVOdhJz9KnCBhBC94hR3GWFGBMxPWJGLFdDj5buVQrEvWtH3VJC/+REDillvzSmZoGn+sXrXI/cEMj0Bjfaej+2fVxfztw7740vXBWnvqjrcn03YU8kZv0LLRmDzwLBqtZLUA9ZBxyX8WFgJW2rFo6QuR8lyYNV6/nuP+BqrUrRGS7khxeaxB9hicxu8xdpvA9iUgKzskLc4BaC74qQ3SVHq/qiqyPTUc+V37mN2Kknz/50aA3Sslj2heaRUEes4VzD6Yb9zhWZtROlfGZ/1yCxtvIb9Zf7jTfVDValiuZgmVbJ3B0dhlLYsh1SCJLT1Yl4LG02GO/I7gDrwmBOLdYDINgBDViF JDF4kjMt fBQC7e8XIdK/MfrAe6h06/TMGl2m9N0PIFqdzqs6fmX604c/okOZkrXAJoWjjxhHhQF8qgt57m1+0hMSg48bYd6sbp4NZudxPaBqGY751libBASVuWqdmj5mhtBs9/7z4EPPi7Ytu97BfnlWmmUQlj8YM5EChr9ylaKigMZrf/e++CKP3144spKmuw/hTKZJclNfFwKIQQO8rOAyrt4EaYSAw+szbjrq72JQmu9U7JEqqn56cRQZtOkQa8gsnPS8xzNsbEmG9TxMlPJt8j+4d2Vwq3JFBOuxEveYV9VBMnaQGTWhlv6UhHjc+jVYLwaTsqoM1wiZlFz1Jcl5Ody5/cFxL2HwmHltCkVLC+M5Em0E2zVC6/gBGxQyCG8YnrP0/dt42S2OuUdVVeGEvQrZvSBAGbKkQvkRZuTlN7wtUXKmXIEzR6Qm8BRMv1qS8xT4X/PTcAzT1Eo3gU+nttswyl0mq8/w/VvbBFL+tHVIUM1PfSxWWMjDuvvun7LOgYtC2vXtF X-Bogosity: Ham, tests=bogofilter, spamicity=0.000009, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Make the code for detecting spanning writes more concise. Signed-off-by: Peng Zhang Reviewed-by: Liam R. Howlett --- lib/maple_tree.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 3fe6a6685384..41a105e76e22 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -3728,43 +3728,31 @@ static inline void mas_store_root(struct ma_state *mas, void *entry) */ static bool mas_is_span_wr(struct ma_wr_state *wr_mas) { - unsigned long max; + unsigned long max = wr_mas->r_max; unsigned long last = wr_mas->mas->last; - unsigned long piv = wr_mas->r_max; enum maple_type type = wr_mas->type; void *entry = wr_mas->entry; - /* Contained in this pivot */ - if (piv > last) + /* Contained in this pivot, fast path */ + if (last < max) return false; - max = wr_mas->mas->max; - if (unlikely(ma_is_leaf(type))) { - /* Fits in the node, but may span slots. */ + if (ma_is_leaf(type)) { + max = wr_mas->mas->max; if (last < max) return false; + } - /* Writes to the end of the node but not null. */ - if ((last == max) && entry) - return false; - + if (last == max) { /* - * Writing ULONG_MAX is not a spanning write regardless of the - * value being written as long as the range fits in the node. + * The last entry of leaf node cannot be NULL unless it is the + * rightmost node (writing ULONG_MAX), otherwise it spans slots. */ - if ((last == ULONG_MAX) && (last == max)) - return false; - } else if (piv == last) { - if (entry) - return false; - - /* Detect spanning store wr walk */ - if (last == ULONG_MAX) + if (entry || last == ULONG_MAX) return false; } - trace_ma_write(__func__, wr_mas->mas, piv, entry); - + trace_ma_write(__func__, wr_mas->mas, wr_mas->r_max, entry); return true; }