From mboxrd@z Thu Jan 1 00:00:00 1970 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 530CAC77B7C for ; Tue, 9 May 2023 12:39:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 77480280001; Tue, 9 May 2023 08:39:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7241C6B0082; Tue, 9 May 2023 08:39:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5EC32280001; Tue, 9 May 2023 08:39:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4CB976B0080 for ; Tue, 9 May 2023 08:39:27 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 1C48212024D for ; Tue, 9 May 2023 12:39:27 +0000 (UTC) X-FDA: 80770672374.14.6C231D2 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf26.hostedemail.com (Postfix) with ESMTP id BFEDD14000A for ; Tue, 9 May 2023 12:39:23 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=HLCxQEs3; spf=pass (imf26.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.174 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=1683635964; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=dSg39pJOZ91SeEigcRuN6jVIeNHw1ilok4weiuhyDQ4=; b=snQ5BMT1QiM70oITwZo5WeQVN8viHqON0bpHmLygrgoe/4Q/h5Jh3ZJgnGEgzvwPMfjIIv 6+gvC02oCUCNADI2RdbbwUXp+UZHtL4qE7rkYEWf8wPj6/iKEKx6x6YEJMKxWscJxOxGVd sbzgTUNfa7ru1pDYyatBJpHAR/r4iuA= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=HLCxQEs3; spf=pass (imf26.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1683635964; a=rsa-sha256; cv=none; b=FLRAW7hrp4zOF8AulOOFtQqQyhgJv0Lve+/5fdxriUVEhB3ebuxeUhnsTq8hc3Oo7nGVJY Bd4PKmPgvbTzdvL9DhPu6+q+qeMK8Sudih/65PbxtazN8ARqMJTSoC4HMSKdgH6hVZfDI2 kZ5i+mpVh53jzz/9tJNKfWruMSpTiZ8= Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1aaec9ad820so54715055ad.0 for ; Tue, 09 May 2023 05:39:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1683635962; x=1686227962; h=content-transfer-encoding:in-reply-to:from:references:cc:to:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=dSg39pJOZ91SeEigcRuN6jVIeNHw1ilok4weiuhyDQ4=; b=HLCxQEs3+pODJpg0ga0dpy157prnJ6SfufjjhrAGeFxNZ2lQmMmJHf22cbESLnIxTe VTD0mas+tFLOMshP8pygrGqkgm6XMwNpwbVICxepqmppdJGISDrm88qP3X1Co/RLI2D8 70tZ7PRVAhqYwK5EPRkUasxy2TdtMXQMszd0EPHydscoL2S+hQDjyL1/MYVxE4XOzgxy BjflFVADvJ9Qdn9TH0hozxHZNynY9MlvJh/nzPGpD4nORG+bO922tbzPVkN/2eXBubMT Sdny4NDVe/qRNdnm5l2EZ91vfzicxFQT41wrJOqiPRo9DWnErCK9Uclr4jAIMYhKVgc0 2PqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683635962; x=1686227962; h=content-transfer-encoding:in-reply-to:from:references:cc:to:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=dSg39pJOZ91SeEigcRuN6jVIeNHw1ilok4weiuhyDQ4=; b=RcW7bBLkN105FPSuXWRzyNlWImGCa25UdiBMPvaGHpKmMweDHytnh66dEbVY4okmWC Efg/z2Be4K4fwpLWktf5W4WpjddZuVBLECIowgbSY8cFijOGePkw8a2dy14YHlKh6QaH +wuqgfihaQ17NsuD04UWoi14Vgniy8FzUkopvnRS2mznHnRUgGwo1YiAA4a3Fd9ZZmRa Fu/lEP/FjetAJ5FyY7l+4nvd190dDjNdLkbkO0hrSFh07StJd0Jqo3I8uBA4nGhzXeiL I6J2MnyljGt5S8WXA0CIUfjTCKpz3tJYgWIPnbH/fPkBhaGRB1wN9maXC8g33Tgotrgy w/OA== X-Gm-Message-State: AC+VfDzgOEQoRmX/Ya6Ovs288iZx1I4CFt+hDQkSALBs9TyXRb/ujFR/ wjPXyyNaaT2eAUlga8CN8ImzVA== X-Google-Smtp-Source: ACHHUZ7PDkAiktdvBVywP+icr+5g3Sv2XARVqAaJlQ/pQP33I6gzKrGH9bpQoAULAbwFcpsYw6KmoA== X-Received: by 2002:a17:903:244c:b0:1ab:19ff:3a20 with SMTP id l12-20020a170903244c00b001ab19ff3a20mr16795752pls.54.1683635962003; Tue, 09 May 2023 05:39:22 -0700 (PDT) Received: from [10.200.10.82] ([139.177.225.232]) by smtp.gmail.com with ESMTPSA id n6-20020a1709026a8600b001aad2910194sm1468042plk.14.2023.05.09.05.39.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 09 May 2023 05:39:21 -0700 (PDT) Message-ID: <5ca5da7f-1b17-b22b-58c4-eae41443e334@bytedance.com> Date: Tue, 9 May 2023 20:39:16 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Subject: Re: [PATCH v2 32/36] maple_tree: Clear up index and last setting in single entry tree To: "Liam R. Howlett" Cc: maple-tree@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton References: <20230505174204.2665599-1-Liam.Howlett@oracle.com> <20230505174204.2665599-33-Liam.Howlett@oracle.com> From: Peng Zhang In-Reply-To: <20230505174204.2665599-33-Liam.Howlett@oracle.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Stat-Signature: f5spknquunpjokx7w57omjqqe85tne7j X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: BFEDD14000A X-Rspam-User: X-HE-Tag: 1683635963-595692 X-HE-Meta: U2FsdGVkX1841AI5LMdWZTImINQtVmCapicWLjkbTSJYQP10B2JFhruEE/3VrOStklh1/DHcwC1COoYqGe/2Y4IaJM5eh5yTydwdMTEFMxmd3SODYLukY99MOP7t/iCZN6/1eu1Zwvn5ImZnAxvLoAArhxthV0VTVPisAuLAEnnhFpDUVNUbp82mT6AtR5TrJU8RYfYQyVnUi77U0fnA12sNJ+P0T0qp0oZ6neqXhuztjewQUN7OB52KpX8yW37ikKjPcHPxx6Pg6V7kCJCOOwcfJfyU+uMegWZor32PJxwK0RYno+FtZGDm/EQSPZupEgThbDHlvbvyyyyfwW+7lSZb6LdPMWlwU5Wugow9Q10QidNzUbYSKZXcqVGDSWOc1ulhFUASRqLuC/x6mGcXYp72XO8Hwo9ZXkhfHgvQARJUP7GjxZI3vQes5YAepmHkwVrZG9TL2bISAU16ycfG/Ytgr0Q+KTKKZ1mfiXHZezI0zRjqXSw2E7dHdOrHyrIViLxQVLZXyDiJiFLlpZ/XTnFhBVx5NnnapVkrlPRxtWZsnIgucpYUH9dXTLjFktkjM/fN3ysjRajOYIsYbclUW07VK0UVnwwrvyeWA+JgaQJ34cE+nGc6ZWHAfvhVDv77V7gjhWjcPmkAlCAuTCsIBAfqVG+ypecBz5PET5taZDrXBdqkHhzu5ezk3MRheKrR1zvqJ/2zjiT7mNU3HwAGwbhVfOPZhDdANx0nV+IH+RtRuqw38wELUNsaIEaY4krGvboJsM2MIF2K6UbrroU3Xp1FnPgRc4+WDX0B7fQX74kcwsB79scd8BO7yuKlnXTpjOCYXU08NkJjPaueIW2pNBWOW+N3avU6uqXD5TqlK/gTfRfSvww/Giy+YdUFMyDPN2mcXgQAafMqdPl0gvWJ8uYR/cWEi81KhKFn+jWxS9ShaU+TwzYP0JjX1pbxo7L7hV4Ls47y9dJc5W30Di9 fV1SSa/1 QVecsqpSAtLJSvA+9542QVOFvRwC2EOGQXtxNu7LcLIN6xCh79TRjx+PQTMJO4z0VKSU0qwMg4ASePcLYRdw0Pjf9BQRjNx4jKpTULo4tXkBzqQXzyHovVTgxy9nZEfYzm743fMUOM4E4cXn68RsCH74x2DjVLN9j/kwA0Xo36egQRnZRRQVoidhR8VmaYcANrQS3IaH3v/QLFRTMx+d0p3vq2/wCNhmpZOTNe6RewdJ52zTk8yyyWWFfqU6UDoE5xNsjc2qVSY9sfXNccvfgdkfYBuG6pdl3HZjot4zzT/BG/XQskRAxsgL1vRYMLMhtwqmXmw3l7vUBnHFQrigIGJiTpqZSp7oYdcnbLhshW0GRhiPcDbuDykMehiBuX86gPw+naGIJ1xBp1j6bOhq6gDLLcbExCG0yJvkDaqy2rOY02ZM4MANz6/vk6g== 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: 在 2023/5/6 01:42, Liam R. Howlett 写道: > When there is a single entry tree (range of 0-0 pointing to an entry), > then ensure the limit is either 0-0 or 1-oo, depending on where the user > walks. Ensure the correct node setting as well; either MAS_ROOT or > MAS_NONE. > > Signed-off-by: Liam R. Howlett > --- > lib/maple_tree.c | 21 +++++++++++---------- > 1 file changed, 11 insertions(+), 10 deletions(-) > > diff --git a/lib/maple_tree.c b/lib/maple_tree.c > index f060c71965c0d..914399519cf54 100644 > --- a/lib/maple_tree.c > +++ b/lib/maple_tree.c > @@ -5022,24 +5022,25 @@ void *mas_walk(struct ma_state *mas) > { > void *entry; > > + if (mas_is_none(mas) || mas_is_paused(mas)) if (mas_is_none(mas) || mas_is_paused(mas) || mas_is_ptr(mas)) > + mas->node = MAS_START; Hi, Liam There is an issue that it cannot pass the user space test program with this patchset. I tested it based on 47cba14ce6fc4(linux-next/master). The reason is that mas_walk() does not handle the state that mas is root. The root cause is that mas_start() only handles the start state, and returns NULL for the root state. When encountering the root state, we can reset to start so that it is handled in mas_start(). log: BUG at check_state_handling:3076 (1) maple_tree(0x55d6a9838ca0) flags 1, height 0 root 0x1234500 0: 0x1234500 Pass: 453406336 Run:453406337 maple: ../../../lib/test_maple_tree.c:3076: check_state_handling: Assertion `0' failed. Aborted (core dumped) > retry: > entry = mas_state_walk(mas); > - if (mas_is_start(mas)) > + if (mas_is_start(mas)) { > goto retry; > - > - if (mas_is_ptr(mas)) { > + } else if (mas_is_none(mas)) { > + mas->index = 0; > + mas->last = ULONG_MAX; > + } else if (mas_is_ptr(mas)) { > if (!mas->index) { > mas->last = 0; > - } else { > - mas->index = 1; > - mas->last = ULONG_MAX; > + return entry; > } > - return entry; > - } > > - if (mas_is_none(mas)) { > - mas->index = 0; > + mas->index = 1; > mas->last = ULONG_MAX; > + mas->node = MAS_NONE; > + return NULL; > } > > return entry;