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 B2588EB64D9 for ; Fri, 7 Jul 2023 10:11:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4D2B58D000A; Fri, 7 Jul 2023 06:11:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 483338D0001; Fri, 7 Jul 2023 06:11:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 371F58D000A; Fri, 7 Jul 2023 06:11:36 -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 291F78D0001 for ; Fri, 7 Jul 2023 06:11:36 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B6CDAC0CEC for ; Fri, 7 Jul 2023 10:11:35 +0000 (UTC) X-FDA: 80984398950.19.810FCE6 Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by imf27.hostedemail.com (Postfix) with ESMTP id BF73440004 for ; Fri, 7 Jul 2023 10:11:33 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="j7/AtuKs"; spf=pass (imf27.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.176 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=1688724693; 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=BaVLJjip61EeAZP607ZyqgslEXeB0JVkPTMnfDPq3fs=; b=z08KEeGF/68X6fyL90wpSCnliOU0eN4rJnTdE/oWyoPgIXeNfVq96l93uv6N/RUNN/6l/h G6guuqMCgLy7JAAsCE+EQ0mK18LaFoH9M3pE2tojUBBhXThB1ISUfihHUaL29o2noIakxj 2NfJu8fQ28Jw98mqJ8XUr0XBj0wZRdw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688724693; a=rsa-sha256; cv=none; b=Nkh2TMie6y1tzIU6iNv1ktEuCXlXYf3FNa1J6NILD8hOaeqmtMIOuAfe/mZRSPiYNJYp1i JpQZyhdZGqTs45msWSHgp6uYyTAGOiOve1bM4UW3KAkri4sA54zJvv1LDvEl6PeeMtVThJ Sdon9z7ucggG7uL1WZy/lCYivZVqL3w= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="j7/AtuKs"; spf=pass (imf27.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.176 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-55b1238a013so1216840a12.3 for ; Fri, 07 Jul 2023 03:11:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1688724692; x=1691316692; 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=BaVLJjip61EeAZP607ZyqgslEXeB0JVkPTMnfDPq3fs=; b=j7/AtuKsMBfQml5gsk08AByvKeWMYp3cLlXFl0h5wiOOFzwno2s4JDdbZz1gMZegRg rUPpYnw3sChLJYJ5e3QUubyJfUOyVs4Sxfwp3gXSItOXsfbv7HJPaQbn6gAbTh/ZPqaV ekyATJifF5X1WMznSIRLogfSQIfzoA/6iKyuIUHQvX/pYsVQrksJXosKt1koWCPqLmr/ 8lGymmUdBB5ALohe7dC4q04z2Xn9QetC+T7YC6d2v8+plOlEBZZAh9rLk8KoAk+MzKt1 xlBw08hirYh31Bb63VHYl8VtCkX8xxXIzIIfEDitAobM42DMTBKpybRaYKHBMuVy8Mty vQpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688724692; x=1691316692; 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=BaVLJjip61EeAZP607ZyqgslEXeB0JVkPTMnfDPq3fs=; b=cB/TyweTXuYvHaexA9DaLTufAl7xwcro0bNuNHvE1RkbGofAeVqctr8AvvVbZOtVnx iuiSp+pLL8h/lr4fD60YHVPKOk7edr/GU0EK/OPqFTuejiFB4/YkrzCdSkbOByIijO4v rsXmAAk7LPnW0fS4uJieiRQSSgUzGTs0Ms44ShDuQrr2WeC31FfIX2S0NQOhg6WP940d 9JVRyFKb7Efm2l+RT3iWIJsY5sVQUGcs2qApCX7SmuohjAedni6LJrzybsYZc7OrGsfy sDkTltnGVGPK/funET6ttLP04m+LN089UC1YPnk0ruH/JVR6oq0vc0hiQ9JVppL/LKMd vvhw== X-Gm-Message-State: ABy/qLb8sBuOty8r5aoy2DxIXYh0Au/oqPjksP5cZApjYCipRnco/5oj HxkOQP4mFqy5p3a8g6Y6v05ErBTkGR0LygalRTI= X-Google-Smtp-Source: APBJJlGcNKKZKkWKc1iP3UjBr/HMi0EvrSAMn7bPU1cexh4uo9XIVJnNzuQXc9KlBQEaQksmKfv7+Q== X-Received: by 2002:a05:6a20:8c1a:b0:12e:7fc9:5c44 with SMTP id j26-20020a056a208c1a00b0012e7fc95c44mr3641814pzh.14.1688724692583; Fri, 07 Jul 2023 03:11:32 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id x11-20020a056a00270b00b0068288aaf23esm2602549pfv.100.2023.07.07.03.11.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Jul 2023 03:11:32 -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: [RESEND PATCH 7/8] maple_tree: replace mas_logical_pivot() with mas_safe_pivot() Date: Fri, 7 Jul 2023 18:10:56 +0800 Message-Id: <20230707101057.29326-8-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230707101057.29326-1-zhangpeng.00@bytedance.com> References: <20230707101057.29326-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BF73440004 X-Rspam-User: X-Stat-Signature: u1atdzsr9juw6brntgmke1pqnta7z3tj X-Rspamd-Server: rspam03 X-HE-Tag: 1688724693-508088 X-HE-Meta: U2FsdGVkX1/H18VXrNAwdo4WXKOYPJdjzOzOq0MRBwa1+rK089e7DvUbQYghSqniPo4Zt24jJxKdVI5gfKNEx0d7rwmPt7hYpgs5LDPtfBf04m1XYzPo7sWRXmU/XTfBVtigml4EzK8FaCBKjBGaZWyIJ3Sjm6SE5iTzM6enTHOtgB+BCrteM2sW2xlDOysEbgkZ/om8bM61pOIqQqi6EByVa65bt/KfdCwlde+1jKC/pNHa6+0Nr7Uy1o+O25ODbr/sVx1RnAn7PRdTmWFgxXxeLNqLUpFEY7reO/kchKGXg2VPL1W/RfXjKys+lTRB/aC3ZRn/M/+wV6UTiK8s6+PLjcr9ilsE/adnwb9/KzT8DbJWC0bNiI+/8rIABUmjFSxkTtDaqXJ4Rg9ucAIeH9Futah9gKPV9LxBALcpk3gvBGA45Y02LpOGOAhhnTMm6ZPF2/IIhTTC+7QFawesuO/w4TMSJcTKGXYAKw+zx+J/Fma4/ZiuD3g9L+F+XOmJGq7bWhivzkEyb4tYFuaYmhabmUa1Xh/f301NC39J4yQplaeyiFJthPmuK0Umn6vsAFmv436sMTpgrcLgF9ZyjCZatnCKu2w1DH/6aYqmQIS74T8ZHcIuzQdTlJOK/gQg2/5l7qRwraBesfP+KViS3fDM0lwezEFKbtW6Oaj1ON14oEJS46FPITq/4lgd6lq7KYiH0JwbbCb7S9+lwTWkXcAUZPkdRcLY7rnlpNIJC7Jd+h1H7e23RJVq1G+NfOebLx7iy93u/w2rRDW6pFPoNmw2xIDrH6Opj2YEFcgT3nItcs/XljllCmI19aMhRUXJ5Cwn3/hZuIIypyXQpzbUEWUwpkMMAH3XsoxbkXBZ9kKCb8HT10xcQxcefAJ5CIWt2DJsrxrNpCroo2y1Emy4Xb3RynggMHJxjSMWkzOtSb9NwMJYYKac8WzkdthQm7EeBnGurfNo/QvmNyOkSU9 PWkbejav CgMPfT7yHDU2kBB92OBmV4x4N0RNyDB+52Ct71kbrwrbmBKE7otUmai2/WsWrz8uPaM4wIRkWLkcUo7i1StiZRnIsDseaUZwRomTiT8NNRxNffsiw8ehfLVk66TjeUlWL3hQwwPaXgiRCpXr009nL1etT0neOLdgXBhWgQO4iyrNcDJ2TVAr1l6WUHEjVbSW8tfKnk06xD3oZ1jBgpXRiZ3yEPhIQxy39pgHdTcbBMROS+4vRIRXcVNOugxwZoGJTfiJPlCGwKsIUzffRg4KEpAcwvK/RjgJuvep68oP7w/rJG9G1R2O5+9j8YWeDCDQxlj++AfsnVQN2S2QboCtBSY9hFnEazllAVQyyT8PmryK2LKyUmHBSyZzBN4scOlbBPJWqnSVZXvNEgE8o/etKf9JKaNWd8L6EULWBJ8aYVBOU/mKCnyrHB1O2tQr/BSpxIQMH245C/bVx4A8= 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 3aede7deaa26..8c08bfdc99cf 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); @@ -4934,7 +4907,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) @@ -7007,7 +6980,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