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 78A6AE7717F for ; Tue, 17 Dec 2024 11:27:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D051D6B00A0; Tue, 17 Dec 2024 06:27:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CB4136B00A2; Tue, 17 Dec 2024 06:27:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B54686B00A3; Tue, 17 Dec 2024 06:27:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 94DE76B00A0 for ; Tue, 17 Dec 2024 06:27:21 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 16B5742C9D for ; Tue, 17 Dec 2024 11:27:21 +0000 (UTC) X-FDA: 82904224074.21.7ACBB56 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf17.hostedemail.com (Postfix) with ESMTP id 673F840002 for ; Tue, 17 Dec 2024 11:26:52 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf17.hostedemail.com: domain of yangerkun@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=yangerkun@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734434810; a=rsa-sha256; cv=none; b=seDZX0RedPz/P+8+13UpLQdrkC2U2DlCL+t2Pa6N0K6pruN8PBf35AL0acueJh1UbVlFdC qGfRVmzUwigaYgt4+HpRq+f6AfuaUHB/bEB18eQkIYVsc8Dvx2cN8wCPvDm+LciEOfhwCV Wz8TdSnzRhsyin1Un1nHfY9klKtZb8U= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf17.hostedemail.com: domain of yangerkun@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=yangerkun@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1734434810; 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; bh=G/VZLS9YLm0RdfFHtgkgxBcjMN83b3qgmva4SM5fCr4=; b=2wDmQeVk+QpwcyY0GDtL5qx2do563f16YZLs6r1cHQZoOgjB1D0fm/Vixf39MOZEXKjdZb YuYrRIt2yW/Ln9qUJ6F/U8GAbQAXYFCa5uz/vCxVu8fvV160TBXEhQBcXWAs1ux53dka0r x+qPO82zGJD83Gwi/sttm2/pDyX+vLY= Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4YCDzh1Xj3z4f3jjx for ; Tue, 17 Dec 2024 19:26:56 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.128]) by mail.maildlp.com (Postfix) with ESMTP id 9F43A1A018C for ; Tue, 17 Dec 2024 19:27:10 +0800 (CST) Received: from [10.174.177.210] (unknown [10.174.177.210]) by APP4 (Coremail) with SMTP id gCh0CgAXP4MLYGFnpi5sEw--.55710S3; Tue, 17 Dec 2024 19:27:08 +0800 (CST) Message-ID: <30e13c1c-5dd7-da94-9d2a-6277ade3e9e4@huaweicloud.com> Date: Tue, 17 Dec 2024 19:27:07 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 Subject: Re: [PATCH 1/2] maple_tree: Fix mas_alloc_cyclic() second search To: "Liam R. Howlett" , Andrew Morton Cc: maple-tree@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, chuck.lever@oracle.com, brauner@kernel.org References: <20241216190113.1226145-1-Liam.Howlett@oracle.com> <20241216190113.1226145-2-Liam.Howlett@oracle.com> From: yangerkun In-Reply-To: <20241216190113.1226145-2-Liam.Howlett@oracle.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-CM-TRANSID:gCh0CgAXP4MLYGFnpi5sEw--.55710S3 X-Coremail-Antispam: 1UD129KBjvJXoW7KrWkWF4xWr4rKFy5Cr18Grg_yoW8Gw45pa 1DWa1UKrZ7Jr48Kw1kWrWUXas2qrnYgr1xWayDJw1rZry5JFySgr15CFWfuF47Z3srA3Wa yF4av3W0ka4DZFDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkEb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4 vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7Cj xVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I 0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40E x7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x 0Yz7v_Jr0_Gr1lF7xvr2IY64vIr41lc7I2V7IY0VAS07AlzVAYIcxG8wCY1x0262kKe7AK xVWUAVWUtwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F4 0E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1l IxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxV AFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j 6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07UK2N tUUUUU= X-CM-SenderInfo: 51dqwvhunx0q5kxd4v5lfo033gof0z/ X-Stat-Signature: cd1zwdoi4a5eek6zuox5hp7cqhnhjouf X-Rspam-User: X-Rspamd-Queue-Id: 673F840002 X-Rspamd-Server: rspam08 X-HE-Tag: 1734434812-45998 X-HE-Meta: U2FsdGVkX18jPT+Ve470G4CBexpN3tTZoLiQ7yMLhxWoa+enV8tWbKopLehej97eGwFwxclD9rSbNX2Z+hLFMRfJf8Hvy41Q9p2RxrE10dvgGyZPOVcbmf6ikDILHg27B8vJVKMrrGbNvja9c4SKkE8z6DXITSvcVSs/GxT8Yuts1c/XfH9d/8rmyyWxKPvtj7+NTM5NRABELEmpqUFiOd6Ppr/tQ2q9347IZsgtOCztGBarAnBsKMSpalVKXG2bEfKi6dRvcl3iFCqOhClEsSJmPhs4L0dFV1T7dniIe8hGWK61pYSolJZzaB4MHkTCswgln83dCs1oAmhc8jYR6atbd/Zam+Tbgu4RWSLvSHLvLqI/jj9hi/3CF35Bs+F5mH+rSPwcdv93lebjBuaItZNozeRpUm/viBMQ7w5G3rmldb6nEaDkMT9kq34H/lnHszq47nrFCg61rJshApMh0789ZExvZzKrKteRvF+x4/39dRq65A5fnTalj3wJ9ZuVAXgGeZI0vo78+2eZOKVoWYmgAqA2ugapXByfjIl8OAT8S3C719lWMa4Lcs6jvUAePw7fcvc7yOsvylbW2ff46suw831wyOqVdqzPocdJXtj2Pi6WQrwpSzOZ5lAk3DXEZf9bfzzDCcN1mzWNa6W3W5iZ8tzQHAZE/V1NtUxxk7qHPPCVcmh5xzDzGAMOazTW7PpHs+PNK65meS8JLwXHEoqpz529oYYBASzuWB3JsaRJjExkcN154kH1VYBKz62x/buYJLFE72+nO69u5kh9i5NLeWW7uSiHf2sk012MiT6pkb/Slm3Rh1uQMeOxUILsHQyhGuIwAEDSuhZVtx07B90JWr4kKbJWQ2nYlux9Sr5gduIhA3v2AnMgjFrA9rNAxWpLpEBReFdeZFAwBmETwXOe/dXSFPVzS2w15yot985bK2w4lysbn88t10d38dg+ihBnKmgohgrR/DB3JpC Pj7zEZ5u b+n3l3qfj7aguuHI9Eo8HmT9tJ6wQ92flZOa7BY7ntPfsTT6SJDUiUuj4BJ6fQkEnaN1E5KqWGrs5SXDnRUDHsiRMIlPmWGMhT75G5tCTf5d+w23voQlv5mqR6ZXuLGDwRXiKqZf6DTrwwhY4ynn1hONnEBrm6tcXanoIki7ezaeLFWKDqPhayKoZDzlze1TiEWIGhqyy1jITTwl4WJ4O0la486eRbdu2SiENcM3vz2zdLu7beqmmlaPGFqjBZRuMI5i0qDQB2G0MdpjITqNsfdwrgrrFLsMnEC7z 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: List-Subscribe: List-Unsubscribe: 在 2024/12/17 3:01, Liam R. Howlett 写道: > From: "Liam R. Howlett" > > The first search may leave the maple state in an error state. Reset the > maple state before the second search so that the search has a chance of > executing correctly after an exhausted first search. > > Link: https://lore.kernel.org/all/20241216060600.287B4C4CED0@smtp.kernel.org/ > Fixes: 9b6713cc7522 ("maple_tree: Add mtree_alloc_cyclic()") > Cc: Yang Erkun > Cc: chuck.lever@oracle.com > Cc: brauner@kernel.org > Signed-off-by: Liam R. Howlett > --- > lib/maple_tree.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) This looks more clear! Reviewed-by: Yang Erkun > > diff --git a/lib/maple_tree.c b/lib/maple_tree.c > index 940d30653407b..f7153ade1be5f 100644 > --- a/lib/maple_tree.c > +++ b/lib/maple_tree.c > @@ -4335,7 +4335,6 @@ int mas_alloc_cyclic(struct ma_state *mas, unsigned long *startp, > { > unsigned long min = range_lo; > int ret = 0; > - struct ma_state m = *mas; > > range_lo = max(min, *next); > ret = mas_empty_area(mas, range_lo, range_hi, 1); > @@ -4344,7 +4343,7 @@ int mas_alloc_cyclic(struct ma_state *mas, unsigned long *startp, > ret = 1; > } > if (ret < 0 && range_lo > min) { > - *mas = m; > + mas_reset(mas); > ret = mas_empty_area(mas, min, range_hi, 1); > if (ret == 0) > ret = 1;