From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>
To: Peng Zhang <zhangpeng.00@bytedance.com>
Cc: akpm@linux-foundation.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org
Subject: Re: [PATCH v3 01/10] maple_tree: Rework mtree_alloc_{range,rrange}()
Date: Tue, 23 May 2023 13:52:47 -0400 [thread overview]
Message-ID: <20230523175247.7pbduzhlsc23vuo6@revolver> (raw)
In-Reply-To: <20230522050656.96215-2-zhangpeng.00@bytedance.com>
* Peng Zhang <zhangpeng.00@bytedance.com> [230522 01:07]:
> Use mas_empty_area{_rev}() to refactor mtree_alloc_{range,rrange}()
A bit of a short change log, but looks good.
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
>
> Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
> ---
> 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;
> }
> --
> 2.20.1
>
>
> --
> maple-tree mailing list
> maple-tree@lists.infradead.org
> https://lists.infradead.org/mailman/listinfo/maple-tree
next prev parent reply other threads:[~2023-05-23 17:53 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-22 5:06 [PATCH v3 00/10] Clean ups for maple tree Peng Zhang
2023-05-22 5:06 ` [PATCH v3 01/10] maple_tree: Rework mtree_alloc_{range,rrange}() Peng Zhang
2023-05-23 17:52 ` Liam R. Howlett [this message]
2023-05-22 5:06 ` [PATCH v3 02/10] maple_tree: Drop mas_{rev_}alloc() and mas_fill_gap() Peng Zhang
2023-05-23 17:53 ` Liam R. Howlett
2023-05-22 5:06 ` [PATCH v3 03/10] maple_tree: Fix the arguments to __must_hold() Peng Zhang
2023-05-23 17:54 ` Liam R. Howlett
2023-05-22 5:06 ` [PATCH v3 04/10] maple_tree: Simplify mas_is_span_wr() Peng Zhang
2023-05-23 17:53 ` Liam R. Howlett
2023-05-22 5:06 ` [PATCH v3 05/10] maple_tree: Make the code symmetrical in mas_wr_extend_null() Peng Zhang
2023-05-22 5:06 ` [PATCH v3 06/10] maple_tree: Add mas_wr_new_end() to calculate new_end accurately Peng Zhang
2023-05-23 17:54 ` Liam R. Howlett
2023-05-22 5:06 ` [PATCH v3 07/10] maple_tree: Add comments and some minor cleanups to mas_wr_append() Peng Zhang
2023-05-23 17:55 ` Liam R. Howlett
2023-05-22 5:06 ` [PATCH v3 08/10] maple_tree: Rework mas_wr_slot_store() to be cleaner and more efficient Peng Zhang
2023-05-23 17:59 ` Liam R. Howlett
2023-05-22 5:06 ` [PATCH v3 09/10] maple_tree: Simplify and clean up mas_wr_node_store() Peng Zhang
2023-05-23 18:00 ` Liam R. Howlett
2023-05-22 5:06 ` [PATCH v3 10/10] maple_tree: Relocate the declaration of mas_empty_area_rev() Peng Zhang
2023-05-23 17:59 ` Liam R. Howlett
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230523175247.7pbduzhlsc23vuo6@revolver \
--to=liam.howlett@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=maple-tree@lists.infradead.org \
--cc=zhangpeng.00@bytedance.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox