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 7712EC7EE29 for ; Mon, 22 May 2023 05:07:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1211A90000F; Mon, 22 May 2023 01:07:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D208900002; Mon, 22 May 2023 01:07:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EDD2690000F; Mon, 22 May 2023 01:07:32 -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 DEBE9900002 for ; Mon, 22 May 2023 01:07:32 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B34D34044B for ; Mon, 22 May 2023 05:07:32 +0000 (UTC) X-FDA: 80816707944.18.C6FC74C Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by imf19.hostedemail.com (Postfix) with ESMTP id E77DA1A0014 for ; Mon, 22 May 2023 05:07:30 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=EKjJchlG; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf19.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.176 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=1684732051; 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=BT/SFNbyjqRQKVOJvWMUTBqOO8oBgaqMrnpmlnOChNs=; b=7skEauciM6m0T31X8Z1WT1NldVMH9/xhuSwPu12ZlZE0mxV3R9o5I9TVEeD8GJxcVlhs2d 2mYI5uItDTuOjXZ8Wq9Oa9OWXZA5WmRHFa69IlAYSgyGvKSriB4HAbe5j2WhFmqgaGgsTO v1a077PI4hsKD1OVWQHH/IJoGtfRNaQ= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=EKjJchlG; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf19.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.176 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684732051; a=rsa-sha256; cv=none; b=NylPGiSUGUOk2nD8zGgKj4Q+tNm+zHRyiJTt0rbH/YvCmVqEq5q7Tr7VKbwYy+a6vyS3vf 0uQLj7SolaRng12sFcUttP9LcqKf1FJLqrkzxgFepSMLSG5YcXDgXBoqEn8Hz3fUi07v/z IQpuKhXG+wqcoSq1OY4Y+C3fFIg9cDI= Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-64d18d772bdso4779371b3a.3 for ; Sun, 21 May 2023 22:07:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684732050; x=1687324050; 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=BT/SFNbyjqRQKVOJvWMUTBqOO8oBgaqMrnpmlnOChNs=; b=EKjJchlGDXRmxJY8egKTtCPHJW2FBKY8xN7qIIKeMpGB4j4yfs4iePqfPdOGDGS203 IQjvd34wUy4iqm1NNQJMsANpzDUtvuiVQo71ID6Ql5b/ZD31hFk8zHJpgjT9hmu5H5CG W8AKwWnNxPTTL+axxU+uEI/qffJlMjhfvrBTBD4nxKkPe9Lqh0j9uCLHAV37edea/+S6 c/7Hxz7fmZF9O9S2PREteryTTvvviwB/5gf/KOkvxJ/j1jRMaiNomC+EdpaWZVIcIXEF ezrPNKmy3LltEsCoP28TpF/5IGnfNZZB7VItCs35pXc12CfQgdA9uAdfhOYdExojYMPD ahkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684732050; x=1687324050; 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=BT/SFNbyjqRQKVOJvWMUTBqOO8oBgaqMrnpmlnOChNs=; b=D3NJEaIIbXW/cjWwJJTi1LHGScvh27B4W5F6aDzDm2w648d5QWC+JYIK9K2nbULDOY PJOB8MDmVF3ydSyXzDkwcxpsRhGugyyw3iO8YXqdZMvFYGX7cI2vUm3qS9vLDR4OQTJa pgW9fYBspdc9RDRReJFycOx65KwOZITrcGWP2uTibAcZXfSKg7AiG5x8xUfHr+CiDlYm /eewz5kUy8KnMbzmM3WGeCxnOEhAdqW9miy5VMGiEjpeFuy77pxQeFyYuIhbtQ8uSbuI 6qkJ/0tdwpqekf8+UwBttxZWFkkhgcNjfrKCoD7eQkrxGCThkgUH8Jfidz/aa0t4GxWk aj2w== X-Gm-Message-State: AC+VfDw1KU5sqNh1mHEJCc0PVoIgnOs5ALN3iEDzG1kuKHz78ZGNewoy VHMHeIhGbFSKvzzIZbJx58oPcQ== X-Google-Smtp-Source: ACHHUZ48HsI5YZd3LN1vDcUYC1K6qWTTr5aUygORmW+ZGTHv31Rrj+0oY+hVYu/YmeCBOpKh0r58EA== X-Received: by 2002:a05:6a00:2185:b0:64d:46b2:9a58 with SMTP id h5-20020a056a00218500b0064d46b29a58mr7924134pfi.26.1684732050365; Sun, 21 May 2023 22:07:30 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.249]) by smtp.gmail.com with ESMTPSA id t10-20020a62ea0a000000b0063b5776b073sm3247519pfh.117.2023.05.21.22.07.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 21 May 2023 22:07:30 -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 v3 04/10] maple_tree: Simplify mas_is_span_wr() Date: Mon, 22 May 2023 13:06:50 +0800 Message-Id: <20230522050656.96215-5-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230522050656.96215-1-zhangpeng.00@bytedance.com> References: <20230522050656.96215-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E77DA1A0014 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: yucn16cux6ebfuf1xx58gapyp7gh8jws X-HE-Tag: 1684732050-871445 X-HE-Meta: U2FsdGVkX18y+ZuAdWPuav2BMwAm15nsm/ZVe52QQs0nJsHYzVfeEmwIDtKyY4IE9hz+hIpTGn6VjkRL6XLH4yc42IlO0SvA6rcDKRhqS6k0Y7dd9KXR491fKwmM7/Mge5nBT5d6Em71fySDq7mPc371a3Sj8a7ULsMbgFSUPuUAQWRAQYol6sWW3PkhbE7PPAudO6YyD6aBVMSbLsnyimFV7u/+KBnrMEe3w3TU4Wsbq1j8UOBwXxy6Jjg2ZULahW5HP4hfgq67du9zopUqGXD9RuPfBOkD1SW5/j8LpvIiBDPN7WgoT85XqzyrkT7vWEKcK2ha1jZ/vEI+CeaDhQL7qFN+swm8+feGjoVSqodSx4r9xPjuq4btD25g0/74KXWTFQ6Gi3AaUnkzcqNr0qPRQyNSJfGNGgIw+dJilCiMpk50rHrpYjAW9hjyPV0E2W9EYvJUHGhj7OpXCYnpdLQuRydxEYY5GCyVrRw1pC5ymmO/nZkzTZhhk75fnohVMqROaZz7MpkmunkQNfldLa/dpCmq5MpsGanUlTuFAIRwuPa2KTmhyO6vS9K6YqGWhqAbKt/WgzUcuC9SxXwIO0c0DldfcEyBbBn/jXqzfiZdxBTD/aA83KBr3hvMmzh7TDs773HAPO7u+AJ5pSlC1mSNwHP4NNtsNWOj+e9VdRRbCMRe3GQUa43TBSRxv7F9uPKQkrleU9YLwmQ0B2y7EVMXL91nx2Ww4xiYNhLhwzXDDiG/50Hnt8arMpejzro6tCBu0SE3DzRHv9Ac+yEfHiJc5qmRs9w88wgh7fgpd0MTv633F8+2cW2oZ97oq0vmq6xxUtx8v3lFB5vn1+Mr7+y61D/93L9UXexXsTaLmH7KSgGWc7jqSUZ9mnYisxg5ekwh+sV1J3JlPRAddcZrgA7c3kwn7/SZE3ApeXshnjKxB/lTMcTakVbQlVCdShtVhXZFiSJ60NL+Wb0cG79 XskQdKl3 rI+xaIfSSJRnNTi9r1I2/jZ8zOWW13KTBrAddDuZ58HKcGlr3j23KcsMW8NTHEW1h2kN76NUt9i3SpSrSTx5CM/0+UvPxFq/G4IUaBUD97TE4QHwb0X6PlLpBL4+T+S1Od0DpmNKiTwxj1wBe2OkZ7f/c+vl95r//39nsdFZ0L8cDd1GyRKAmKPpxlLb/Wwv5cGzH1TxwZHAJ3+9YWtBCYFegNaMNSGDdCq6oirC+yY6FNfl0aG1pmHi4H4gaL4T1Hqs+12RGqIppzYPfMOAZc/5QXGCOdNwljfe6XcOiEApW89HMvwXTyJ+22uRw1mrw1Dls6gfFAG7dcoV/cf3EhwSw9UGraZWMSFv0zcsa+zmtjArXQTnohrX/NwL3XgsesF2urqLbTI38AeO82dIFo3t4x+ci2z55IzFBUI8HMMkk8UcePf6ZmLVIgpr6IRw9yqXnG3oGJuYFx8TJZ2NklJCddiXDQ++UtL3zIzKnwype1Gc= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000126, 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 | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 3fe6a6685384..c47af84047a4 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -3728,43 +3728,32 @@ 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 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; } -- 2.20.1