From patchwork Tue Apr 25 11:05:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13223203 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 30106C77B61 for ; Tue, 25 Apr 2023 11:05:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 783336B0078; Tue, 25 Apr 2023 07:05:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 732A36B007B; Tue, 25 Apr 2023 07:05:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5FA836B007D; Tue, 25 Apr 2023 07:05:38 -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 4EB876B0078 for ; Tue, 25 Apr 2023 07:05:38 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 1786CACCBD for ; Tue, 25 Apr 2023 11:05:38 +0000 (UTC) X-FDA: 80719632756.26.07D85E7 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf06.hostedemail.com (Postfix) with ESMTP id 44BB2180010 for ; Tue, 25 Apr 2023 11:05:36 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=TvmnBK3T; spf=pass (imf06.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.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=1682420736; 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=s+OVqkfyvyT9tLRaTTTVeLMx7p1ihu2PyK06f3NH+m4=; b=HT5X68yUdoUPlZ26lC1FTXzJCsRuUeKZRYDKoow2Q77CgfFqDp9byIJ0NLKOqNyJhHXHeL ymycS3ZS6SoGdhHZ/Wd4fdvHp4jS3TNe4BqGmlP16xteCTXjMpHIhyL+ko7Y97nOhb7b6i 2hExiyq+zjfLQmSIVTHnXgbSR76pdSU= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=TvmnBK3T; spf=pass (imf06.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.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=1682420736; a=rsa-sha256; cv=none; b=ZV7Z4Pz7mWptx6jfU6fi5Q/ofetXUp/YKIdw6AmaIctQYUyCPDOYpvYm76OtWXgrGfj09O wU6q3tYkbYQwwbHG6/rTJNgT0G9lKa/2HoVisViIE3K1MXNDKfOp8uJHJxTv5tzrij7m9/ vCMqArLlb/RrszinTBPyBxIuH6twTeg= Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-63b620188aeso6822614b3a.0 for ; Tue, 25 Apr 2023 04:05:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682420735; x=1685012735; 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=s+OVqkfyvyT9tLRaTTTVeLMx7p1ihu2PyK06f3NH+m4=; b=TvmnBK3T5BGsKLcDBxe8I1B94ng08H2tuzNDpEqZoy1+LctQIiW4WT3RZcb/tHl2on 88ugTHoHu/LoNQs3vW+n1rhZKd/FtaELuBuuVd9rZJaB3jLXbc9nJVemoKn7pNdJPu7Z tyP3oAFD0+vym5HdffMKGu7KU5rXjbuZg3OIOmHOrpOLXiQYYysfM2OhZ1NIR8Q30bND 9Vb81GryXrwM+H52qTtiRELs/L3RGJ2omGxGUOjbzntjCSK3Xs6nlbR+6Jx5RgRGdyZI lvvTm032rA91XCwcpNpNFMrfC2Q9p97isiUAo5q0FefmZnH99JIs+GggNcuX0YNXfn/I FG1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682420735; x=1685012735; 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=s+OVqkfyvyT9tLRaTTTVeLMx7p1ihu2PyK06f3NH+m4=; b=BIvkS8qezw0NlcKYui5sHGIf2/H1G4QTGZubsj4YQ7Fg0/OWlqvoEQn5+OHiunjp35 g8Co0ORFVUpN1GCSfxI9KfEniIsQWkCCyR0k/C0qaW4+0FxTlYIYBIyW5r1AJfpiIhTD aya/rCpr/ysivcqHOgJr4YcP1XzanDYsH5o9+0C9k8nnrdYEZZuExDAc35Digcr0/iiB 1KRdKCFh8gCsWH3QIggJTN/0794X/u90ChNzUEUrZ8UQZAFR7yljwH94NCTRRxCAV3q4 gNg6c3IvUIA5i+zrcq4PLjLFnqwamxVxTngiE8rwdY1hsEryaW/jM5UjQEv7usctgg9X vqFQ== X-Gm-Message-State: AAQBX9cKk+Ccvfha8AGXEAAOjRsNGTMIQvME1m6KPdPBekLVNL7PEI2+ ieaIb6oW21ZlebZ9nlir7rziemoraq9AIk9wMcc= X-Google-Smtp-Source: AKy350ZbU0r0I/EfFW3YIvxct2GaWxziPDmRNWYLb0dmYuNj7cOPnbFSWn8Hszq0QOVVDQt4VGY4Vw== X-Received: by 2002:a05:6a00:1401:b0:636:e52f:631e with SMTP id l1-20020a056a00140100b00636e52f631emr22180035pfu.1.1682420735189; Tue, 25 Apr 2023 04:05:35 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.236]) by smtp.gmail.com with ESMTPSA id u3-20020a056a00158300b0063f3aac78b9sm4422169pfk.79.2023.04.25.04.05.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Apr 2023 04:05:34 -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 3/9] maple_tree: Modify the allocation method of mtree_alloc_range/rrange() Date: Tue, 25 Apr 2023 19:05:05 +0800 Message-Id: <20230425110511.11680-4-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230425110511.11680-1-zhangpeng.00@bytedance.com> References: <20230425110511.11680-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: y5fcrg5bnczsm1jquo5c1deo53gkbuyp X-Rspamd-Queue-Id: 44BB2180010 X-HE-Tag: 1682420736-759736 X-HE-Meta: U2FsdGVkX19KxCD2CNRCIYUjD/fWbh+BqACIrqT4qPcE7AXLXqscU8sPUpwZDGckPM/Yih7CVH7bNWwoMnZj3WCggXTbEZZsECw4QYWHJeD8jPtq+5JOvV1b96T1dHuhGLYt//Qc1JzmexFPsTe9Bx8hipJk2oHCCYF/xqE0YoL8n67si4oLxDcsvFO/aPnr+WGvnSn0aRrwJZ0BrKAHPWfSOwNeY6/aE2KKJ3DNpddCPCackfAEXFfL2Y9Wjt1zXQ+/6Axioxr9YI1knk4Gfzx85mBzlbLc5F2bq8iPFAFmsuWwCoYy5EyVyzZD3V/xQH5RgsJzqPM5oFofqC91S8aJdImvA9gIdUuv/azkeZEnfx5mucurjpxyMmNYxd88164SSbClaVATkA8oa2hXJagm9YeG8ejpKHnZFoMrAZunvxN3voYtPmjCJKQB5UGKl4eyiL4cdSo/0hrfO+fM49xfzCjf9w3jAbVbAgy3LwVfZrk9d6Lrb3o46k54XBMIX/ES+AiNcLuubSKDiWybBA09u6Pr5bg0aBY8s9WrJc9bAh+jIRNTEIZyfLUAn9KJF/WQKVE3+zgKvvmHSDNdamWOaGMi+TJMjq4jX/CuNq2YCw4XUAtn65Eza4CsgQMrfKAsgKxmqQXTaSQII4THETCwfSkPW6bMRtYdoPpSKz51wuDm99SNuxzcfbnI4PJsEr6qBlz+PsNA0y3HvEuedYCy8HjPQEU1949CtwK5n+M7zzcafYXBD+Xfs5qUPT1egDc/KN2i2tRkGwdaR3G/zb8dAMH52+SuqV4co9Ol22RGEU8RYQipbXJZf2ersbyX83szhvMZZOHEBTc/nXcN9O1mWlxxb4Tmd042QIPNmboL79gLny77U1nWZI56r3ez0JCwYNIuMJ5S5IOfgGuWX0gXIg0gbUyd5JbqGH/yRIuv8x89vbJ1sKX1UBvdcXpu5IHxmgNXIndoMP0T7Ds 7gwURMVy dQyk8SBWUxMojYfEuOT2mYrO1Xg66GrblKJU6ae6vT+YKnxDvmCjfr4bad4HFCKs5Cqj4ns+okqA8hLnwptux+aOUKiW8G8esqZeQ4CmbgpDnyZG0expXyGkcFNWNx69ehcMcf2GcAlIHGIXTV/4ZghNb4ToX7yNHseUGynzXYkCeOaPCfyM7yKjVV5GUkiWuhwudN2DY81xaCp4HswlH+Nuz6paPpCHcG1SI+6uP68dpWD48LnHSZVfHGpPG9lnoCn18EF5kNlBcUPK8mt5wdM4HTJTGuqeSCWQlOOQshiWEskFb/5c/oPKkCypoSYMxbvmGAOUVOV91V69UtIyfbg9P4JgFW0o2kBZMDCSckdOHiGT0AJgUN+RBJcwGEWbHX/K2ybshYaRgkNmWIGTB/DYkAV5Xk5BdkSIPDnOC4BII7HcYywn6XswiOjoz2Lyvz5iBoLQcq6DFJXk= 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: Let mtree_alloc_range() and mtree_alloc_rrange() use mas_empty_area() and mas_empty_area_rev() respectively for allocation to reduce code redundancy. And after doing this, we don't need to maintain two logically identical codes to improve maintainability. In fact, mtree_alloc_range/rrange() has some bugs. For example, when dealing with min equals to max (mas_empty_area/area_rev() has been fixed), the allocation will fail. There are still some other bugs in it, I saw it with my naked eyes, but I didn't test it, for example: When mtree_alloc_range()->mas_alloc()->mas_awalk(), we set mas.index = min, mas.last = max - size. However, mas_awalk() requires mas.index = min, mas.last = max, which may lead to allocation failures. Right now no users are using these two functions so the bug won't trigger, but this might trigger in the future. Also use mas_store_gfp() instead of mas_fill_gap() as I don't see any difference between them. After doing this, we no longer need the three functions mas_fill_gap(), mas_alloc(), and mas_rev_alloc(). Fixes: 54a611b60590 ("Maple Tree: add new data structure") Signed-off-by: Peng Zhang --- lib/maple_tree.c | 45 ++++++++++++--------------------------------- 1 file changed, 12 insertions(+), 33 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index aa55c914818a0..294d4c8668323 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -6362,32 +6362,20 @@ int mtree_alloc_range(struct maple_tree *mt, unsigned long *startp, { int ret = 0; - MA_STATE(mas, mt, min, max - size); + MA_STATE(mas, mt, 0, 0); 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; - ret = mas_alloc(&mas, entry, size, startp); - if (mas_nomem(&mas, gfp)) - goto retry; - + ret = mas_empty_area(&mas, min, max, size); + if (!ret) + ret = mas_store_gfp(&mas, entry, gfp); mtree_unlock(mt); + if (!ret) + *startp = mas.index; return ret; } EXPORT_SYMBOL(mtree_alloc_range); @@ -6398,29 +6386,20 @@ int mtree_alloc_rrange(struct maple_tree *mt, unsigned long *startp, { int ret = 0; - MA_STATE(mas, mt, min, max - size); + MA_STATE(mas, mt, 0, 0); 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; - + ret = mas_empty_area_rev(&mas, min, max, size); + if (!ret) + ret = mas_store_gfp(&mas, entry, gfp); mtree_unlock(mt); + if (!ret) + *startp = mas.index; return ret; } EXPORT_SYMBOL(mtree_alloc_rrange);