From patchwork Wed May 10 06:10:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13236479 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 EFF41C7EE24 for ; Wed, 10 May 2023 06:11:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8CE2F6B0072; Wed, 10 May 2023 02:11:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 87E806B0074; Wed, 10 May 2023 02:11:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 76DAE6B0075; Wed, 10 May 2023 02:11:37 -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 69EEC6B0072 for ; Wed, 10 May 2023 02:11:37 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 43C35120582 for ; Wed, 10 May 2023 06:11:37 +0000 (UTC) X-FDA: 80773323834.03.4B51DFA Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf21.hostedemail.com (Postfix) with ESMTP id 669C01C0007 for ; Wed, 10 May 2023 06:11:35 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=fcgifp2z; spf=pass (imf21.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1683699095; a=rsa-sha256; cv=none; b=TE9CWUJNlNhuQXPSPZKBC2A0xT2Tp4xGn0bSGxycR5cbnUuHyLkCUKNJoXFG7AWKUyP85A /OnJBVSvbYv+jFhq4Lc8ifnC9pQOt/JtK+HhCz1S2lfFWXwpshZ4DCSkeRr1J8CPFa4+pX 3S6/sMOwFFvMczbtgW0Kc5dN4JThBEs= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=fcgifp2z; spf=pass (imf21.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.172 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=1683699095; 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=Vx0UmPiglxMBycN8p78aITZtdcFTRru0fYxYXq+j1cE=; b=wmhqJdPx7ZszEjhO/s+whkhtg7BEEBRohPOyA0OEpQaBpIBylrzyloUcdrgKSYVwsninS7 aI/qQ/GRhZZ4RirNXVnXv3PlPJWHykzAdraeFanlychDoF1wbMDWc8VCuVOKwBiQx5UHuK CQ/VOHCby38Ws+uyCLzFmmesvjikM9s= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1aaf706768cso52272785ad.0 for ; Tue, 09 May 2023 23:11:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1683699094; x=1686291094; 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=Vx0UmPiglxMBycN8p78aITZtdcFTRru0fYxYXq+j1cE=; b=fcgifp2zw/Gegdr5FvAbRDbAp0tmxTchx+/eA/Wy9E8eRmA/NBtx58jxefDu9Ya5TH F3O5wY3AtCcG6R7i5nNQ+/bW6nGu76pxmEnV46lTl3q/EWYSCHSEIZTExV5yqZTt3rh1 QLqUQ7obM00S5II8+1gmjinCGePCq3juH60BWi26ECtAuQ3UweDnmbBn83dY1SWSuTDF Qnf7ptsn0rM75J80a+52lmH2yskaNlhY292ccYIx4lmSmU27s5g6lwKYbxKBey+Xq9/y dRZjDTAe/1itAX7BhqCvuiV6EWBL3MIXjZKxNbww9qxkqrCgUtjKOFev+PZEtHmm/35I +3FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683699094; x=1686291094; 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=Vx0UmPiglxMBycN8p78aITZtdcFTRru0fYxYXq+j1cE=; b=fX5dPl3GCkzlFngVM2m2z9GMt6z6pB0qC4e0PaOAUFnRI3flKX0xxbLMpA/Aj3zVbM lHY2KZqcJXa+b4oMQrQ9q+Z1v0z0pZzHIQKwNduMxSZTEQQ9y2XHi3waK3pdx8iUXsbC S2i6klvKCH2itdiH9dbnZD1qrf1kFSjGM9Zosku/3Wjhbasrd84BJIWCQpUqd83HC6Ij lkvraM3ltbpqD1XcOuqIgPkAD++xzl5wueDNucZ+tTKIjsb+1rsoeKD0lgCAkazK9079 D5jwOggolse/D07qoAVTfo+891j07Yu9v7XZM1S76YuDtXVB5w1i872ekofIW9f+Be8m QyDg== X-Gm-Message-State: AC+VfDyKIuZD0GtVwc4t0AhBNMP0HY3gVaEXDQE2YelMDADN4IbP9Jda 6X9+93nl6TrezeHbxVByG40kNQX7OkoBi+WfpMA= X-Google-Smtp-Source: ACHHUZ5iVcElk2cXd3OtYV7Z3xTYwHOT3YAAuCTv7qM94caK3lAekZCLwZlAEKUBgPsPx0AN1CQZKQ== X-Received: by 2002:a17:902:f683:b0:1ac:8148:8c40 with SMTP id l3-20020a170902f68300b001ac81488c40mr11127867plg.53.1683699094081; Tue, 09 May 2023 23:11:34 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.232]) by smtp.gmail.com with ESMTPSA id j2-20020a170902da8200b001ab19724f64sm2814159plx.38.2023.05.09.23.11.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 09 May 2023 23:11:33 -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 2/2] maple_tree: Drop mtree_alloc_{range,rrange}() and related functions. Date: Wed, 10 May 2023 14:10:49 +0800 Message-Id: <20230510061049.53977-2-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230510061049.53977-1-zhangpeng.00@bytedance.com> References: <20230510061049.53977-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: zsjyxm1t7if3ycibf8bzmy984bmxcjfw X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 669C01C0007 X-HE-Tag: 1683699095-507372 X-HE-Meta: U2FsdGVkX19egp+JVb+tzw3qSmF9li8rpqd7XjgfVvuZBLnzfhjoWytYyZ/lZ9Qizgwy09reDH+0LJujDybUA73d2n+Hq2Si7En7BpBrCRCcYcQQEg4xi6+1DWYYl7FEjmwp18Trq2I6DJlgZO0br6ZTIO98PnSA/vI3qaqoOU/NKDT0dOndFJahr80fIPjp7JMqQLE2kbKuKAyxCvY1NtWnpDbb8v37J9ie/wXV8EVaZXbZcJ3FYN4fFLryyCmW2qQ79uNwWilRINs2aDT6eKJibf8ziSqKXkGEfH3fYef2Sot276/IJ3cy3/9kMvwVRHGCJiyxaYrhrcSk8DzaYwCSwYM+6YMS7zig2ZmQqVjWKRLf6TFWIn/P7hSKL670iytz1KuqeNOU/WnT1GVl6a6iE4Y4kYxewQahayf/78eQzHrPIpu0qgqmjgDf4JYjKO5MbR4a0GZFDDVWWGbXeFKTuU76EYnUcpGaH6Upl0RetRkPtmtKSXarXuYIiGp5eWi2urLB4a7k8ymIG5YodgbNP7CyBPfE/18oiPeSfq6WjRewKlFIgxX2R6/nqxnnM9Urow1zIP+deBFcPzkfBAcR7+zTpo+2Fz1x5rnhq1e0Hp2jhjop5VZEtXlGV/0XzyOiTmCijS+9/5HOIHBo5K0prOVKIxVA4ghBHHbnBmAwbEJsRsz++X0IRzradnr1n3HOe/liHmLDiCJ21VjtkWCeX4qu/TXhJrAS/jtRLm3RkCtrTTx5c+8+ZLbSpmjXpWqwRnCNX6McUKOnNNYYp3c2sjHamAH+DIueuIt/srO2a8G93cG2T8oZU3mGBb4sIArpSD1poJR0t1USyT0Hjt1oGgu+27yY/VKNvd2GO8clkrZS+/uyeo9Z352F+/ZdHAaDwQAC/cHMPHuFbz/0OFWNcO3+53EchT3S59szezSbb+soFpYz9XHu3lEs344TILBinGDTEsmP/ypLxh2 6VkYHES2 P1WYq0NdAwkHsuPAh0+GfPeEMFwBRzytF7pFC1ILMh7tzLytVgBPc5pAaGR4ORgXoqO64Hl1lJA9LirzSOVSrv6uAmVBjjq6hQ+V2DpoeTGta5A7ucOSlwfVGIBJvnECndgY9kx65rqgtWbXobMvr9bdxHfAsEH6uJeQKcH8TxCUk2WAExELAyaHP0W34EVMLmp+G7VS1pf+xTfQIOLrLYd62+oB9Xz8PGupODxif3x8wxEkgG5OD3+0udoc1BuiwzXDgKq2LizipDroUTP+4841hyyJ7/e4z5I11PurmP5Noo9m9BrvqgAfwlKQH7n9p/m21LjOD1qAnqpbD1hnDzBmTgzsawTflQJpdCEJEXTnvTE9MfDcfqkw8aex5pEdYVD35PRsbPBYhIf6w2FGrdXDacUg3iA+K+IXj8e9GqijV0qqugnRtDFNSvhZwhU0cYpN1O6olHX4e+is= 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: Drop mtree_alloc_{range,rrange}(), mas_alloc() and mas_fill_gap(). mtree_alloc_{range,rrange}() currently have no users and can be easily implemented with mas_empty_area{_rev}(). mas_alloc() and mas_fill_gap() are just their internal functions, drop them together. Signed-off-by: Peng Zhang --- include/linux/maple_tree.h | 7 -- lib/maple_tree.c | 177 ------------------------------------- 2 files changed, 184 deletions(-) diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h index 542b09118a09f..3dd6edccf83af 100644 --- a/include/linux/maple_tree.h +++ b/include/linux/maple_tree.h @@ -306,13 +306,6 @@ int mtree_insert(struct maple_tree *mt, unsigned long index, void *entry, gfp_t gfp); int mtree_insert_range(struct maple_tree *mt, unsigned long first, unsigned long last, void *entry, gfp_t gfp); -int mtree_alloc_range(struct maple_tree *mt, unsigned long *startp, - void *entry, unsigned long size, unsigned long min, - unsigned long max, gfp_t gfp); -int mtree_alloc_rrange(struct maple_tree *mt, unsigned long *startp, - void *entry, unsigned long size, unsigned long min, - unsigned long max, gfp_t gfp); - int mtree_store_range(struct maple_tree *mt, unsigned long first, unsigned long last, void *entry, gfp_t gfp); int mtree_store(struct maple_tree *mt, unsigned long index, diff --git a/lib/maple_tree.c b/lib/maple_tree.c index b37065a6f570d..49dfe81dfa1b6 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 @@ -6481,75 +6373,6 @@ int mtree_insert(struct maple_tree *mt, unsigned long index, void *entry, } EXPORT_SYMBOL(mtree_insert); -int mtree_alloc_range(struct maple_tree *mt, unsigned long *startp, - void *entry, unsigned long size, unsigned long min, - unsigned long max, gfp_t gfp) -{ - int ret = 0; - - MA_STATE(mas, mt, min, min); - if (!mt_is_alloc(mt)) - return -EINVAL; - - if (WARN_ON_ONCE(mt_is_reserved(entry))) - return -EINVAL; - - if (min > max) - return -EINVAL; - - if (max < size) - return -EINVAL; - - if (!size) - return -EINVAL; - - mtree_lock(mt); -retry: - mas.offset = 0; - mas.index = min; - mas.last = max - size + 1; - ret = mas_alloc(&mas, entry, size, startp); - if (mas_nomem(&mas, gfp)) - goto retry; - - mtree_unlock(mt); - return ret; -} -EXPORT_SYMBOL(mtree_alloc_range); - -int mtree_alloc_rrange(struct maple_tree *mt, unsigned long *startp, - void *entry, unsigned long size, unsigned long min, - unsigned long max, gfp_t gfp) -{ - int ret = 0; - - MA_STATE(mas, mt, min, max - size + 1); - if (!mt_is_alloc(mt)) - return -EINVAL; - - if (WARN_ON_ONCE(mt_is_reserved(entry))) - return -EINVAL; - - if (min > max) - return -EINVAL; - - if (max < size - 1) - return -EINVAL; - - if (!size) - return -EINVAL; - - mtree_lock(mt); -retry: - ret = mas_rev_alloc(&mas, min, max, entry, size, startp); - if (mas_nomem(&mas, gfp)) - goto retry; - - mtree_unlock(mt); - return ret; -} -EXPORT_SYMBOL(mtree_alloc_rrange); - /** * mtree_erase() - Find an index and erase the entire range. * @mt: The maple tree