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 0142EC7EE23 for ; Mon, 15 May 2023 13:18:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 82AD2280004; Mon, 15 May 2023 09:18:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7DC7A280001; Mon, 15 May 2023 09:18:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6CA58280004; Mon, 15 May 2023 09:18:40 -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 537ED280001 for ; Mon, 15 May 2023 09:18:40 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 8CF291C8974 for ; Mon, 15 May 2023 13:18:39 +0000 (UTC) X-FDA: 80792543958.27.A8F0BB4 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf03.hostedemail.com (Postfix) with ESMTP id 839E82000E for ; Mon, 15 May 2023 13:18:37 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=h6Vztwd3; spf=pass (imf03.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.169 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=1684156717; 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=aUBDvQ6OxE85hUN75/9d6LlRGyHmdnE5erOpWtw5OfM=; b=R30G49Zp8XzhiT9E+h7rHbTaAeTJiliHynXjfRrfNa4xaOkMo5+eIMJB3JsU55hVCOa/zw KlR81A2EV5nFznmEj8wREfPISfK4JTOiWYrTCzEumuFqEG88XOavlxrXum/MZihseJJ/6l GtUHH/6UisHBcC4xrs5qyXVXQhwOpdI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684156717; a=rsa-sha256; cv=none; b=QY5TYZOXFZcfR9tnh7OPpZlRYsC467T2lAED4uD59GxgP+kgQv7Qd5dokS19hz1llYl/Of l7kkcLo+7Og9LH1cDQ/SCe7lSwGvB44ctLxH7O1sUAaBVY52EEwvVfG6ADFQoi4+s0K2iB /YOjbYlbLFsV6CjdA5rK+vfMs++ZG8M= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=h6Vztwd3; spf=pass (imf03.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1aaea43def7so87461365ad.2 for ; Mon, 15 May 2023 06:18:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684156716; x=1686748716; 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=aUBDvQ6OxE85hUN75/9d6LlRGyHmdnE5erOpWtw5OfM=; b=h6Vztwd3Q0rJzgXIQWj9b7a7rcwv/TKvfWHjSn7rPgPVnAwzRGI2GP2i+o8GYuMB5E aFz5inFtgIpGyz7XUMKZ8NAGKJ2UwZd/ZzAsQAY/TwHMA4dDvZVjhcKJH8cmgzKa5Swx p7DSkm4BzQ79R2MDK7TXkdd1dZguunFOryYbs46vMi+egL28fjmiOO8jIrx4iOF7vr9i OKY+sLoB5kvFPjKxPj9sWkbW/s0CEXb2sziSUikSXgmAk/sgii1jOrPbYFVaMPRcUgCE xd68Wj7Am3v6yO7HSaTtRVlczCvuTvBSSnCmKeycX0FpAHhU7HQbnQ2JhGJPm6fRGUeY drcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684156716; x=1686748716; 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=aUBDvQ6OxE85hUN75/9d6LlRGyHmdnE5erOpWtw5OfM=; b=WDknFBjgvZkaKBbf5AfY4KLeawWDXs+pHa+Pg/9agoKFhWOMJKwyQd1ra3K/Qjp1o5 H4jPC63VSf9w6Lr8hFTRclrd+M6A0lq0SCyAj3P/sBBM2eZVZW0Q4tlykz/9S+Rvmtkz jXhQnQySRJexmJFaZtC+solho8yJLmT3gwIEAkWH1u9G47YqqMLHilbuO28Z9o/p9Qwt in2U2pUqj41enpoHO+KUa8xGHg4rEFFK4s0PgCcIhYqOPL1WdRx2EFIVmtXL9Fkouk/r tbyF8wO8PS4SPHgI3GS30oQLXvca84RhIBYn/Ddmqczu49D+bgyqBWiyQNDsi4iSsqef mnhg== X-Gm-Message-State: AC+VfDzS5LeoYQhNsi/M3X6dHpkzdCHtuykQ7RW4Q/JwYa8tFTTl91ph Ju+/yza41woNArJdfRu43QbTLA== X-Google-Smtp-Source: ACHHUZ6NrR5fyigxrygUBYxmthRBGrO6hqW7vNZiQJ/rNSdTeNHwNJLwR56D8E8MgAQzd/+5PFOylQ== X-Received: by 2002:a17:902:dace:b0:1ac:6e1f:d1bd with SMTP id q14-20020a170902dace00b001ac6e1fd1bdmr37436369plx.19.1684156716446; Mon, 15 May 2023 06:18:36 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.239]) by smtp.gmail.com with ESMTPSA id gl20-20020a17090b121400b0024749e7321bsm14190014pjb.6.2023.05.15.06.18.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 15 May 2023 06:18:36 -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 04/10] maple_tree: Simplify mas_is_span_wr() Date: Mon, 15 May 2023 21:17:51 +0800 Message-Id: <20230515131757.60035-5-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230515131757.60035-1-zhangpeng.00@bytedance.com> References: <20230515131757.60035-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 839E82000E X-Rspam-User: X-Rspamd-Server: rspam06 X-Stat-Signature: bus5cfrj8q8coqtrkgtedk6bp1xi44zd X-HE-Tag: 1684156717-281879 X-HE-Meta: U2FsdGVkX18oeJWy2d3+P2lVtgtR9XelYFH77e1/g9G0LtTe99NxMvR1fGOZyxlMYkmVc55ckiRsB0IQTFgHRBPQ4aIGGdOdV91dtN5ijGD5/jDE59RxU2gZ8pYBycrtGvgypLlqHfYzgoLNdSyeLMdTthCTqbho7x6+poi5oeBdrrQWfRxrKlF1fy557+mZvRp3jLFkBy0qRrwhXQpqmA+ICYeh7EbtzetNbOouZmLsLbHIDDOJZCSeezE7BF1kNQFY+yupwsKb7blG3hHl+88P434srTGFJlu6yHs1XGW0AjJ7yYjYmJN+v3nnt2lVEELzUFKqpmzLONCkszi6iGd313TEjEkn4YgxJSccrZ5apf6HGgVeletbVqDyyULSNkOQhdQ3/9dzYAPaW7K9FPDP4h6aaGBUIAOl+Ks979RyyfcZrDL8h3UFydwExxnJr8l0KhrYEkGcAhi1wgOMzbS893zq+KZAl9ynO9kA75qZPl8LLepD4vgLiH3HjGbAuliyhgGcurhjP4eqoZ4/D9VJS97mtcXEHvebWfOOlfUcrVqj+gwBeY8ew3rXHrYmYuWKvMCRnOQ4BF7RUNz7luRIZemvj4R8AoLAyaGeSH4zp2ohCMirOnIyBR6z0MH155XskCq58LfdmYb949lODxIYW1j5qPcR8U6w042OKm0SAPebiqwdnB7qfjEtTAnVWdNDRkrW5tDrWOFmAlOPMnXjndflaDewoV93cxvTZrLibaTlNaOVOhhKwFDqBJdaiRFWxPZaPLM3jgQCti6fbYGkEsR7Xhyo35xQBZ5kwfkyVbnYGAYqKBV5eZR/QZfQEOmJ1gBaQwKey5IV0dHhKqp/EePWI0OmhTZQfGbv1O/xn1BZTQQ1Jevyde93yQhOIkANAaTvojncIyrCeESskI6UeGj6fzfHX5Bl2rqgANs63iYSg31AGt7bZNjz95I833Sj7uK/0KFAq1NMCUu qdKPtWSM a6IHwEYBrWkiW0yykulQV6jkK1hoK/Xd6K9QBvpwvRT3MQmxLNgEgWzpllyli98Cp0lYNARLgim3H97JcjEwGhPgx62xCdOKd3qWZmNhNMzObMqi7kk4c1oOMXmlNU+D61oqemQq6BuZM84+xsQZc0peRg4hsCGj2gBeSHLR7AXWjVSVGVKSenaAAtLFBtaJq4sRJLCMjN74CPdJFHjg7NfSsLNcpqT6CxSQu8I/3lhgxEc299FLWUJswkx9zalM7PgW8HQgj3HReOgSh3A2adRILRo1NpG/mkIoIVXT1cgUMZIM/lBPXl5Ae/Lb34NiiBCaqsegK3bUd49UxDqPNrqAXZTb4wbkJn3zvTVGfRWDNUzAE6895tPCE16CBMr9y9BX/ubfKbXY0XOLxf77RRvN196P4pei8y9gi1Ezw4/Bgbq3TqZiOiuWCjsP5LWPViX7tJXuDHnQbZYAwTbitRIyaKScOipK5wZQ6LJJXpz68JtY= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000124, 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 | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 43a25d3042c1b..fbb6efc40e576 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -3728,41 +3728,23 @@ static bool mas_is_span_wr(struct ma_wr_state *wr_mas) { unsigned long 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) + max = unlikely(ma_is_leaf(type)) ? wr_mas->mas->max : wr_mas->r_max; + if (last < max) { + /* Contained in this pivot or this leaf node */ 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; - + } 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; } -- 2.20.1