From: Peng Zhang <zhangpeng.00@bytedance.com>
To: "Liam R. Howlett" <Liam.Howlett@Oracle.com>
Cc: Peng Zhang <zhangpeng.00@bytedance.com>,
akpm@linux-foundation.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org
Subject: Re: [PATCH 06/10] maple_tree: Wrap the replace operation with an inline function.
Date: Tue, 16 May 2023 08:46:24 +0800 [thread overview]
Message-ID: <830328dd-ddb6-bdc5-2d74-35b5212cc569@bytedance.com> (raw)
In-Reply-To: <20230515170722.6eqyckjaggw5wijq@revolver>
在 2023/5/16 01:07, Liam R. Howlett 写道:
> * Peng Zhang <zhangpeng.00@bytedance.com> [230515 09:18]:
>> To make mas_wr_modify() cleaner, wrap the replace operation with an
>> inline function.
>
> mas_wr_modify() is already pretty small. Is there any reason you want
> this in its own function besides it looking cleaner?
I just want to make the four fast paths in mas_wr_modify()
look uniform without any functional effect.
>
>>
>> Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
>> ---
>> lib/maple_tree.c | 21 +++++++++++++++------
>> 1 file changed, 15 insertions(+), 6 deletions(-)
>>
>> diff --git a/lib/maple_tree.c b/lib/maple_tree.c
>> index 4c649d75a4923..ce695adc670ec 100644
>> --- a/lib/maple_tree.c
>> +++ b/lib/maple_tree.c
>> @@ -4288,6 +4288,19 @@ static inline void mas_wr_extend_null(struct ma_wr_state *wr_mas)
>> }
>> }
>>
>> +static inline bool mas_wr_replace(struct ma_wr_state *wr_mas)
>> +{
>> + struct ma_state *mas = wr_mas->mas;
>> +
>> + if (wr_mas->r_min == mas->index && wr_mas->r_max == mas->last) {
>> + rcu_assign_pointer(wr_mas->slots[mas->offset], wr_mas->entry);
>> + if (!!wr_mas->entry ^ !!wr_mas->content)
>> + mas_update_gap(mas);
>> + return true;
>> + }
>> + return false;
>> +}
>> +
>> static inline bool mas_wr_append(struct ma_wr_state *wr_mas)
>> {
>> unsigned char end = wr_mas->node_end;
>> @@ -4347,13 +4360,9 @@ static inline void mas_wr_modify(struct ma_wr_state *wr_mas)
>> unsigned char node_size;
>> struct ma_state *mas = wr_mas->mas;
>>
>> - /* Direct replacement */
>> - if (wr_mas->r_min == mas->index && wr_mas->r_max == mas->last) {
>> - rcu_assign_pointer(wr_mas->slots[mas->offset], wr_mas->entry);
>> - if (!!wr_mas->entry ^ !!wr_mas->content)
>> - mas_update_gap(mas);
>> + /* Attempt to direct replace */
>> + if (mas_wr_replace(wr_mas))
>> return;
>> - }
>>
>> /* Attempt to append */
>> node_slots = mt_slots[wr_mas->type];
>> --
>> 2.20.1
>>
next prev parent reply other threads:[~2023-05-16 0:46 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-15 13:17 [PATCH 00/10] Clean ups for maple tree Peng Zhang
2023-05-15 13:17 ` [PATCH 01/10] maple_tree: Drop the test code for mtree_alloc_{range,rrange}() Peng Zhang
2023-05-15 16:52 ` Liam R. Howlett
2023-05-15 13:17 ` [PATCH 02/10] maple_tree: Drop mtree_alloc_{range,rrange}() and related functions Peng Zhang
2023-05-15 16:52 ` Liam R. Howlett
2023-05-15 17:27 ` Matthew Wilcox
2023-05-15 17:35 ` Liam R. Howlett
2023-05-16 0:39 ` Peng Zhang
2023-05-15 13:17 ` [PATCH 03/10] maple_tree: Remove __must_hold() which does not work Peng Zhang
2023-05-15 14:55 ` Matthew Wilcox
2023-05-16 0:42 ` Peng Zhang
2023-05-15 15:00 ` Liam R. Howlett
2023-05-15 13:17 ` [PATCH 04/10] maple_tree: Simplify mas_is_span_wr() Peng Zhang
2023-05-15 16:06 ` Liam R. Howlett
2023-05-15 13:17 ` [PATCH 05/10] maple_tree: Make the code symmetrical in mas_wr_extend_null() Peng Zhang
2023-05-15 16:54 ` Liam R. Howlett
2023-05-15 13:17 ` [PATCH 06/10] maple_tree: Wrap the replace operation with an inline function Peng Zhang
2023-05-15 17:07 ` Liam R. Howlett
2023-05-16 0:46 ` Peng Zhang [this message]
2023-05-16 14:16 ` Liam R. Howlett
2023-05-16 14:22 ` Peng Zhang
2023-05-15 13:17 ` [PATCH 07/10] maple_tree: Add mas_wr_new_end() to calculate new_end accurately Peng Zhang
2023-05-15 13:17 ` [PATCH 08/10] maple_tree: Add comments and some minor cleanups to mas_wr_append() Peng Zhang
2023-05-15 17:29 ` Liam R. Howlett
2023-05-16 10:06 ` Peng Zhang
2023-05-15 13:17 ` [PATCH 09/10] maple_tree: Rework mas_wr_slot_store() to be cleaner and more efficient Peng Zhang
2023-05-15 18:01 ` Liam R. Howlett
2023-05-16 7:27 ` Peng Zhang
2023-05-16 14:17 ` Liam R. Howlett
2023-05-15 13:17 ` [PATCH 10/10] maple_tree: Simplify and clean up mas_wr_node_store() Peng Zhang
2023-05-15 18:58 ` Liam R. Howlett
2023-05-16 0:36 ` Peng Zhang
2023-05-16 10:53 ` Peng Zhang
2023-05-16 15:52 ` Liam R. Howlett
2023-05-16 23:53 ` Peng Zhang
2023-05-17 3:10 ` Peng Zhang
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=830328dd-ddb6-bdc5-2d74-35b5212cc569@bytedance.com \
--to=zhangpeng.00@bytedance.com \
--cc=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 \
/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;
as well as URLs for NNTP newsgroup(s).