From patchwork Wed May 24 03:12:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13253234 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 5836EC7EE29 for ; Wed, 24 May 2023 03:13:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA6A8280004; Tue, 23 May 2023 23:13:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C2F54280001; Tue, 23 May 2023 23:13:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A5B02280004; Tue, 23 May 2023 23:13:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 978AB280001 for ; Tue, 23 May 2023 23:13:20 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 58DF4140869 for ; Wed, 24 May 2023 03:13:20 +0000 (UTC) X-FDA: 80823677760.03.D777D4D Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf05.hostedemail.com (Postfix) with ESMTP id 854B6100002 for ; Wed, 24 May 2023 03:13:17 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=lvWQ23Bp; spf=pass (imf05.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.181 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=1684897997; 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=+8PHSao7q3toNyfgfjr7peVeEA2aTJ4gzpmYB1pZW+w=; b=fWSUbIcQqKwIrq9p69zY0Uwq9dvFD/hiOxeLQIJ3oRRrJSR3LfQCDfYUhRo1Rc7vwqNjpg uu6k1qgoQ/79JnSPi5ccgmeznGgYsvaeA0y0RKhsXAxIiKUPlLfYbNtyV3+jIHB4MhE2nR bCFz+wl8tDclZlpY9di3UA3a1Xeqsig= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684897997; a=rsa-sha256; cv=none; b=aczUqh8sK8TwAHZinq0piEAX1JR2AJJTFqbaKUpoz4pI1XZz7XCcTvHp0WbW5GRkCY04XB J3KkWI8IRoJZbeLmImX3nRl7knSFppfLcbNx2SZgQY3bZJ0buiaqTwE19+vdcjGNl1pmnA sIZ51bhWtd5UW/7pjJ+IcSQi8eXAh3k= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=lvWQ23Bp; spf=pass (imf05.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1ae3ed1b08eso4755165ad.0 for ; Tue, 23 May 2023 20:13:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684897996; x=1687489996; 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=+8PHSao7q3toNyfgfjr7peVeEA2aTJ4gzpmYB1pZW+w=; b=lvWQ23BpbzUGv8Zz9/yKEZdWIMbq0jYsYpCHZ56cKx0kJhaKWwF205CnjY3IkxCCJr iu3xlmzbS5NbILPOR4ghiN6amtNLE7rfOQxfT9kCTsZrrsCJzDh4sAs/ZmKS1YVHNBDV sQRAARUoLgmmXZFaKaL2+iGAblKqu8h4nUjiL0a/LccDoj0hZJPvCS5mDR4hdvex/u29 abdcRkd8015H8mVC8SwPJkU6PqpbrDecMAQ2ablZP0Mo3e/MNE1M7EHu0R3BYqQ3TyfM 6Px2inQsZ8JWLtKaWJZJE7A+4FIV92vW425mtC8QbsKsDRhq5FEi00jIUGXn7tYZyiB2 nglw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684897996; x=1687489996; 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=+8PHSao7q3toNyfgfjr7peVeEA2aTJ4gzpmYB1pZW+w=; b=CZgg8Ns/6zJoo7wB7NZa4iMbYnPcmy1oCZPvD4CLYHVUGT3jd5HTZ02BwubYqtst82 /ftRhLzLI9p4K+MhouGMfJihmRQS73gFOt8U/0yR+GlFAjVELwWyuj6no0xYuW+7X5VT xDQPGUMudBv5buuisF6CTcye341eX9WEfaUH+SLNzTTIaIuRsbvBw1ZdpvHZrv8Hh5v4 ED2tSCzABNn55IhC2cf2ze4mQ7RLtkWgmVnbHFPXWqGsDxIChobnC+WyjHcwDS9PDx2b F2vSriK2uHRNfHGJQUnvhW4//KBdzlMBYoVqHl02nIHdjQvw50mF2nC1bZ4r5cowk8Kj 0iuQ== X-Gm-Message-State: AC+VfDw413gn7k4Rj7+PnUwopicR7TIPbq/zNldXLAxDSkOM/z8isrXx YVupdTBTO4uTAv+oHD6GQyY1b5elpO3FOuiB8B8= X-Google-Smtp-Source: ACHHUZ7j0UxgU2ZOy6gHnTDqmqwnIXVHfKLzJA1Vobgw72Vp5WdQV0HuqrWnsJiyojh+PD4OhbkqaQ== X-Received: by 2002:a17:902:ecd0:b0:1a1:b3bb:cd5b with SMTP id a16-20020a170902ecd000b001a1b3bbcd5bmr16741760plh.62.1684897995955; Tue, 23 May 2023 20:13:15 -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.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 23 May 2023 20:13:15 -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 01/10] maple_tree: Rework mtree_alloc_{range,rrange}() Date: Wed, 24 May 2023 11:12:38 +0800 Message-Id: <20230524031247.65949-2-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-Rspamd-Queue-Id: 854B6100002 X-Rspam-User: X-Stat-Signature: 7zfgeo5puox7z4yzdgahif9egf9i1gxk X-Rspamd-Server: rspam03 X-HE-Tag: 1684897997-42317 X-HE-Meta: U2FsdGVkX18YODSYTEUTlm+8gIl4fmm4CFrnlaGKz9XuRNjKA6sEqFGgisEb7dg0xfcUqXSsAyrwZ0gvOKKZxcCwjwyjfRvS0zU4o0k2gD5diaUERqWHnlmCB/thqBwouQvYEtc0SivJbPGW1s9y3WKCFRVadf8zwWTj4z5SpELFp/nQwkxfKMb02wWSvTrbFuNZNjhTzn2t4n8JERU7vCjsabVY9gGc8qyC+Gj/EJJmuPQvOxsCxREch4WpRTEChgVeAZUeUOrThHhAS799801wQGGWGHN1p/2LpX3k8nqrNQnz7nJshhRlxKOUPsTNA67wARJpVwjRU/UxLdKgXkqNtmFXMuhZOci5Sc56+tLsvfWBDB/5E6OAVrSJ0cfO3W00cnOCgKzZs4n/grGfyI/GEmPPG/Mr+1aYHpDJQ/PK1W/eo1wk8iW0GINIqdkk2YraK3ywC+izlFNBUkM312GPmswI19s61az+lFsVlvZP2DOgzGsLZFDuDv1YVDf4qOM2Spcf+ELIiX+YMZ4bjAA1W60Cjlqt5IokCnJWCxlqyYm+/YWfIS2IOhsZE/GO+I+QdouhZKfNEjgu+tD8V9pec63XPnCPobp+sm4Brm+Ek0lgg5UUBAzPR/reqoWKs3uvryCNdzOrfOJlwJnxg0pO7q8APaSQ6EavGFXaPCL16Q8ROd+ILoPye/ThPUyqwGazM/rdtE0Nock08e8FKjfsVNpUVJco8of0DCGBT/09rLpgst3FwV1F0CgIB/Ju46JglnrjcZZYGEJo9gQJHY0pqp0Y+2mtFr1r7B6Em8XaWoehyBK1jnw1HHmP/pjK31mqb3CqqWM3rWoQ8q4EHZJaeEDd7DySgwyV6BZdYs4hCJktp1wihu1jBSoBBSMQKbQiC17IiyAeN7/xMxkHCTg/aP5DSjsPRrD2GRnKZ+MTMmF/RiH4RgGkxb/qeQ37UTqXqPQnJWJjJ1rKDbr PiEtOXff iDHt7UMdUvWXYDPSbAH9QKTa6yGEH1SiaJAOvr+Da0LycwiQmFwa0RBaozN6+8TPVoim5yIIUKeSfJHUCYYOy9j6y9oJgTInASOyGz+00Rt1dm0ehOJPlYd/KIW+Oy1rinYR1+Rq/Ex0reaFy7r+zckpuPURn4h/a/uv74wKHQ9N+ogJMxfctxzsPzU6YFjr1wZDc2zq4/LZpd9qORqJq+hUcirhWiPtqEQHDhapzpTKaRzAeAv2XTqvnOHMT70iPAFduh6YE0B0Hr/NUmW/Vxqwjvax8W+RIjybr+ithsDcgx5VyCuvgj8HLSoWRI2f9/z4mSoANM3jWm7tHVJ+djMaNeETJEjMRglOynCOG+DsDyBXLkP7g4h5u3DvgYdpSyLjmymDdUEvD6NNBh8OywZl7a6UHbr/8MzIeDaV5XJdTpM7v1tCtPthwakaJIGPYjz286zIXqTf1ULS7JXT3iK57hGLzUv6bmNgK 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 Reviewed-by: Liam R. Howlett --- lib/maple_tree.c | 57 +++++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 4eb220008f72..96d102d60b4e 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -6493,31 +6493,33 @@ 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); + ret = mas_empty_area(&mas, min, max, size); + if (ret) + goto unlock; + + 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; + if (mas_is_err(&mas)) + ret = xa_err(mas.node); + else + *startp = mas.index; + +unlock: mtree_unlock(mt); return ret; } @@ -6529,28 +6531,33 @@ 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); + ret = mas_empty_area_rev(&mas, min, max, size); + if (ret) + goto unlock; + + 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; + if (mas_is_err(&mas)) + ret = xa_err(mas.node); + else + *startp = mas.index; + +unlock: mtree_unlock(mt); return ret; }