From patchwork Wed May 24 03:12:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13253235 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 9CA26C7EE2D for ; Wed, 24 May 2023 03:13:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3A62B280005; Tue, 23 May 2023 23:13:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 32F84280001; Tue, 23 May 2023 23:13:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 15D93280005; Tue, 23 May 2023 23:13:22 -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 F3B78280001 for ; Tue, 23 May 2023 23:13:21 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D16801A01AC for ; Wed, 24 May 2023 03:13:21 +0000 (UTC) X-FDA: 80823677802.22.297C626 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf01.hostedemail.com (Postfix) with ESMTP id 0AE3B40013 for ; Wed, 24 May 2023 03:13:19 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=R9RNnIEN; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf01.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684898000; 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=ckt2ag3ZoF3mgkuxNjyDxYjsZDgVbwKu3RW+Fb2CiD0=; b=BfzEnbmpouL868Wn1vjhZR+45RXM0Jy3v2aP7nu5r6803nTd6IS6PGy8eMgzrA2TGazvq6 DvZ/WlcqOzhqdwj59yBO2jfjhGxI3pSaG0/MhfgBeAADrTwn/rCffD8jA5GqykNEMEoSD0 AQlpm+wg8mDVYCuLKjiB0Hx8NO2Wqx0= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=R9RNnIEN; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf01.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684898000; a=rsa-sha256; cv=none; b=8b5zIVZqXOahbXAuWQsckpP3vntHtQTVeSzB+rz9PWLo+RbfAYZfDs2iyLwzdIWxaT+9E+ /pgBd8CV3C5+pI31os6QQyxL2JI7XTumadzydn+kA/WcYYwHMQ6Nqe5sYEqaKSaMuv1r0z hfbtnHv7Csc/mIRUPC5Zr93zzU35x4U= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1ae875bf125so3278845ad.1 for ; Tue, 23 May 2023 20:13:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684897999; x=1687489999; 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=ckt2ag3ZoF3mgkuxNjyDxYjsZDgVbwKu3RW+Fb2CiD0=; b=R9RNnIENcm151VyqYa/nqwjf1BhewhDeVjq4hnYK2ZCJ9zYTYaDCmfildSu8xlJ29P 87FyT/a7va4k24YfyPPXmQjaWvuZRn47kTxvSRFCr6VnmSc2MtDTqImDn1eMPL8CNoHy cA3eyqxHaCcIxQLKKxtJDN1TLGOrfTooLKwS/4QF73ztb6i7qhrfqyAjaFvdSjm0B1rN UsNuaVxpBWAvHSMVQ1mHnSLHrEYAcgRFS7FQXRgDKwceWjRlB5ov0JaaksFOfmy1TlyX jzd94++aTxMoXfMtaax3HspHd/jL4wyu16QSUWtc3Hs5i0VfMgI3savoY1uOx4KEgXYy uRAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684897999; x=1687489999; 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=ckt2ag3ZoF3mgkuxNjyDxYjsZDgVbwKu3RW+Fb2CiD0=; b=mBx59Kvx1Y5js0tTh+iJSeqvwSpr4KHdbcZBmVit3Jk2qY7Kr2NpiSuwdvE6HUwf7L g/2P+FzZtuV8ECFCQO+XshVfu+nTiipciOzE9gbzS2Dmeuafy2qsyH7yQxe/qIIwJq/d L9FWLKl5mBjhPRhSKXjMwzH+OBNysbhSX8XJspB+3GCFUn6X5KTWwohWrPMtHWEmwl5d +ZXhdz/+Vvr9jQhD6xor1fzB+pddqg1RX407vkR6A2VInVehb5JNCSUdk4o/twOL964N K152K66y++UXi6hLzULHxzjJQunilVUL2dwpnYavncnIPVFsdVBnn6jCVz73sOB7kOpN ix4A== X-Gm-Message-State: AC+VfDz92bxJuYHI3ennk/b+l15c/jtQnvgOrvoWnlHOzuydHZgiWC0V FjHBnLJuzkO6OC1WKuQTR7+2nBi1JSGNSonTbp8= X-Google-Smtp-Source: ACHHUZ4xqpvx+J6/8q6bDUGXkrIfdgSfVg+6S8HYltONtfrDCgiX7zHvArLeqYXpbVbXCwHuRTRBng== X-Received: by 2002:a17:902:bf06:b0:1ab:1bdd:b307 with SMTP id bi6-20020a170902bf0600b001ab1bddb307mr13560839plb.51.1684897998911; Tue, 23 May 2023 20:13:18 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.249]) by smtp.gmail.com with ESMTPSA id i4-20020a17090332c400b001ab061e352bsm7480769plr.195.2023.05.23.20.13.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 23 May 2023 20:13:18 -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 v4 02/10] maple_tree: Drop mas_{rev_}alloc() and mas_fill_gap() Date: Wed, 24 May 2023 11:12:39 +0800 Message-Id: <20230524031247.65949-3-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230524031247.65949-1-zhangpeng.00@bytedance.com> References: <20230524031247.65949-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: 358cemmqbi67r67decmjzb1s74suf9pq X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 0AE3B40013 X-HE-Tag: 1684897999-325781 X-HE-Meta: U2FsdGVkX1+HM3/PuRxdo6zjFVyndNdw/8+t+coWDZfF+z1+TVSUdbFXEcH3DqyudtDwxQmkXKLc+M4+ZjoslN+47CXBM060ynDZH2oWlUCN/HY/Lc95cDvlY3QOYv+su+dPUHYlG5a4JMIGNYq7HMLZ7/+WMGYsR0w0OY1lsrWAQ7R9mF14vjopdz4lql6Tx0KzoYHxXkyiXWe3GP4M4Z0jM/McCkpYxR4fxzs7ixiFyRAqfa1gpAwZosNELA+QM047FwAFmBipTjinl9B3lRhyMW6HmYmrReactIMpNly7qXXJN79DH+E1SyHX6inMkx4pWFYLtmWsA3KA70dH/Zo1Z0f5hYafmEm29D/wObmbJC/cJ5bj/d0r7XC6QRZ/Cw/pRKXazfl8B75/4giyb4DcI2p7dPRLv5W9FIALiy9eUCx1bS1FyogGv75EVT9AeA6YhmpRo5ffktlCg+ip/1cmx91KUSqimO8LUU+Yc2iipVS1AwX/IEowua/mj8/RhONMqMcuqZ/wH70x8no/DbVcuOLL0JRp4Islqc5UOK8oBPsEKYyW0uZB9rCYcvjAiOLeiwa3pT6ZG7Iv0n2DDrt6VKwc+P+4IOLPq9fxqOlVRc5WAxzALZHbzOnFFAJzxqHeCf/sxPguQ+qGWzfhJKG3jn/sIa2GEoHeZB5g3MZzGWirPzGihzd7oTfvuDsU71azmMhjbbYLHf8aTajmZAiFmfSUGbx4HouoSFoNFxTacpHHTDVU3mLChwALHLhKuqObQz+TAmaTaaPtYTveJGY+SxqhKIgTctsguxEAfv+lV3oUAKUP9pm/klfpNntKP90irY0qoQJXwI4euypkchH9bHdKVwATWOL6CR9ve+6XcY0IyGjb10Zzq1NFWzT4DE6NDgOz4/iPb+fb3JM6/Wc2jqOH8OkvFeG0Pw/UvClDIjc9R1OQX0wmkxa7vi5kB9A/xFLgrovLnuuVXv7 X4vM/l8c 9mP1hW2eLwZJDIvUe7YG1NmohK+zqNq2uB+nZU0NNnkqjEA5U0/Yj5zH8EA2qPiM3nAZttHvxjkTKOrrCCEpgK0hwwhbcwsjbCNmT0cupU1utmP1F0VotUSYpDNxeWiPKVeckUVm1drLdnYiPQHMPctsKD1e5hcPNU5ae/IIOB7LIXx95aDT4rQoj8NS7WvS1K2M++apuFoZ2ifG6r8g/TYrzlnbCyajDTO62wwVqM1PmTws6ofXU52QG/0HbQYk516ah4xFAgRv/ULn6RELGvHDkJJGe3795n7PNg5F5Xyy5lYcXyUBMc3TfPqkO4NCnThqbp+KfisA8+eqYy0w3ZybstOsuSEvpImwtovpmYI5YrtAbzIdhf1hsMvhhZEWgQ00tjEQdxHjZeBPdaVbmcxV6o8XhtYmQBZQeXbUy2LBHKLc7JuemsPtK8eO0pjRZNJW79n9iLKKSHSLuvTWHAEXKiUC4KOCePaGg X-Bogosity: Ham, tests=bogofilter, spamicity=0.000003, 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 no longer used, 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