From patchwork Wed May 17 08:58:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13244464 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 64AFDC77B75 for ; Wed, 17 May 2023 08:58:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B0FC3900006; Wed, 17 May 2023 04:58:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ABDCE280001; Wed, 17 May 2023 04:58:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E7D490000A; Wed, 17 May 2023 04:58:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 810C2900006 for ; Wed, 17 May 2023 04:58:52 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5790D804B4 for ; Wed, 17 May 2023 08:58:52 +0000 (UTC) X-FDA: 80799146904.04.7C77801 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by imf11.hostedemail.com (Postfix) with ESMTP id 82C5D40013 for ; Wed, 17 May 2023 08:58:50 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=QkYpZT6J; spf=pass (imf11.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.170 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=1684313930; 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=dHQ/4wRfx8YGBT0TyL6p3b/Q07WGij+qVhIqIOji5co=; b=7xJB14DHYlkZJ6jfJAZSaxLxpkkcLJqxgfwDMJNJAwyznQMA0PDsSxpdz2j1NAI/zh9l8b zJ67hY5Agnqd5bgHwh11f1iYhQlrcsy+oQ1KrzXmhh0mZn+1HMUyEycKzu/sF7iU9w/dn8 zfTh7N5PQFiz4uOqv04oGvHsANgr9Jo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684313930; a=rsa-sha256; cv=none; b=TIosx+LIJ7SwfJ2IcztWKMALlf86Dan+4LWCSpX/mwEbpuc5SM5QbfUnyvDFOSn3H4w9Wg HWlZvq8bWXO9BNkQFBw4LNhopHqqDYpRvs8RPydIGCh41j4phQ0Fuami1D6aCZqN5opG2B 4jRT0jYTvOog+b76hOaM0ooB2UOcJhs= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=QkYpZT6J; spf=pass (imf11.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.170 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-53404873a19so298420a12.3 for ; Wed, 17 May 2023 01:58:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684313929; x=1686905929; 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=dHQ/4wRfx8YGBT0TyL6p3b/Q07WGij+qVhIqIOji5co=; b=QkYpZT6JTZgFCW8g+gHwlD3usHqZW7OZl7/3oBK6EGsOSrFnjcS/IsoCdmA13UbZeg EODYTAlK0P20L372ioqTr4+YuTOAr7N9aj7tscBr5rWLf0oHxfBOH7sqej8hccrOpEaq GzVu2hXKgmar5SOACGxyML1twxQVjxzY9EV/y9pT+8ToUqs7vIzbk7yu9KRqwACOMP92 U6P8OWr4V6wAeSEzkzL1zMhergOyQFTCkUCmJaedD2y5sfSLKFOPC4qm317hWlCuNQAy cXRnFGH7Mk0l/7roCte8CKvnYjrTWFs1OgO1YEP9J9n9Iz2LcGFgqRtukM2Rg3YWhnqz qTWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684313929; x=1686905929; 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=dHQ/4wRfx8YGBT0TyL6p3b/Q07WGij+qVhIqIOji5co=; b=crJacAvhQkeuY1zG8ymhdt3EPSbWJNMeSrdPWVVmZqXjPPIGvq8TftaIUrfPplJ3J9 kJLDo7DuA0NwzqdwRebvvD7ARyq20RWKoq7zU+xggHS1QvQ+sKPNmzMiIB7+cu8A+P1r uU9LvrzhULEBjOEutA+1UIZ5NyHVuwwQt7InHqijhMezjUGomVIJDgO92yTu5GYq28TX mpPUX6zFJ5oOGlUq8D+1mDxZ6jbEPBaCJXkscxEudSnsoe6n6nvfNxkZofAGLR0rzcr3 /FI5EIOOxkEPFQ4Go7YiySRti1S35OpumIZpvhaCKH7eW3jwnNMmqB3ZGCSzlkV0tXem AYDw== X-Gm-Message-State: AC+VfDwq3sRGyVM96ye5SxY6OW8ZolDCBw3wSHPkAUbFpZngqhkOdJx+ keqLum6riLDvQYR67t04wJVF/Q== X-Google-Smtp-Source: ACHHUZ4MiIkSySgrbyPd4kQP2+fHUmdRgaMwGI51gtxUWgKJCZMlbz0NTwGpf9b8KfQuim4wUi1hug== X-Received: by 2002:a05:6a20:1587:b0:101:5171:c880 with SMTP id h7-20020a056a20158700b001015171c880mr35122952pzj.62.1684313929300; Wed, 17 May 2023 01:58:49 -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.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 17 May 2023 01:58:49 -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 01/10] maple_tree: Rework mtree_alloc_{range,rrange}() Date: Wed, 17 May 2023 16:58:00 +0800 Message-Id: <20230517085809.86522-2-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-Rspamd-Queue-Id: 82C5D40013 X-Stat-Signature: h5udb86j645mbjx37oxxyrwrjc43jowx X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1684313930-828165 X-HE-Meta: U2FsdGVkX19WyiEuiuBOTHnrQmqt9rDTkTvMRwhyvdo2aASpS/7zL/uuLlKbj+Xy5XSzkjFbD29PoPqc40WRmGsBNKW4BJVg//qFO0/f8nDIb/MklaXAqkEhQ+RJQMlOLj1wqiKLx6w2FZysFEmbUq36p9fqArb7chw5NHEIln3L4cUbnYtdfAUCTbMYcHR0OiNmbilk0eJFnql7KBw4bWLqnkLND/iWl+7afBDdvT95+n8jBXGQXqT2n/uQohu0a+Av63ehH4WGoqgCtSBVce8fdvY94HYUCtBo7VnYHAQr0grZY5urVceDZvMB3wiD7uqaqnWEEc+pWTEWFbVhr76St8R05S24zOykiix5HKV2ATbY64/oj3Iu0MuQe0qlXH7XD/J2zQXfhFJ2LAuAMgs3LhpxGuG3N9cH8/KZYi1aJbQTDk9asJIO+Ka99a0biYtqF0MLWuFcXiz37tVs4vPhYR+oIkUPmEU8I1/COM/unJE1w931tyMX2jRqiBG4pIgVloIdkYBKBvB7k5B2ULvXbbCrMsqHQKL63hdi1gYVijZoXMHwyC/wE6HX1DSbYg1oKPwVtdUslU/RwbcFObC5tPHJq0m4Hhl80GE1vG7QnhzLH/4Z4QGIfZNmn/pnJSAji2eQ2WVh7jlpS01AfEJJmKN1yxgmItig6PBjLupXdZ+ubKT1RSxSE1a2M3r2TyszaWMEd0EvwT3LiGBP0T+hSLt24OkokOZLZuFxdFmwk4ZVtaXIjo+zC73AYdm3ORl0muOQMxAgQgjyPVLhaHbxj0ckE094a+IDxUeA2/dt07fzv+cGebL+7J+CofMc1ap7kTknx7oq2LthUVP4DOItcsifXHKIhjVdr0gaE965DsS44LqT7+8uFym7rOOej2/AtPeXR5v8A3jRH28e2Sd26Z/D3OoeD3Nb8x3kj1b9K8m2tX3WJPoYYsLMCNzModFHD7PxlQ0wlZkRe0q BbdV3dAI 3ZuFCC+YIVSpeRMlfmzgnpNmyU0MBF9GLHD972HiPnsNYbz3X7q8q37SU6qyO6jKZQcL2w7xEtgynkRTqfK0pL+beA01NH/eOD6gIhXqlm+5KCSYu/MG7YDULIpSdJBpwW6xybmm3hYkIEuxJg+fqzWrYqYNrB4L2oMbckI8t5z9WDuYfMeqeSrWl8uWXYfvPihpn185Bf0M7oQlmpdddpmXaElt3Y0JZuMWOdmSIO2hc9U0M68M44LnfcY6BrgVoke+YLtykkR5JO7jLBHLsFLjkEJ1chc46NILz0VfZiYJ9V+pwoHYcggJRMlPEuf3nocNaICph9Diskf+KIiDN5quPuWaj6wVb56xpToRxWVVj2VFXfU+30DAAeHG+YAYnRAAPkZI/2F5ZMsDjvg13+Iwo3JzPYbsaH2ssi6fUtLjh4zITC6zSvjPtrE4uJJdVUwvyVVVotf2st28= 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: Use mas_empty_area{_rev}() to refactor mtree_alloc_{range,rrange}() Signed-off-by: Peng Zhang --- lib/maple_tree.c | 63 ++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 4eb220008f72..e1820e90f167 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -6493,32 +6493,31 @@ int mtree_alloc_range(struct maple_tree *mt, unsigned long *startp, { int ret = 0; - MA_STATE(mas, mt, min, min); + 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 + 1; - ret = mas_alloc(&mas, entry, size, startp); - if (mas_nomem(&mas, gfp)) - goto retry; - + ret = mas_empty_area(&mas, min, max, size); + if (!ret) { + mas_insert(&mas, entry); + /* + * mas_nomem() may release the lock, causing the allocated area + * to be unavailable, so try to allocate a free area again. + */ + if (mas_nomem(&mas, gfp)) + goto retry; + } mtree_unlock(mt); + if (!ret) { + if (mas_is_err(&mas)) + return xa_err(mas.node); + *startp = mas.index; + } return ret; } EXPORT_SYMBOL(mtree_alloc_range); @@ -6529,29 +6528,31 @@ int mtree_alloc_rrange(struct maple_tree *mt, unsigned long *startp, { int ret = 0; - MA_STATE(mas, mt, min, max - size + 1); + 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) { + mas_insert(&mas, entry); + /* + * mas_nomem() may release the lock, causing the allocated area + * to be unavailable, so try to allocate a free area again. + */ + if (mas_nomem(&mas, gfp)) + goto retry; + } mtree_unlock(mt); + if (!ret) { + if (mas_is_err(&mas)) + return xa_err(mas.node); + *startp = mas.index; + } return ret; } EXPORT_SYMBOL(mtree_alloc_rrange);