From patchwork Wed May 17 08:58:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13244465 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 48DE1C7EE23 for ; Wed, 17 May 2023 08:58:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D7EC3280002; Wed, 17 May 2023 04:58:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D2D56280001; Wed, 17 May 2023 04:58:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF5CC280002; Wed, 17 May 2023 04:58:55 -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 B0A2C280001 for ; Wed, 17 May 2023 04:58:55 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 246A516049F for ; Wed, 17 May 2023 08:58:55 +0000 (UTC) X-FDA: 80799147030.15.E6605D9 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by imf08.hostedemail.com (Postfix) with ESMTP id 4215616000B for ; Wed, 17 May 2023 08:58:53 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=AiP2PsxH; spf=pass (imf08.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.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=1684313933; 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=muDPH+0qSOjRZteWOxPwTAv/64dXCJZISlqxUy7MmMc=; b=Ya5zQD47ZitoMxUKHjQU4imwCWWaZduYSo9hAbyrMu3sv+WGqnvATsk1kb/tMu44eyyuwr R4tFQqpDx2NM3nhkl3C/xztOLpGo1TbqNOD84bToQAZKp0c3d8mxjmEnt+uLWmUOsH7jvj IUBI9i+ghtWL1itQr+51i606ocwtMNk= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=AiP2PsxH; spf=pass (imf08.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.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=1684313933; a=rsa-sha256; cv=none; b=Yh01rH5ycXz8mJ2EUHacPXBzmaFr42k20TYz3ArSF00GeYMdvDU0+TfSKCPvzZXwKLo9s9 3bsrdJUdxAgim0FNBGiOgU0+d4StQjQF7nemdNw4lTYEjtTVkrslhEPQlH7n6QKThwHKia rHHmCxUD6DbsNw4Xw8SIAHldvbENtG4= Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-5304d0d1eddso240181a12.2 for ; Wed, 17 May 2023 01:58:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684313932; x=1686905932; 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=muDPH+0qSOjRZteWOxPwTAv/64dXCJZISlqxUy7MmMc=; b=AiP2PsxHN0UHtZNnNBLr9fCq5OgdAGQZRi7YFbOy2y/QUmZGsAStn51hGs3WPRvljK svzaf6zF4ms1xX5WJP6W7TogJIGblfgPdXi9w1v1KuiIhKEX8Zk0snQOV4pinKwdWAHN mAULjfjv3Vc5J4MQ/wNoqrLmlADD8RkSavPiFzDEdMa/Clbc/P5o1R1dSgAilJ2mD9qY +oxe+1+zRqvjGRT7Dr+q9A4EhpY3XNl62BHcNLWGtE2/bn5gMbQrlrSwTPcGSMDvSJgW 43EQ7iB8SiNhZZOKQaYKYg1YMadvkVWEgFXQPJpxJ/aUfwBGIFQVBVScKAElsFpAhhG7 e2ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684313932; x=1686905932; 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=muDPH+0qSOjRZteWOxPwTAv/64dXCJZISlqxUy7MmMc=; b=LjxlErNZ4G3AQXoDr43u2+h2jiQDg5FBu/MX93H4lgXYtrrdgNRPAIxNKHg64zLX4n IJpRjpWCBSYbGbQqzZ8jskZWR9IRohdK22A4Mib4gleCcCzXuqG4b9WgoIO/X49rKr34 TRx2esnhibyR0r7KKdabzb9JcPRZL9ILDJH7tg2tvcWHbuht4T+4fT+uOCzI1XUoAeh3 pquOvsDnFv1vdu/AT9K9q8weLTrwYMe9+xmW7Xhzm5g/da08dm51xjjPoSnmnQANkODa iawCHT5M4Xz70KnNGwr8qM1PCalEigb8zETSGnDqVL3Vj1Ak3WIonxUw8qiNvGBv6ZHt CQeQ== X-Gm-Message-State: AC+VfDzYFxEYcDV+CMtqs9Z1F5N3Q+TLk5Ox5z59hIGurQLiOxTg2r18 ySGNHX3sG1h10qoT3naTo5yyfkVsMgAxFmkrPZ4= X-Google-Smtp-Source: ACHHUZ4BXjI5mVv9fCacdk56Cmg8gwN9m86sJFs+fFA8+ULEQQFgEOjIXo0WZkwYGUOjYAKzll45Lg== X-Received: by 2002:a05:6a20:1590:b0:105:5086:fd42 with SMTP id h16-20020a056a20159000b001055086fd42mr18006961pzj.45.1684313932035; Wed, 17 May 2023 01:58:52 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.255]) by smtp.gmail.com with ESMTPSA id m18-20020a63ed52000000b0052c9d1533b6sm15056765pgk.56.2023.05.17.01.58.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 17 May 2023 01:58:51 -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 v2 02/10] maple_tree: Drop mas_{rev_}alloc() and mas_fill_gap() Date: Wed, 17 May 2023 16:58:01 +0800 Message-Id: <20230517085809.86522-3-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230517085809.86522-1-zhangpeng.00@bytedance.com> References: <20230517085809.86522-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Stat-Signature: mn1km18136arncapthpp5ck63c8uk67d X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 4215616000B X-Rspam-User: X-HE-Tag: 1684313932-991806 X-HE-Meta: U2FsdGVkX18tmL8/gGJe96VfdPGZG62bDlm1BDPFdhiL0FGRoEh2HUwmIZ5ZSCAwYqNOWWOXL37Gz5oyYab5MtW0Ix0VqC8DSTIsd6ZnoDZZM1I/BXu4bD+d/DloDb2CBYJmho/20QOnwWedRlPGpun+gzThhz5nKTyh8oH2ZQWfJZ8qgpjPgRxrcsjEeVvIou6u+mFpyFtI2ERSLX6PKckDLXUnQo9vmnSZ3RcPUQBB3gQP0PNWI0/RGf5nDI0sWt7OfKe+qbVBxswkAURiD5uThnltZSg1QPY49gCUL4mvfnwPrBW32WZVZTkDjgwv+Dx8LVur7VzLvZ/c2vXj2O3F6CbP7qA090TJl73TItnO2THUYV0ZdKkbk4ChtOE9h9EHaja+YLl0mQqGySC4dybsXxTp/munG38TdhxAC/DlrZ8DP57HQnGIQZZnTKgufavRhd9N3P2E+c3a4jQyaHzN0cy7E/NJ2KrIFaQDqOJa6czyeUIHxNV4cCtTm2h0t5A1HQm3K18hpWJbZBGZ5/5lMUwdaMqYaeao0nBASS8dNiKt9xON4eCHcivk3XPiPz4XVEO6r+uBYY1PAl8GAtrvMapeLLzTvTXuuLrDo+rSy6RRC32M9PmpV3ObbBCcZMtPTEIKI5IVGnQT72FXYFZpkSXvul9qHkha6b6LtMazV3bfXln/tNmFxyiCcxiy35BKWw2m3C8cHVdr57jTPqhHh8e4pJACXERSYhw9HNAxd/7GxRQMu8bk04pZfhIo/9dW0F5PehR+aRIy4NmcefyopZaRk/6OaR3V2VhptaZagCOoGIxxutb2johCp806VFko1ApfmiqgbPWhFnCaYht1sZZIOl4CeQpTeh1p4SbvhkRIZUgk4KpqtXXJbxYQgO7JK/6PSYVrY7e0eW1lDnnlzQI7fw1cu01Y8Nk4bRikxXawkRdCXQwSF3szy91vY1OtKZZcvVeyt2GVRcq 80B2IrfC AN0kBt6RrlqIPNqIn5JDnncpFF8YmvSvHdKB5I0GlY4EgsiQ+m5kxjnb/xudl1ntBDPhNayIb7wZSiIkiKEn1lluyqAAZH3VbntN/QPWX+jBVZPYKtPO9xYRqEhRYN0GuOmgDzR9NBELFPUJbsJ4/Z5XQPHhNbyRY9OheewwrndPyY6PvyhF1Kf57IXpOJcK6kgpJXbiS3lM3wbRBzNAe5c/TtSFYe4K3D4kOLGJgqe8MzHFyosdauJQhTND9KA2WajH7S6zgQQ3BM4U/ZL8u7+tQv1vqGvoHxhnlSFIofPnwKYikWCtJH4gGpiS6SB6mkgMjHxkA3sgQUiLLRokb1rkzKui+wouLtCKNpXG8+/AJX84ZpAJK4HN+T3/+UPbNcxAZrCdCxon5rcY//Uy90HtjM4+m8OCDDRHUjoFOrpRCrHeEVxKjphM0wST65yv+FqAeak9leCCHJKQ= 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 --- lib/maple_tree.c | 108 ----------------------------------------------- 1 file changed, 108 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index e1820e90f167..c8176f360dc2 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