All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peng Zhang <zhangpeng.00@bytedance.com>
To: Liam.Howlett@oracle.com
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	maple-tree@lists.infradead.org,
	Peng Zhang <zhangpeng.00@bytedance.com>
Subject: [PATCH 1/4] maple_tree: Fix get wrong data_end in mtree_lookup_walk()
Date: Fri, 10 Mar 2023 22:08:44 +0800	[thread overview]
Message-ID: <20230310140848.94485-2-zhangpeng.00@bytedance.com> (raw)
In-Reply-To: <20230310140848.94485-1-zhangpeng.00@bytedance.com>

if (likely(offset > end))
	max = pivots[offset];

The above code should be changed to if (likely(offset < end)), which is
correct. This affects the correctness of ma_data_end(). Now it seems
that the final result will not be wrong, but it is best to change it.
This patch does not change the code as above, because it simplifies the
code by the way.

Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
---
 lib/maple_tree.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 646297cae5d1..b3164266cfde 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -3875,18 +3875,13 @@ static inline void *mtree_lookup_walk(struct ma_state *mas)
 		end = ma_data_end(node, type, pivots, max);
 		if (unlikely(ma_dead_node(node)))
 			goto dead_node;
-
-		if (pivots[offset] >= mas->index)
-			goto next;
-
 		do {
-			offset++;
-		} while ((offset < end) && (pivots[offset] < mas->index));
-
-		if (likely(offset > end))
-			max = pivots[offset];
+			if (pivots[offset] >= mas->index) {
+				max = pivots[offset];
+				break;
+			}
+		} while (++offset < end);
 
-next:
 		slots = ma_slots(node, type);
 		next = mt_slot(mas->tree, slots, offset);
 		if (unlikely(ma_dead_node(node)))
-- 
2.20.1


  reply	other threads:[~2023-03-10 14:11 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-10 14:08 [PATCH 0/4] Some fixes and cleanup for maple tree Peng Zhang
2023-03-10 14:08 ` Peng Zhang [this message]
2023-03-10 17:58   ` [PATCH 1/4] maple_tree: Fix get wrong data_end in mtree_lookup_walk() Liam R. Howlett
2023-03-10 18:53     ` Peng Zhang
2023-03-10 19:28       ` Liam R. Howlett
2023-03-10 14:08 ` [PATCH 2/4] maple_tree: Simplify mas_wr_node_walk() Peng Zhang
2023-03-10 19:20   ` Liam R. Howlett
2023-03-13 14:07     ` Peng Zhang
2023-03-10 14:08 ` [PATCH 3/4] maple_tree: Fix a potential concurrency bug in RCU mode Peng Zhang
2023-03-10 18:27   ` Liam R. Howlett
2023-03-10 19:03     ` Peng Zhang
2023-03-10 19:29       ` Liam R. Howlett
2023-03-10 14:08 ` [PATCH 4/4] maple_tree: Simplify the code of mas_mab_cp() Peng Zhang
2023-03-10 18:45   ` Liam R. Howlett
2023-03-10 17:54 ` [PATCH 0/4] Some fixes and cleanup for maple tree 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=20230310140848.94485-2-zhangpeng.00@bytedance.com \
    --to=zhangpeng.00@bytedance.com \
    --cc=Liam.Howlett@oracle.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.