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: 91895 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp3399015vqo; Tue, 9 May 2023 23:20:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ57/dHM1Ipojt9drfD4OnNTUzyuXUx1ms4U/XDJ6n4BukuKo/S89yXkKt5es7py2ExySR+3 X-Received: by 2002:a17:902:f543:b0:1ac:6084:1f4 with SMTP id h3-20020a170902f54300b001ac608401f4mr18208421plf.27.1683699610865; Tue, 09 May 2023 23:20:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683699610; cv=none; d=google.com; s=arc-20160816; b=MJ8JhV2Z+Sftb3g6pqqOWcqKKb8Vh8Ako9trm2TLtjhhTe9S14SPnta6qSU1kSfQRP ytf8JvXP5kMpL6+xpOGa22wYHYfyg0WPwjh9D41vQcmW5GDF/E67L/4RGoqivy6W0KAU zgKfX9Do3L/F1hwss1O6Y+iyIWzLyvidY2XFygLEEBosSOfTOE6yBfZjzj7SIrb/nt5i w1z9SZiAgO/ihbNmnOMcErOz6REMjXUiSbwQL59PP6taNmVgUVfaEJWVf7guD6Wt4K8y xBWqFxa+/HX3bEN6F9GEg3bSgBGML2fGnQk+000oiLAS2ox2XiljH60eFvTvdekfEgWj OvTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Vx0UmPiglxMBycN8p78aITZtdcFTRru0fYxYXq+j1cE=; b=L1ukg+e7cQcigHHKFTHTPVY01gUwMF1xJHnTnCcjS5dh7cXpSuHS73L882a1jkDFjR XurNIP+C7V6JOStiFGPv0KAH6ghjrLbqRQAr38vNWEHssMLUoGOq7O+TuuE01l5+9pKa NkqhJlkcD7SfBHWKyQp+D9hLDKMeVuLmExu6R1ZLAQY39JaeiXYNcat0Q1D/zeaYgFgf i2rrp5aqOkS68ZdBdn0jGQeUIwdWVkzkw0pH/eFCUneFzvrQP854XR4mTgUywkYh0TVK 1lgWacXhgaaNuRSBBLL71gSpTgTmM1nxU4K64PhIElG72h1w2uCXUjx85BICuWQXxwA0 6BEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=fcgifp2z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u4-20020a17090341c400b001a96b39bb35si3645382ple.439.2023.05.09.23.19.57; Tue, 09 May 2023 23:20:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=fcgifp2z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235824AbjEJGLk (ORCPT + 99 others); Wed, 10 May 2023 02:11:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230188AbjEJGLi (ORCPT ); Wed, 10 May 2023 02:11:38 -0400 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF209195 for ; Tue, 9 May 2023 23:11:34 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1aad55244b7so52109115ad.2 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=QxCj6IrXrkHXGSPsfDIApGNXGei8m8L4AqCLv6XlmyQsWIAbEK4xGdaaG2cNa7AjdE 8Q0cPwzESa3qPQvRLXSAad3y9mNQG0rQGVrha/ME5Mr2zkiEVEI/ELeLeRPXCHrB2EVc YkC6aB8pW8GqPd1Hnd4VHT+tYNZLPdUawyNfYY+kCkogv+B8nMBMKZk9g303OMdv4RB6 sWLyRT7hE/oTr8yKMdggPgB6Tzv6jRAtbd5zxgwk1k1nqu0VXdGge9TwpJbU0zXvbhFr IoqtLjMY5ADVasLjt6NPLLnjDxPw2ymHIXpHwiPq5n3I1ajYXRRv+c+aegwVpDuAPvuf ODdw== X-Gm-Message-State: AC+VfDwZ/tNqOkmz3nim/0LH5L6Tdmixf5Ss+wzJ54Jwg5CNWiPZeIm6 niJvIFuvkdgfdz3CoSsGFagVDg== 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-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765487003032594868?= X-GMAIL-MSGID: =?utf-8?q?1765487003032594868?= 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