From patchwork Mon May 22 05:06:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13249767 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 CE9C0C77B73 for ; Mon, 22 May 2023 05:07:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6C65390000D; Mon, 22 May 2023 01:07:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6773D900002; Mon, 22 May 2023 01:07:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 53F0B90000D; Mon, 22 May 2023 01:07:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 45FA0900002 for ; Mon, 22 May 2023 01:07:27 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0B2ED14068F for ; Mon, 22 May 2023 05:07:27 +0000 (UTC) X-FDA: 80816707734.17.C5FBF29 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by imf27.hostedemail.com (Postfix) with ESMTP id 384AA40002 for ; Mon, 22 May 2023 05:07:25 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="GYE7/eh3"; spf=pass (imf27.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.171 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=1684732045; 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=8amRkLtdnjVq9cbmGyv8etEjiXwBdz+ISKHsxqN16tA=; b=XSCfJeF63alOo8HwHiY3TVU3CokO4FHEZCPSdGyfaOYdWx1aCMQ1cS0ad/S4POsgs46epY hwwrddkIFn0lfEdrBg07+9PCITcoKuLOFibwlBWWWBPPhEggX32v+LRncSo6NYrkJ8viV3 olf00OBp3+Fghme2kSHVusQJvb1pox0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684732045; a=rsa-sha256; cv=none; b=hH65fGaNrDG/Zo+ssHSsz2DtvwkBO9LtbkfAEURHokqgUBAl9VljUN4SF1J2p7d54o1hi0 2gC05Awvh0AVrYAgxyZQw7a3POUrZ0CpWBmy+RpqWc7AYJFCeKt0zMQtHg9JiiQRj3U64X 51y6+uZ1ojr7x42sYlfawe5X4OqHxmA= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="GYE7/eh3"; spf=pass (imf27.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.171 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-64d2a613ec4so2491071b3a.1 for ; Sun, 21 May 2023 22:07:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684732044; x=1687324044; 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=8amRkLtdnjVq9cbmGyv8etEjiXwBdz+ISKHsxqN16tA=; b=GYE7/eh3Hqti3Du8XPZUomicyjqafnfRSVXMJgGIMFX6+SBScSqdwET8DvURyQAI25 A2eaYMWJDwWyiQ/yLWt/12vUSj6bzkTk+pGFfX8gf+yVtmaOuB1FxffF70FUjmpqTzA9 lU0TUqzND5gyGUb0yKeIQJRajq4+VN2W1jz/CsH9wkCLeVYW5gqLkCAnJanNMSasF/uU O8hpWEr2WtH/xMH1UAsDv43QHtp1r+L/SgUI5S5gEN4rskUkm/mEGMOt2LBfYeUiKTBX sc9hVVsA3HUHuvjjFUGzixiTj+Q9J+BBY3yvg5bd5a9gEihrq+709FCyt5O91kotDEH2 G/6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684732044; x=1687324044; 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=8amRkLtdnjVq9cbmGyv8etEjiXwBdz+ISKHsxqN16tA=; b=SOQE3FlPnIj8HNfrEu5o6ahpw5dgzlcFYB1wjY6Qxkt7q7RnwLFH+0QbETI4SMhSan Pt8M5NXQTG6KSA3kv4vgGGgLcFP7PDwuUvlW8pBm8J4Qr2Nyjd41m8KK5XVm+tpeuu0Z nJFCsl58fZQgf01D/N+0t+Tnm1Ah0+TsMM6Y8XzqGC4Q8I9siUAkYrDfTw1+4xsWp0Q6 Ce7FYZwzd1gEkyB12S+4l7vHvnC6Ez3Cv9kGpecPZXr7jeJsoCQw4t/XmyZdCOzsGKS4 qD5/BgHezI2CysSZw8IsPFgT2eKqZ0Bw4AlVu4bdPPyV4H3jqKUKCmDEOauSQCjrD2d9 y/6Q== X-Gm-Message-State: AC+VfDxLEf4VdXJAexjyOYaKQAQTvPkt96sCznmgZ9KjKutTaxo76Orc m/rdWA3Quda/D66CuZAICPepGQ== X-Google-Smtp-Source: ACHHUZ7HimVTIQoub3tu0mdIJwmiVfKwyk3rieE8LPbYzYmpwti5Dz/8eFWiSuI3fjzaDlWesoLrBg== X-Received: by 2002:a05:6a00:1882:b0:64d:42cb:42af with SMTP id x2-20020a056a00188200b0064d42cb42afmr9286193pfh.4.1684732044137; Sun, 21 May 2023 22:07:24 -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.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 21 May 2023 22:07:23 -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 02/10] maple_tree: Drop mas_{rev_}alloc() and mas_fill_gap() Date: Mon, 22 May 2023 13:06:48 +0800 Message-Id: <20230522050656.96215-3-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 X-Rspamd-Queue-Id: 384AA40002 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: tycxj6mjttp1odfi8nac5ngzfyq6b77q X-HE-Tag: 1684732045-257757 X-HE-Meta: U2FsdGVkX18KG0q+E0M14p/If2ix5c/YwX63KEg7vPEdSx8iWcwnhIaj8fzYsSGVmju6gDS7tmnGvb6oMVJoSKAHnaQtBbZcOWnwN7D0D4qZCAu3RroK+b4AgB0eXQUbgYI5blcSYERG3yINxb/6I1UjQhg+6B/Nn2HTngLcwxh5swPgCw5J5C/mzMCf6ByJInjJShO8Q7hblgxE6EHUZ8PlTV7xKzSIwY6+N7N9istlZKVm9uIyRS9B8nD7RkcImtapa1zHIMl24UV6DPe+nODkZ5SuDcAXf1wgFCQJNrk/6vjlyuMLYFtTK6CsRJqvZs+dAtp7lQHnRp4pM2ZAPIHgvoqzwMBztl1DLUPlbffc8MD7DHTEkjcGhJconsB9X+A1zbc/CwE0kdxIQo4uoM0JU0ndBEkJEu9eE/gxlvzzLi8P77QeyFzVyY9lJ1QWxdAQ9j0Apm5z4/5ZkiakBsCNe8O1KyP2730fiaSVhlWhq5SUcxUWWOAEVzQpovy9MzIlh3+eHgl1c2XiNnrsrdirOXrI+w+2e7mUYuNBwGPIypK9wmynZGV/DTfOSXKldCAN1VzAaD/SyeUgBLH6llbqBEFCYuyp6i5SK1jIdSMCGmA3gDW8UPHWN9xRvRQPfCzoAPvoeRuhuStIr3IAmpWce8jXvfPhR62RjzWUaFvpph0IS2V90QBKokQURn/JKv42t5S2e842vMnFm1naF9bZ4eocbwC3bqsYRyJ1ZQm0+FUG3OA4h7Cy37bzA1l8KdgzRKgbm0AvSnudDQt6yarDfJbtGdc2a4eq/aVlP6kgIguZEhFGKmsDw/BkUMZWWnOVSO9t1t1lWiG6HhG7b4ngppacd4TRuX9pR4DPg8tberWxIJkoihkAO3EqzFratGRpQvIs1QN9o0TzC1noewsr32En9X/b0XXdQX8LdmX+EfvSvVaxiWlCh3xx9nhgjakhGxX0O/yC83O0yqc lDEFGHjp YTo/RK2EymTlhQ5lOCvuUMPt/oa+pRsjbKYnNOoiWZpryow6+qjEyOwz+b82pAZawoIoQisENYVfhQQKvLAWj3XEa9ARiHWeCTb+vv+RjXWiQZaPtlXK8suiWcwu+tTy89gv072yySp7ivbeI2MknHC7PiSJ/yq3Hvs7mlvncWxqpYNP7oNyeMzDPEu2gi207sh/maDNLyWi70G4NRg7GWAo95OS9IbL/uzIaU+mIKQUK30ERT41hzIqRvt8oWuotXWlCHEelCh6+0S/N+C8fv+36YZ+f94GcnXY6sYDt1lyERDYnMxg9z7EUU/te4tDdS8gb1z/aH34JYGHEuL981zp2I8skXHp78QEUpZUHOU0dH/6mHNxning3wyz+Bg7XATept+Q+2b4qW9M6V5oMID/bpz8+3gUput6esfSxngeDV5mYLkC8Yu9JM712BEYXOqMCJxp1A2rSeP4= 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: mas_{rev_}alloc() and mas_fill_gap() are useless, delete them. Signed-off-by: Peng Zhang Reviewed-by: Liam R. Howlett --- lib/maple_tree.c | 108 ----------------------------------------------- 1 file changed, 108 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 96d102d60b4e..263bd0ccc31b 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5120,46 +5120,6 @@ static inline void mas_awalk(struct ma_state *mas, unsigned long size) } } -/* - * mas_fill_gap() - Fill a located gap with @entry. - * @mas: The maple state - * @entry: The value to store - * @slot: The offset into the node to store the @entry - * @size: The size of the entry - * @index: The start location - */ -static inline void mas_fill_gap(struct ma_state *mas, void *entry, - unsigned char slot, unsigned long size, unsigned long *index) -{ - MA_WR_STATE(wr_mas, mas, entry); - unsigned char pslot = mte_parent_slot(mas->node); - struct maple_enode *mn = mas->node; - unsigned long *pivots; - enum maple_type ptype; - /* - * mas->index is the start address for the search - * which may no longer be needed. - * mas->last is the end address for the search - */ - - *index = mas->index; - mas->last = mas->index + size - 1; - - /* - * It is possible that using mas->max and mas->min to correctly - * calculate the index and last will cause an issue in the gap - * calculation, so fix the ma_state here - */ - mas_ascend(mas); - ptype = mte_node_type(mas->node); - pivots = ma_pivots(mas_mn(mas), ptype); - mas->max = mas_safe_pivot(mas, pivots, pslot, ptype); - mas->min = mas_safe_min(mas, pivots, pslot); - mas->node = mn; - mas->offset = slot; - mas_wr_store_entry(&wr_mas); -} - /* * mas_sparse_area() - Internal function. Return upper or lower limit when * searching for a gap in an empty tree. @@ -5307,74 +5267,6 @@ int mas_empty_area_rev(struct ma_state *mas, unsigned long min, } EXPORT_SYMBOL_GPL(mas_empty_area_rev); -static inline int mas_alloc(struct ma_state *mas, void *entry, - unsigned long size, unsigned long *index) -{ - unsigned long min; - - mas_start(mas); - if (mas_is_none(mas) || mas_is_ptr(mas)) { - mas_root_expand(mas, entry); - if (mas_is_err(mas)) - return xa_err(mas->node); - - if (!mas->index) - return mas_pivot(mas, 0); - return mas_pivot(mas, 1); - } - - /* Must be walking a tree. */ - mas_awalk(mas, size); - if (mas_is_err(mas)) - return xa_err(mas->node); - - if (mas->offset == MAPLE_NODE_SLOTS) - goto no_gap; - - /* - * At this point, mas->node points to the right node and we have an - * offset that has a sufficient gap. - */ - min = mas->min; - if (mas->offset) - min = mas_pivot(mas, mas->offset - 1) + 1; - - if (mas_is_err(mas)) - return xa_err(mas->node); - - if (mas->index < min) - mas->index = min; - - mas_fill_gap(mas, entry, mas->offset, size, index); - return 0; - -no_gap: - return -EBUSY; -} - -static inline int mas_rev_alloc(struct ma_state *mas, unsigned long min, - unsigned long max, void *entry, - unsigned long size, unsigned long *index) -{ - int ret = 0; - - ret = mas_empty_area_rev(mas, min, max, size); - if (ret) - return ret; - - if (mas_is_err(mas)) - return xa_err(mas->node); - - if (mas->offset == MAPLE_NODE_SLOTS) - goto no_gap; - - mas_fill_gap(mas, entry, mas->offset, size, index); - return 0; - -no_gap: - return -EBUSY; -} - /* * mte_dead_leaves() - Mark all leaves of a node as dead. * @mas: The maple state