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 929ADC7619A for ; Wed, 12 Apr 2023 08:12:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2D7CF6B0074; Wed, 12 Apr 2023 04:12:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 26121280002; Wed, 12 Apr 2023 04:12:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 101DA6B0078; Wed, 12 Apr 2023 04:12:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 0065C6B0074 for ; Wed, 12 Apr 2023 04:12:37 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id CF1B8140F52 for ; Wed, 12 Apr 2023 08:12:37 +0000 (UTC) X-FDA: 80672022354.21.B7B67E4 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf28.hostedemail.com (Postfix) with ESMTP id 19B36C000E for ; Wed, 12 Apr 2023 08:12:35 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=bguwWrbP; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf28.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=1681287156; 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=IZFdP96aDZ6ajPXAdBiON0Qbmy5lygpzUMx1oniJhhk=; b=0OBTdghqylSiWP2Evqu5stWQ2zn+F26885S33RkqGcA22sPlnmgvDMueSV+MNDfl6/dQ12 W8pib1S4O4tFjAuu5VCEUwkt/3qy8mESp4WzT2BPRXIFyv0vIhRVxdsS8k0lcsReZfzGvP D6uil/fB8mgtu6Y2yC7aPjoR5a8ZA3M= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=bguwWrbP; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf28.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=1681287156; a=rsa-sha256; cv=none; b=oU6xVKPH+mxmz7Ecx+pfvA9OAHxxrbkwl6BUEUxyZpNf9k4ma28ZGRl3BDqcGiqZxv00kx 4Lwn6iNDX4Fb9X4G6VuNUjYV3b/Sz4EL4wHuoLUKupA7hcWVVwcmQJ5wYRpIWVAU5UmR65 j6/aMaGGBMIbQfMI92oBtaqjndU4iNA= 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 4CD4F6299B; Wed, 12 Apr 2023 08:12:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62F70C433D2; Wed, 12 Apr 2023 08:12:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1681287154; bh=veZ5xleU8GLaBh9M2a1Oi+Vu/9WTotNPxUf8g1BQ1e4=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=bguwWrbPdohFjVd6LkBkJb0DKDAtQ6OU0f/9C5JCLrRsHS80Nw5znznwiwsaUtkb3 PzLIoapOHonW4BJ46+nbQMZ1yIChin2mKgkIv6yo8wagflGkEM4Z0yrSasLXCW6SNL ivXrkG8BD4Ysgjtn0hCSH//b6Aapi49vKDN/7/1M= Subject: Patch "maple_tree: fix mas_prev() and mas_find() state handling" has been added to the 6.2-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:12:09 +0200 In-Reply-To: <20230411151055.2910579-6-Liam.Howlett@oracle.com> Message-ID: <2023041208-overfill-reunite-2277@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: 19B36C000E X-Stat-Signature: r75pqbckm19iqjybzp8mro7o8n4ndj4e X-HE-Tag: 1681287155-337750 X-HE-Meta: U2FsdGVkX1/NPN3pTkOuRqrpX1904XDl6MQb2YFKXwYBQ2fALx72A8J3gGWEnKf9UJkcygN1mSgR9w9h7qbzOWlmgCf+otn9XOKQUSIBUp5u94I137tXHCP7cI9uyuIHBIjDzsFA37SLZtWjzqS+nvkqfgmIptPcYTlpLYjrM+LeKVmFSPxrGpoKOjN9BC+HeIPQQwdcvtxEi5HdP/yt3KzaSp61Jl+ymPeCStGyfhDTUSNdSD583gB1Mkz0ngEE4OqaCaNt+g0JRKqaxsX4EfEcqNnGlUhN54dwG8L+d4RBrW1aIO6M/JK6Pm6hta0qt/mlhkF7aSzvHTcKHvIJrAMWkaVb3bP9r96tItm+VQqQM4OTjjManTU5Nj/rVFUd9jqAOvP3xz6XTu1JFiu7R5ct3q5f98yeuvt2ZD7SwyXvonnbuoG9dgWbOUoxFl+PjJWUXMGV/qGkFK66Ppk7TOylZGlbCUFOCnYdbl3N6CvkNrwulxGG8o/LKtQpRTdzwnFPlpHVs14NqFM+EjEsL+/cQm6nV8DxRrlPrlaFYfH0zD43H7pobGn/0hmI7FTYeinrTtkUkbmy6Lg8bhnd47u7A+WB3Uw5SluEkX5KVQLWSJXkJ8BsfA0JD5fkrL6o5GK4JVccE8XCTa2zNiW7axS2AWZ1X9oqEXpYMFUGHHvUvLJ22kIEvBdw7p7pAayLKKKAjreaJG9GAcGM8vkLXVE3NI+LOGYqrFCmQ82AJ7BzIzWjuZd6fGAJjK+b/er1Ut7dkqv0RKXhgvtNkeK5LBvc/PK+MIPnpdK0PF93RGXcI6NtX3QtDDgD27Y+TUv2M8sFyXjkuLEN0lGgZyW2b5O9i9kEv4iIn58XF4wr1x3PmiWZAuqetb7yJ0/EPkQMwm7RweVIO5WrEN6IPvWxHHlSHpiilkdeVyDfWu1oVdkM2uRtf/Iwcz98kvC4R6yKuD5lFpS/Hl+f497oAO2 kTaLwznX lEMPxDbemgXxVFhP2hQU+yvKakvJeATHW5YEUgTdVIahijPHrffyZF0dSkFtsZgDmv/Lb0CYc7Cj6rcKrAEzhh0M0XFZe39kDz5Uhb8MysXK9MVrVc70pRO8tx+k0O7SUe2em8ZDCEH4LqdLzzXhx0076myIP2MIUElyGuE8Ce9MwmBrW9dSmuRdQAz4YFeH4+bJlbc0fImNWK7MWIralkJftX2Ihw/cBW9k8U3NM/Dq7s5+5EQfm/RqNd1pB0HRZV51WjKrOZDEhmJwo+n37VqPwhoggaYgxhQmFaFktQSMLNNbSz5ZSdCfe/evceYa+cgmCo+5rIVhj2IhwGvErlDOS+H3sNwXzQAC3UMUB+p8lWBsdr+l7mg2LCkSXCT3oldYN/fTA60k9bhamjFhnjVdmYnQY4nGjoAzmfBL0JnFumA/OxaCo0Ag8IIn+Mc0VRtlyyGZ/Cu7ksx/qT3dI5VAqdEa/Biz5wNKecRpBtnN0p+hCdTdF+qzbCya0+AMqX4tSsQ8def1JN5fArVv5UAakFH6X8KBGOfgE9ApLeZ1vfRNy+fcPAEoeOrpXwZaNV5Emo1lhkCOYqG2WdKIQXpcLmWNIq78YQ24EuGJSmTcLbMsafwwG2FOgkATlxbDrphdke0nJ4seJA/B/7806wyZWBI+ZRjyTdObQq9XSVQ9/PQAIQ0orPSOvjZQ2F5GedNH0mZjZ4Z9JvDptQEqyqQS8CBsLJxk0cxq2y3xkQol8PdtIGmj7oWaJVpbsXkcZEC7ObB/qqYEJQkUe2wyOpseXaQ== 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.2-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.2 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 @@ -4849,7 +4849,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: @@ -5911,6 +5911,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; } @@ -6001,6 +6002,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.2/maple_tree-fix-potential-rcu-issue.patch queue-6.2/maple_tree-add-smp_rmb-to-dead-node-detection.patch queue-6.2/maple_tree-add-rcu-lock-checking-to-rcu-callback-functions.patch queue-6.2/maple_tree-fix-handle-of-invalidated-state-in-mas_wr_store_setup.patch queue-6.2/maple_tree-reduce-user-error-potential.patch queue-6.2/maple_tree-fix-mas_prev-and-mas_find-state-handling.patch queue-6.2/maple_tree-remove-gfp_zero-from-kmem_cache_alloc-and-kmem_cache_alloc_bulk.patch queue-6.2/maple_tree-be-more-cautious-about-dead-nodes.patch queue-6.2/mm-enable-maple-tree-rcu-mode-by-default.patch queue-6.2/maple_tree-detect-dead-nodes-in-mas_start.patch queue-6.2/maple_tree-fix-freeing-of-nodes-in-rcu-mode.patch queue-6.2/maple_tree-remove-extra-smp_wmb-from-mas_dead_leaves.patch queue-6.2/maple_tree-refine-ma_state-init-from-mas_start.patch