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 76173C77B6E for ; Wed, 12 Apr 2023 08:13:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EE689280007; Wed, 12 Apr 2023 04:13:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E6EE1280003; Wed, 12 Apr 2023 04:13:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D36ED280007; Wed, 12 Apr 2023 04:13:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C0043280003 for ; Wed, 12 Apr 2023 04:13:40 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A149D1C4AD0 for ; Wed, 12 Apr 2023 08:13:40 +0000 (UTC) X-FDA: 80672025000.28.E3426D5 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf30.hostedemail.com (Postfix) with ESMTP id DD7D080004 for ; Wed, 12 Apr 2023 08:13:38 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=x1gexN4X; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf30.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681287219; 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:dkim-signature; bh=3PaTrXWZBIuP+OTiDH7nWXbV8CU0g/MfWC6veLedMa8=; b=VeF19V/2BFVY9QjEw9vX3u+rU+Ve6PRtNRhE9J3YAwtePFrBFlS5lJnsteNidoLvBVwH4v E6ce74QOGXy89kkeQxMAJqwbuTzY5GvRBs/60lUH9gg7TLUzoMcLFXR3TYk6JIqECOtKeN Dud6IIyR1TVV6Nz7Nk96VwromzDiXsU= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=x1gexN4X; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf30.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681287219; a=rsa-sha256; cv=none; b=S3wPDZqKDW60KCD5V2BEjoGMz4SZqnhFN1jSxekXJvbZ7/2tNSc/MO68pu/pLIaiY/4wQj a7ML1IJlwU+5gn0gxBnUC/qW2Hzxd78/bosvIk6yYgYKATwKCzRNRs946iamNdKTkuXyBP yQ+FSmuYU14C/6ujnJYXZyy8/BbGxLI= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2C9A862F4B; Wed, 12 Apr 2023 08:13:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44078C433EF; Wed, 12 Apr 2023 08:13:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1681287217; bh=ajSqHiPRXzU2ierWv984OOwLyjJGUXjZhD6zLSc9lYI=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=x1gexN4X9zO6OoPAIu7w+iqZmSDsHS1weG4AuoXYRaHbm1jcFPXebmvhO483E3pU1 6k4SFaTbqej9YtMlbcoRhBxi9uuPv+dpoptIRwSUt5r5BDz7CknBtk11MBLSSr6hjT VPhuWijl04vZZjYQT0OsulpEjZGK9+zoG9XvieBg= Subject: Patch "maple_tree: fix mas_prev() and mas_find() state handling" has been added to the 6.1-stable tree To: Liam.Howlett@Oracle.com,Liam.Howlett@oracle.com,gregkh@linuxfoundation.org,linux-mm@kvack.org,maple-tree@lists.infradead.org,syzbot+502859d610c661e56545@syzkaller.appspotmail.com Cc: From: Date: Wed, 12 Apr 2023 10:13:24 +0200 In-Reply-To: <20230411151055.2910579-6-Liam.Howlett@oracle.com> Message-ID: <2023041223-resisting-astound-faaf@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: DD7D080004 X-Stat-Signature: xwdxtxt71ikwscdc7querhkk94gh5dqx X-HE-Tag: 1681287218-598612 X-HE-Meta: U2FsdGVkX1+5XZ0Rr42RdbVBIUwjrC2TiuGd5uQO3VaEyW1FThTIztfSUMc/KQHAFzElW9BQfXNYYf8VaMCyOg/8bCeRZdybqUizX96yxWQNIgWX1zrd7OSfvlWtlzzutoCVGMRZebQQH9BoBspgEnD+fazZ75LN+KgszePBSZ4b7NeMAtc4fLy82c1It/FsV92Zrvwfdbo8ZOLmEqHtd5UTKp6/69UpMQBWBFXF3T3I5gi21tbRalafT1uprmkeoprZEwm6+zq0m84aKWuwOXLprZdff3lcp9vqmoD3k2kN2dqHhhC5aVyeHnsiR5pPw6zjimwi62MZsj63b7y7gg9q2D1UUhAClfNveFbr13RLlSY3DghbKZ+3Zwsr6fuav8e0Az81dPtvavR9y3/yPr94IB7x8407mBXRXCDXqA1k6GP7G9H54Fw+tktVEEgyyginzeCv11w5kPdXbVgsEFWYK8zNg5GDNqOKsUJkpFIZOE+4DGtm+pH+luajb2hNHYoR0lXOGStO8/tMW6MteRXC1QfDvaGnkJl6GgLYqemLfnE9Ukox3SK9nZb5iMDtPV9XDa2xIL3sLETWtyyJHp2/USNs/pv7MdmydraKJKB6oMmaikRVhFA6dnxdRtUtSWj0C+MF926nv6Sl8/xKrU4JwMjagMimXK3zrTvnKa1s/QFT6esflZ1tBN1upZzjRNimajLYbulNF+p5Mjez3zEZbGAunZYJn9O+gNZL3kTtG67ABG0EachQGYVvfT2QJD9p3fhQ0c84ythNIYRWYr6shkEhBSZ9WcmURfzG6QCL/gZRV+4F0vC5cNl+sy/kMzXtjKhGWB3FWu2+IQ4wAATWEJVN4prTF41EddLWxTbg/FvHWGqZjmluAHlOA9cbmmgXg85NOI9NWyzGtCLGb05Zl0A7D3nR6lWMV68Fv9MczIqpFRrueFLogViFK0aXVoBqQlU20eByeMEhOkG L4KwrhGZ BbkJ2Aq3/Efe96aSbvDIj0KL3BBBrj1hZOKwzWl1tE+/ppCNxNI4+JxZZDfpsWEmxs4c5lqPOqRFXrzbN5+gaeu8TiEdsdZbMTzBuEk34ry6f0N67GaeG2V/adKMYgUXw0UCm8d6XXLgZcVRK7my9mtLzXRt3ROarzZB27cuPVQe5DzM43hlKnHFJxQlBx/NfYXbDm8YZTffZwtSENRZFBo9NZzbXt1mydfKhkYi1hof2YBjWNsV+G03vEXJoIRGmGkOUG8opj+b8AeYKOBKtJTpX2esXQMeePW+Q8lOi02zzP/5dB1c4WN2doalMPdbTjGrC5vqIo2KtuujW6KZfNNrb2NlbW4DUe6q13eJq7e4Zw64czaS8MFifCjBTuVKcb8XsleuTDCn0QXD/BSqywPYBEfbW7MnMaC//hOcmJ2TwitSo+tenQiGQPtD9xOCfY53KgFstUzJSbljufX97/jL9oyX0XMwg40uk46poxfzPCbegjktQSECa3QDNmCL47i9TfikZttMswEf+4RftkjK3YIph8XwAZfvzqjs32ofbpu+9L27MxIfyQIikohpJ/HaU2lyhtc/IAL57+sAoG/SlNPT9gK62iELDxHxPbIP3oor79zCJFjnO/5M3aeZ8AF/MPDz6dP/G7f+80NQ0bLsDEATkxr2AacKhU7Pue/r5nrnteBywRKG4ERVJWrEhw0cc4SOYqxpO4qu0+J0/m7aXm1M5AI7Arp2M6h5QeD36tS1l8tuFrQaDd9oTQ4PlxQB9fWfanGdByIr4NCeORqZKHQ== 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: This is a note to let you know that I've just added the patch titled maple_tree: fix mas_prev() and mas_find() state handling to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: maple_tree-fix-mas_prev-and-mas_find-state-handling.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From stable-owner@vger.kernel.org Tue Apr 11 17:13:01 2023 From: "Liam R. Howlett" Date: Tue, 11 Apr 2023 11:10:46 -0400 Subject: maple_tree: fix mas_prev() and mas_find() state handling To: Greg Kroah-Hartman , stable@vger.kernel.org Cc: maple-tree@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Liam R. Howlett" , Stable@vger.kernel.org, "Liam R . Howlett" , syzbot+502859d610c661e56545@syzkaller.appspotmail.com Message-ID: <20230411151055.2910579-6-Liam.Howlett@oracle.com> From: "Liam R. Howlett" commit 17dc622c7b0f94e49bed030726df4db12ecaa6b5 upstream. When mas_prev() does not find anything, set the state to MAS_NONE. Handle the MAS_NONE in mas_find() like a MAS_START. Link: https://lkml.kernel.org/r/20230120162650.984577-7-Liam.Howlett@oracle.com Cc: Fixes: 54a611b60590 ("Maple Tree: add new data structure") Signed-off-by: Liam R. Howlett Reported-by: Signed-off-by: Greg Kroah-Hartman --- lib/maple_tree.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4844,7 +4844,7 @@ static inline void *mas_prev_entry(struc if (mas->index < min) { mas->index = mas->last = min; - mas_pause(mas); + mas->node = MAS_NONE; return NULL; } retry: @@ -5906,6 +5906,7 @@ void *mas_prev(struct ma_state *mas, uns if (!mas->index) { /* Nothing comes before 0 */ mas->last = 0; + mas->node = MAS_NONE; return NULL; } @@ -5996,6 +5997,9 @@ void *mas_find(struct ma_state *mas, uns mas->index = ++mas->last; } + if (unlikely(mas_is_none(mas))) + mas->node = MAS_START; + if (unlikely(mas_is_start(mas))) { /* First run or continue */ void *entry; Patches currently in stable-queue which might be from stable-owner@vger.kernel.org are queue-6.1/maple_tree-fix-potential-rcu-issue.patch queue-6.1/maple_tree-add-smp_rmb-to-dead-node-detection.patch queue-6.1/maple_tree-add-rcu-lock-checking-to-rcu-callback-functions.patch queue-6.1/maple_tree-fix-handle-of-invalidated-state-in-mas_wr_store_setup.patch queue-6.1/maple_tree-reduce-user-error-potential.patch queue-6.1/maple_tree-fix-mas_prev-and-mas_find-state-handling.patch queue-6.1/maple_tree-remove-gfp_zero-from-kmem_cache_alloc-and-kmem_cache_alloc_bulk.patch queue-6.1/maple_tree-be-more-cautious-about-dead-nodes.patch queue-6.1/mm-enable-maple-tree-rcu-mode-by-default.patch queue-6.1/maple_tree-detect-dead-nodes-in-mas_start.patch queue-6.1/maple_tree-fix-freeing-of-nodes-in-rcu-mode.patch queue-6.1/maple_tree-remove-extra-smp_wmb-from-mas_dead_leaves.patch queue-6.1/maple_tree-refine-ma_state-init-from-mas_start.patch