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 AE15DEB64DB for ; Thu, 15 Jun 2023 13:10:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5330F8E0007; Thu, 15 Jun 2023 09:10:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 46D916B007E; Thu, 15 Jun 2023 09:10:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2E75E8E0007; Thu, 15 Jun 2023 09:10:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 1A66C6B007B for ; Thu, 15 Jun 2023 09:10:54 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id DA6A416066C for ; Thu, 15 Jun 2023 13:10:53 +0000 (UTC) X-FDA: 80905017186.25.8B082FB Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf23.hostedemail.com (Postfix) with ESMTP id 12E7A14002D for ; Thu, 15 Jun 2023 13:10:51 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=PnvoyOBW; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf23.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.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=1686834652; 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=rh1upVsLkWtnKrYRXZBQpn/CVX3v0vcX/4UFjQ1Vcrw=; b=QC1LUtz3zSIje/rpfKq0Iz3Ewq3bf7MccFkeuk68WL63A2w3lw0XvmM+/21wcXo+UPGikQ vP9M2musuWR2OPOucA6TS7GLCWjuT06CQRl8vN7EzK/fpcXC2w/FqbS5IKnLss1wM/LKga dHY4Hy8G9a1CYUWQ3hrL8MKcApC27tM= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=PnvoyOBW; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf23.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686834652; a=rsa-sha256; cv=none; b=2xD4SGQxrF6OqHf2L5BFkjTvudsD+g0Ds1MZGBpAJAZ8Jo9Nv977C9gajW9al2HEAooETQ IF5n3SZol2tW4D3le+EDZPfbUZXLNYupzkUSZx/3C7NFfEkKtm3gCPtgVuGHfn6mDwdbEX 4yRO01SVnNGD6WObHcf8xorrR8xLU2Q= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1b3db8f3d07so25467575ad.2 for ; Thu, 15 Jun 2023 06:10:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1686834651; x=1689426651; 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=rh1upVsLkWtnKrYRXZBQpn/CVX3v0vcX/4UFjQ1Vcrw=; b=PnvoyOBWI0174VERzdCx/bjEaYkDquh7yUGjQ50/UMkljqo5RjJXjL/cpgyU0TzpL0 eH4VXPKnzVaqjcP0gOrMx+1QHFabhbbyvY/b0lpA7NNL3TpSSbiM5VkBsMKRfz9VcWo2 lFwoUO7O78+d9CNvG3CfhEJFuWdZ8b1+UY+22FceCZ1Z5L8AhIi7hCMxeK3Nv8H36S9l rpau8waC19HwkB9lNxumaKNM/lwcYVUZc1+ee++CYY+F7cyGfZ46ler+HLrq1LcRvZAN eQsUxGjTPIwUCUuGKYO2Lmqr+uiqKzT6QsnoYFz+N2wYgGq3hiijfpQwjmPzO1Qqg6X7 no0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686834651; x=1689426651; 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=rh1upVsLkWtnKrYRXZBQpn/CVX3v0vcX/4UFjQ1Vcrw=; b=c+Uc2B9IweVRsQptioHHlh2tx23wMcK7tXBciJje8ABIpKJ+8TFNaEvhwomB+sKPMV Q2CrMte1m8di52Hy8GFObM37GhQqZ1nYCHXZDeI7a6pDXa5riR69V4rTrRXJhxfs1dfB oMd5FjXbi/Fj5w0KJUdb6imkGNC5Cx+BEExqTEJFmlWINBG9AStgAzmeTpnXNRKYkcPu XRkoY7q+0zYHi6wqCuygVRoqBgCGUCpEz1Yq6biSmwTrt6WwW6j5ahgAjLdmsuPaTNrT NBlp7a6rboLl4XNsGxPx0djBjWw4RYGx8BNioo9L/UM60AC5bUvJSeRrgjPpfxIic2gO 6KaA== X-Gm-Message-State: AC+VfDyWKfRDWMHwlzxP62T86jPg7STIxD5Rc/8QWFhQEX96b3jxid9h lkWB86hLGClD1caHinCwcDX3gA== X-Google-Smtp-Source: ACHHUZ6kYlTrHFDEkqjnopSe0wt5bMIuHrwtTI/7vuPr5aH9vc14N6FGbaSoQP1LNTuYXmE9OOVpYg== X-Received: by 2002:a17:902:7042:b0:1af:fd3a:2b7d with SMTP id h2-20020a170902704200b001affd3a2b7dmr12733721plt.48.1686834650878; Thu, 15 Jun 2023 06:10:50 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.249]) by smtp.gmail.com with ESMTPSA id x1-20020a170902b40100b001a804b16e38sm14036019plr.150.2023.06.15.06.10.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 15 Jun 2023 06:10:50 -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 7/8] maple_tree: replace mas_logical_pivot() with mas_safe_pivot() Date: Thu, 15 Jun 2023 21:08:58 +0800 Message-Id: <20230615130859.21858-8-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230615130859.21858-1-zhangpeng.00@bytedance.com> References: <20230615130859.21858-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 12E7A14002D X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: cto9cn8n95muhqjbtqfmfwe49o1jue5i X-HE-Tag: 1686834651-779381 X-HE-Meta: U2FsdGVkX1/qNe41uZDCx8YYuIqpu3ztAZob47sJ1u1ziTWN8WLscr6J1hl/OE/BJ56L8ws8uaSQmy2th8zyHr/PoyR8ubWDATUAzflJUEBQLQrlKKc+F/l6fOY7FwuDlAl9A+xqpIxXD/u6WAgsJjfvSvba+PLku+SZK2FoE11zc/aHKxEm8xcu+QJsLccf5CJ0fOHL6Hm7khyn60rKLGf+sLyYp7Kjw1s8Zg1Ft5p529fRePVzz9om3S1Fr/jo/1QQNh+ZXjh9QKr3Mc/vbvI/+j26EdnlrUyprr+tSxhvbe3nkrCrNcY6yEPLexgI2sb13jqNimtn3zCD8xSLsoVIdFIi8L75js4PY5wrja3+J3tBs34RevZRqTyKouWQZYY4/ONJw5pFXrS8tPq70/G0gjpPByFySnrUZiDlhMqRBCix7eLwtUYiWq4fjK6KOwpc4J1PZAdwxB6Qx09CCqKHQdDu+K+JcXKeYsqO/jVL0vrgatn9+7P1+IAYOkvnvEDSx/1UmJSdoVQuLJ5C83+nsc+uGWxRaBM4PjOg1ZLMEMMnn9/u7wfuX1l1zvp3SgaP9bgBU9tw6L3R5sy7WIMEbfanCYLowFtdcB7bR7asQwAl+eAPxfZXPT5MK5fGFELT82yUSqKVXIHkOgqHDLSx5J8sZVA6RiWllCWxRLfNOjIPEf+8Qi0lhkK0G+yKnN2hRfsJTrdUPJiRhybyw19BjLmbcRR0s4tMNY+32ylQ/1CwL3km8wlD1SVQzKwUMUqFavWyWe5fwUKXq7JAtZafmrBeVWKKP1zDBDNrqRiqB1Dk4jAZuHD7lNC1DjOKX2u93Vv4r+I+A3yILiLyZ7vOVaw471/+rDP8NUQ8EMyr8P/JUWRjVxv0gPCKNIeGd5dYxKHCtFheVmK4JghaTSNZ8TzurrlQogrmtova7qW2sB7A7QbcntAkPgs0wOdydP8FrpLc14+WXfYj4OP CAOeXVGN ghVf/Z92VZ634A5TwC02uopsdP9lbkEsZIvMFjyLb/sNVg2hCBKki4oKZcao0qmsIbPYH7tPwag489MCxfuMEAM5l0AG6mED5ChK29J6UvAHzMQ246GLrmAiTFgkHa0ekkUq09ZSHBiEA/l4pUuf54De2A64g49ImOJsLEDaYfMs/x9vcNLsbQrg4Cb4y3Pie5KUW5nHp6PcUkjG2+hin00LvGvnKtiFmfbArbm2seQiqrp7sXVVUAw9QW9QPVV9tt54YVrQylOan8U5+aJcMijaDSRHSld7G4hye3QvDKtK2sSP8Nq5RkVGBrWYNSr8ysB19ajrcPGEAvZyoLmMFDNKe/W+QsCkCttxSW+a2OLUgiLa0RWenvjLGWW3Fe9iYlrP2EE3IH68V0dh+YYPFMpw1rqre9yBkRn3rqQbMyX7m75XdTTZUpR0rSkdwF+lpKSX1LzxumWzlZog= 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: Replace mas_logical_pivot() with mas_safe_pivot() and drop mas_logical_pivot() since it won't be used anymore. We can do this since now all nodes will have node limit pivot (if it is not full node). Signed-off-by: Peng Zhang --- lib/maple_tree.c | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index becb4c224e57..4c9f40322f5f 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -728,33 +728,6 @@ mas_safe_min(struct ma_state *mas, unsigned long *pivots, unsigned char offset) return mas->min; } -/* - * mas_logical_pivot() - Get the logical pivot of a given offset. - * @mas: The maple state - * @pivots: The pointer to the maple node pivots - * @offset: The offset into the pivot array - * @type: The maple node type - * - * When there is no value at a pivot (beyond the end of the data), then the - * pivot is actually @mas->max. - * - * Return: the logical pivot of a given @offset. - */ -static inline unsigned long -mas_logical_pivot(struct ma_state *mas, unsigned long *pivots, - unsigned char offset, enum maple_type type) -{ - unsigned long lpiv = mas_safe_pivot(mas, pivots, offset, type); - - if (likely(lpiv)) - return lpiv; - - if (likely(offset)) - return mas->max; - - return lpiv; -} - /* * mte_set_pivot() - Set a pivot to a value in an encoded maple node. * @mn: The encoded maple node @@ -2202,7 +2175,7 @@ static noinline_for_kasan void mas_store_b_node(struct ma_wr_state *wr_mas, goto b_end; /* Handle new range ending before old range ends */ - piv = mas_logical_pivot(mas, wr_mas->pivots, offset_end, wr_mas->type); + piv = mas_safe_pivot(mas, wr_mas->pivots, offset_end, wr_mas->type); if (piv > mas->last) { if (piv == ULONG_MAX) mas_bulk_rebalance(mas, b_node->b_end, wr_mas->type); @@ -4911,7 +4884,7 @@ static inline bool mas_anode_descend(struct ma_state *mas, unsigned long size) min = mas_safe_min(mas, pivots, offset); data_end = ma_data_end(node, type, pivots, mas->max); for (; offset <= data_end; offset++) { - pivot = mas_logical_pivot(mas, pivots, offset, type); + pivot = mas_safe_pivot(mas, pivots, offset, type); /* Not within lower bounds */ if (mas->index > pivot) @@ -7003,7 +6976,7 @@ static void mas_validate_gaps(struct ma_state *mas) gaps = ma_gaps(node, mt); for (i = 0; i < mt_slot_count(mte); i++) { - p_end = mas_logical_pivot(mas, pivots, i, mt); + p_end = mas_safe_pivot(mas, pivots, i, mt); if (!gaps) { if (!mas_get_slot(mas, i)) -- 2.20.1