From patchwork Mon May 15 13:17: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: 13241437 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 2B621C77B7D for ; Mon, 15 May 2023 13:18:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9B220280002; Mon, 15 May 2023 09:18:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 96127280001; Mon, 15 May 2023 09:18:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B485280002; Mon, 15 May 2023 09:18:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 6199D280001 for ; Mon, 15 May 2023 09:18:34 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 20690AE4A2 for ; Mon, 15 May 2023 13:18:34 +0000 (UTC) X-FDA: 80792543748.23.05B9CFE Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by imf21.hostedemail.com (Postfix) with ESMTP id ECED01C0015 for ; Mon, 15 May 2023 13:18:31 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=V4yvdebI; spf=pass (imf21.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.216.41 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=1684156712; 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=7SqZWlsfkbxEd4BsTm1MhrUO1FrEvEzjaPkEdKk7VYI=; b=Ttde982GzRoX3DNOaLEkkH4kURNc73GW3quWgdOiSpFPj+COzq9EeCzFYyi7vMtXToy2cy LiFbSFHyU+Qw8Ml0TOyPcatjgRD8sEvSOr/ZSM1hVxSRrGQ7Xen2MmJAcSDW2A3H25gLx6 aBEJanu/CQ2krZ33MVJz0nCUWTTp/rU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684156712; a=rsa-sha256; cv=none; b=mKUsDgzyKZCNbHKKqnD/SJqbEhQZa8RiKbISLqYTqAYmgVMW6NuV9xP5n/ezu/WA1V39bV HD4Bgv16ohGONM4c4nbt6JN11mD/Nk71M9RNjbwIdG47mgBDBE706D/h0lP2Ou039m6QJv 6dArQRTGDq9KD2oZHuZTDPaZx/AUnJk= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=V4yvdebI; spf=pass (imf21.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.216.41 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-24df4ef05d4so10850586a91.2 for ; Mon, 15 May 2023 06:18:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684156711; x=1686748711; 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=7SqZWlsfkbxEd4BsTm1MhrUO1FrEvEzjaPkEdKk7VYI=; b=V4yvdebIzkZLzBXRdBJ/cqlNoldxsWjHV+VVk67DXhofASL/pQ6Sn/RCFW7Rit5oF5 eN76yVDQO2rdOlHRbBhgVTYaCnQ1mgf6eLRo++EXcdBEFpoZdNigL3UQaELWi1EcgsGX 8YiAsABMNMu0jqrcVUBl4HlHzlHsKYVVl1wNagcLVG6hQHBfBbhmDiC/Q7kYyweQ1At9 2RLHAfkffK1DlgF30rG5KAP7UaTjJ8Uhdtkv/Pw7AcWh6Y5OF6KOSZ4+Uqz9sEWdUWNA wQnD8S6lAFuhOojjwHM/Wfr84k66hoMehS9bhtXwct8hf+cerazoCuwks9SlHPlrwBqZ Bsrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684156711; x=1686748711; 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=7SqZWlsfkbxEd4BsTm1MhrUO1FrEvEzjaPkEdKk7VYI=; b=EJYR76N7dlDPTE/5LMvdeXQrgpE6A21aBVH+NYZaCwWH8rRMRvOE6S2GTpIlHJOaP1 srMo7Mc+OZYYR3jFh/CQbsfzFJvy1A0Zy7qVi+JV95ddvvyVnMiRS9O1ahAcoy4USWjW Ax5u2sA56egSbbENzDLKlRERFKDjeEvQExTvnHmWoyZ5NLvcxt5rY3tKlNtQ/oK/nAmr cuv7k60rxv3pf7OpbLpAqXDBLeQiS682KhpG4vBEp/97BLo/t+MviIEsew6MiWYSIRkp vkTNOJrUoBX/P/B5wpUxAAmJklyQ9zNhl0gn6a0rN2Ggbr9qgLFL+innch8BmSEksQie HkOg== X-Gm-Message-State: AC+VfDyS3ClKQH8iXmg8Y9+xetLX7BuPhu9Licd5GJ8X8BaYT3U2w94M C/xQdrMp+4oO33p5xvmREYbroQ== X-Google-Smtp-Source: ACHHUZ5o2obesVD5PMEZoRPcOhk0yxjhISRraF1Wv/wfPVSvpR0BGoHlgKqx3NWmD17MpLvIqgEwow== X-Received: by 2002:a17:90a:ee88:b0:247:13f5:47de with SMTP id i8-20020a17090aee8800b0024713f547demr32771298pjz.44.1684156710773; Mon, 15 May 2023 06:18:30 -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.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 15 May 2023 06:18:30 -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 02/10] maple_tree: Drop mtree_alloc_{range,rrange}() and related functions. Date: Mon, 15 May 2023 21:17:49 +0800 Message-Id: <20230515131757.60035-3-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 X-Stat-Signature: ka7348ft1f8c6ib8eubg54ksot4bwcqg X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: ECED01C0015 X-Rspam-User: X-HE-Tag: 1684156711-553750 X-HE-Meta: U2FsdGVkX1+PGqmqoa9wic99JmzZ8ew/bCLbEwOgGqL6th0++QLEWYZWxgZ5Dh0z9pEMC5z5MJ02jxDQyjG1c+SX3C/pYsYBDFLMRtfxj1UswYvGxexulTDHfpJhg28DOfTyNgOT7rbAwUbPFzAwQQX/5BjdbQEK5DMttTKs2G3sm0TfnKhocJxCqOpVbTRMcjbyV42/Dd4fBo4RLP0MeQk4tQfb89pf//GjOFieiL03jRvUXQfOo3ldsJzhmPyHI4iXa0+mXIuo1IhxmgdVig+s3sw/uFvAAKHBR/4TROgGpu3QH9RrJBovsB62WF7j00QmphurEPJz0hFRVLI4k3SbwwjXxRlTl74bd6mnc8efGtngScQwoHK1WyXcFpAqvlAsFY41fan4i2QRnPdo3MliV0aysXWLzGuhfW7WAFj3ssUH1rqR6gF/sTuF2Hg/HNZJEWPt4QEiwaMd3mhhFsFu68B36dXq60KKW0a5mQgzji4RnfbXKar0MFRGHUC8/0HbOMuxDN11BRYIyiL57V9uigsepwUlrpvaJaCiACi9jQbOK2rCq9UTLYnysDlbWgACfCcQWK2aVUNl7A8vJvTimEc21Kpr8IVPV5Wc0OwCkNTxGKelXwr9PIJ7rWk0g12v93/N/CQUWtazfkikJ81Sa9mbWeZKgikllk2JpymJtUCjXJYis7lGw+52M5IjNBgppdOoZlBIArv1B+oj9ceqZgJVFpf0OcIxOHGuKMJ0f5PFQWTdVytarwb7nuFi2xVeOrJymrRljzTnLK5qQNgK5io+YORIvvMLr91JsBHsNIibc++A90IMtSfiaCq5y9tly1VRiHn0RjsySVTeT21kG+/SBo3Hv8X7D3YVnaOSJuMm8Hv8rjd82UqqgbOaySc4jNlHIGZwrg70Q2/E7JxwF6VEmDk16QWveptKiYEksgJvSofTqL5ZyaD8U/JzkhGW2pLrUbZZnNxqmqO Xzujo/B0 ttQ+j2Kt+l12/S0Vrnjw9WkUlfUjJuhAaNkIIFa+Oq41RVqLZk37ZeQQjpHmUZDjO8BR17dgm9cA0Aevu3P1pvJHyY3rxRghxEEAroH9vRfl5VD25j7I/wg/WJn/bLbbpw8iZcbutVsMiWAEgbx+NxAr/rf004TCRzB77LtZJsp9UzlGVO2uFL5ysN3WtgDLbI4/mY/hDVm38BTz9NPqqvYCHuTUOcuBlASlKKv1B/BvyIkFz1b/Is/kV1b38hwTQF6bWpSQq891Q0ZdEptsPQG3xif3eBQ9uhpHqy+3RGaK7YdOuBKmG/31E3rqvUnkV+xs06I/boj9t1/pt/SddE1SWGHXznYYOwSufAd8mSHyOR35/2npJDaX4kkWc0TVg0giy5QCG2BuTm/UyuU9TJjGFAwPICMD86MLDmo6Kp/NiETpHwYgcRwoqnuyxA0Q2RB94/JoN26d79hs= 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_{rev_}alloc() and mas_fill_gap(). mtree_alloc_{range,rrange}() currently have no users and can be easily implemented with mas_empty_area{_rev}(). mas_{rev_}alloc() and mas_fill_gap() are just their internal functions, drop them together. Signed-off-by: Peng Zhang Reviewed-by: Liam R. Howlett --- 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