From patchwork Wed May 17 08:58:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13244467 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 BB589C77B75 for ; Wed, 17 May 2023 08:59:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 51B9C280004; Wed, 17 May 2023 04:59:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C91E280001; Wed, 17 May 2023 04:59:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 343B6280004; Wed, 17 May 2023 04:59:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 27CEA280001 for ; Wed, 17 May 2023 04:59:01 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id E5ABDADDA6 for ; Wed, 17 May 2023 08:59:00 +0000 (UTC) X-FDA: 80799147240.19.5D74956 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by imf05.hostedemail.com (Postfix) with ESMTP id B4C2B100010 for ; Wed, 17 May 2023 08:58:58 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=CweT36Vd; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf05.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.173 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=1684313938; 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=PgePm/CbmI9b6FDUeL4Fm0Rwlug6tP8O/eeOWJHUuog=; b=b5jXEhtlQYqSg9ncI3KOc/dCeAhEr8A4LpZefTavZp5ahw4NHPLcjEdqk6SWf8H0ZuZeiP rdRvW43C8lk0Cnr/rKjhY7DIGBCQBvt15+VLJzqtbeCkigOxQDtca5Ed1fD6uRszjlGPfa b7pOvHcJ1l20qvHmPqzQ82zsKOIvOrs= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=CweT36Vd; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf05.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.173 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684313938; a=rsa-sha256; cv=none; b=Q6dadY7PwYghSN5Z7v4+wzNvZ3jDqnl8QQ+Ys+E3BLZdTWxLmKmqkv9T5rJ3zfqhhCNE6s Dgjd/g7R1kreCOkz2P0vo7LkHzN8z0pnaw6ZWR1LVf3rYIpV3VoNarxA1xJBeBmzoXhWlf clNbm4Wmhssl0BfWRFWDTRfak8CcSco= Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-52cbd7e73d2so432662a12.3 for ; Wed, 17 May 2023 01:58:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684313937; x=1686905937; 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=PgePm/CbmI9b6FDUeL4Fm0Rwlug6tP8O/eeOWJHUuog=; b=CweT36VdUJkzd7EgyQjEpA/g6MONV8fPH2+11DoRZ4gl9z4pn4gx0f5yRC38Oo0kxK /hOZIMttxfmQcLJcRE12mcyOso3iB19zL2YRd6wnP2BIrfQ9RGYC/EvLPmu6VhcdRlST sb8J/NRQg37aubTJbQd4RYW/oGlOyZowBikpiRraOyZTAleG3Aei4bfYFIuWCbcYacJi n3z9EzW4KLf5MngHWtxR8texHVwmwCRUn05aw/7+E6mi4DaBv41SUTLcNOJDhAdcS5Ff rxYgtd5EXyH9Q96Fede6UlmrE+iWdPMfwBb+zROOYYpAeztuNSrfs/mZl23iOCt9k+oc YO0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684313937; x=1686905937; 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=PgePm/CbmI9b6FDUeL4Fm0Rwlug6tP8O/eeOWJHUuog=; b=FjdPPmTuNTa56idYqDImtSL0REiznjlaZBclk9j2DNX11pIDyzE3dGMNIsbdjK6Mn1 aiYywd7hDFUAC4KsHTIDCc1kkk+QNvVRN47snCWyZU5cbAPAVgZlNFErTYJ+z+nwpful HdQ1fp5P1OurhPTTkW6mdFCApyQ0b/c5xr51Z68u68QN6/zAWsdSAHL3uYNf2SlRqVWK FjgaNrJ1B+FJSyI8AcL7uli0f7aOnQUwb0qvdER0/rJ8femMCUUeypYdAWDhVhmpDQ5g +nPOpb/ZoZv8jxkhy7XO7IawP/+85NAMyS83j+uIjzo+IS1MoFaW0+r0Elsa2fRc8uug k5nw== X-Gm-Message-State: AC+VfDw4dIt8kEkppIfRnmiL5HL2oUAYuQV/7N+q2raLsaC8aLrp2wMs QCrpQ+gTN+wsKkHjbqxIPyMjQw== X-Google-Smtp-Source: ACHHUZ5Pdv2NaLOo7WcmzSQapiahkZn70TlS2n8UFh7QzMN8tnXEt5QRKZ2elo832+y79/XLpr8c8Q== X-Received: by 2002:a05:6a20:a10d:b0:101:4d10:e40a with SMTP id q13-20020a056a20a10d00b001014d10e40amr37103525pzk.12.1684313937698; Wed, 17 May 2023 01:58:57 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.255]) by smtp.gmail.com with ESMTPSA id m18-20020a63ed52000000b0052c9d1533b6sm15056765pgk.56.2023.05.17.01.58.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 17 May 2023 01:58:57 -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 v2 04/10] maple_tree: Simplify mas_is_span_wr() Date: Wed, 17 May 2023 16:58:03 +0800 Message-Id: <20230517085809.86522-5-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230517085809.86522-1-zhangpeng.00@bytedance.com> References: <20230517085809.86522-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Stat-Signature: ub4umgkasumf4dqpoo34ftazqmb1n6i7 X-Rspam-User: X-Rspamd-Queue-Id: B4C2B100010 X-Rspamd-Server: rspam07 X-HE-Tag: 1684313938-436634 X-HE-Meta: U2FsdGVkX18Y4X0OBxl8a+k7O5T7V8ydKIxQttfLNQykEPOeyf0SkXn2+vCJbZ9z9s7D/aXw+k7J4aKptO+hYSa25b0U+SS6pQpYS1/PXNbq+XzF6vXQcfxE9NHdz1Y9JvLcBDdeWrsTcx7eb4QGaW25nLGZaFvV/FLQQmKDIcS0wFbDJS+1kqQA9kBEABNFZQ1yTy2Q/5BJCPVU0NxuhQriKVHciV3ueLvox+phKGOZ5lUSx6GLzrXTbdTNF8rsfv5bEzWpScWXR6zS8Xb4ZirPN2vAGaxDdFACC9QZGgyWGyH9NXbQt9CKSKNhWV1v0aZ4mLBGOFThLa5VSHNUJt8uu5rJIFeHcYJ2WIV5gAVdsdq4Ayz2YsKEZRmJgCAQNhpE8zx1GxCl/ny6ur3ckTxVmYpl6VL4LU9KPw6kgqWwgsOZx8JdDH97HcD975PAXHhJffhJq4K9y20EiZdiFOEasbgVLtg7dEB1YtEpQzQ4pytNNjBNslXXDRrgEqiDGsWHXXsUkiXfdvCNTo8+JpoCK00qOdMUxV09lootZE4+PlXhwaBdZa4ULyihgV7uRstoI+ZVLi8Lb+0I7pSagyW8O8S+uZ7ytHEH1NgTDM83/F5OtM6PbPcK5veIrR5Wd3/TEpbfq5XiaJ8rlIcPtDhh8pn6vaY78H4fUaAHGrg0HH71RoXDW69lYCObzx8u6tl9vCEgX3wFCIPikPqN4q6czf4UNZfjI5rMa0rTAXBMWkyv7Q8WCURJPlpGqzcZUXU5xnpuKOkyzOd27BAyxTk1rjN9AsWZYYH2CHVW3eMKDObkDobx1M7mSyKErMYPSkwDl6s3c+f+dT1Bam4Hbc1iYUcB/hi11AscofT/y7bUVttnpD4c6JOlHMHJo1MRHVvzndYd+JSPsFTVcyPwlEIbHWRIS5a7FeslQxfBRZpDKdhqqr9h3p0fRTGpZiheItTbnsKdij6VyqXvw5y 7WrTj/fz SI/LIKB4o3ZwzXesZ26pfX8WuknBTbrw8lES85LUu9n5tcw5fJWPEvoqUOxhU1i/7G6HR7q9jbhkE5Ev0Lg2XR+sbvafZbzSpL3w7TUQheb7Q5/gDjQ04zrkuWLRcKA6vnR6GPXpaCoZqHPNztuzjbXqy6w0Y8VA4JAdnEyj7lhDEKKjPWuwEWQbuA0U5+rktQlahfADNyRZl89su8b00Pc+e/6Eqa668TKdVzdHCMpoP6Hc76mh/gHMVGm/rfBa510LrgN5GhrggcPAfwbQumAjpud1LOLRVL4hg9qrR7oJOK5n2j5eI18Zh2rbv/O+fKo3jW/ZGvNlDEwVT0E/7tGv6ANKsxNZme6esAIBVeVnkOe78vuGjxcIK/HSORfpdmDa5nemc3WCS6o7wW3jnoumz2T8dv0YhCnSPdjQhBGCmyE+H6jEjYblnbSczXej6pMtkTx2K64ofxWfZsYar6Owd1E+sqf32epofmEvPTCL0fJ8= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000127, 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 --- lib/maple_tree.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index bec9906b0c8c..82dccc660889 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -3728,43 +3728,29 @@ 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 (last < max) - return false; - - /* Writes to the end of the node but not null. */ - if ((last == max) && entry) - return false; - + if (ma_is_leaf(type)) + max = wr_mas->mas->max; + if (last < max) { + /* Contained in this pivot or this leaf node */ + return false; + } else 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 this is not leaf node, detect spanning store wr walk. */ - 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; }