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 F2872C7619A for ; Wed, 12 Apr 2023 08:12:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 79300900006; Wed, 12 Apr 2023 04:12:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 71C49900003; Wed, 12 Apr 2023 04:12:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5BEDF900006; Wed, 12 Apr 2023 04:12:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 4498D900003 for ; Wed, 12 Apr 2023 04:12:24 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id EF56E140278 for ; Wed, 12 Apr 2023 08:12:23 +0000 (UTC) X-FDA: 80672021766.19.6CCF24F Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf13.hostedemail.com (Postfix) with ESMTP id 3AF4320006 for ; Wed, 12 Apr 2023 08:12:22 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=KPUoVw+R; spf=pass (imf13.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681287142; 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=RfFGIzYXbyIJSnU3Zx0TZtm1CLqmVqv93kEbElLeC+A=; b=I8/7lye0LM6qczQzNri3GZ5iltWYAK136h9o1pRcA8H87I9jhptaBBIOGl+dShQQnfF4yl zChUVj5uZDuFo70L+kIVa7XlBczBXVQJTv5x+vzqz3eGAuzPitlcm6jIInWvLqYuF5PirD p4DHQ401IpTnkRD0+SZ4S9ge+nGwi40= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=KPUoVw+R; spf=pass (imf13.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681287142; a=rsa-sha256; cv=none; b=8pm5LOMyB6S0Q+MsQ0NqIalTa6Tgkppz0GhJkySHAAO1wMb974JUndcfESEnAYW0CMCQkv MHxRExKfc2wPrfkWqw4EdT5BKagohH1eTKnSo/Ux74Xe+ddoKFG8A95d/bE9tmK3KowHFA QBovLT8dIIhDu4CS76G2NRM78MR9PkA= 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 6B63762F63; Wed, 12 Apr 2023 08:12:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A92BC433EF; Wed, 12 Apr 2023 08:12:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1681287140; bh=cmEHDHj/4SLEcmmI50/3M4nosPlADsfnMYJFI8kfgZw=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=KPUoVw+RE4/zhei4YdLIRLQZLmsEdRDv924V1PIjowlVcW5IBAfv4ejOczbLugiuX Mxa+ZhSo43CU12n0A1M70A+UtLcCRFT6LjyNRxvsnw0fcMmChLmUxKWWVH+6ouOvjz j+kYOIoiZnlBxp5SbsE04kGbquTQk/Rji5QnoPS4= Subject: Patch "maple_tree: fix handle of invalidated state in mas_wr_store_setup()" 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,sj@kernel.org Cc: From: Date: Wed, 12 Apr 2023 10:12:08 +0200 In-Reply-To: <20230411151055.2910579-5-Liam.Howlett@oracle.com> Message-ID: <2023041208-sponsor-registry-fa11@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-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 3AF4320006 X-Stat-Signature: q4nrrn5paidr8dwf5z79u7xydkgfpnab X-Rspam-User: X-HE-Tag: 1681287142-559578 X-HE-Meta: U2FsdGVkX198nY6q6gjx+eCPfdU2qN8PUR7e08V+JXIkNyWHQ16iz0jk+Yh5zf3jJbMIRqPZ4Oi+jdWhmECjYJ8/cKp7VHzNQe6ZL3gaE9KHZFWttXEUPgMT+YTny7UxxSI3tc8w7DePHCQnk1vZwxVHyZ8ywU2FR/ox2h7xbdYn86ovvw7ztB4N59ZaRK1QlDnu0W9BTxx0/0lPAghyYpkOQLUJ3kJlGUXnG/FkUdXOR5IXmKtkvIiHZQ3EVbMPXRfkgZsHKbZBJATV9c9HIF1aKx3vNq9Lib5X724wLZrnusbQL0Dv7GJeHPcXWXhgVfmp3GuDD9QERhtCqQEmDTD2q42MBsiqjNuAw7SM3HcnQlzHdH8iGb6AZ7C6yh+0Wfnnk7IukZAR3b3ibvC+OixfVugPsCkGBTp0ucf4PpulPSXGN+2ayM4b1/48AHnsvVwqK1vk7kyPGjWIaUd6wlMH3KFMsGBksk3Kc3HIqSeeic12y57E7OWN2HRQixvE2q7jvtLJsAlYjjKMp5EIpv3LMx+tg2pFmylHbQJSNMVjaJvvsnCiScAq54BJTzfLHrPVbfQrRRnMJQ7al9rBDb2hsTnNArFB8bd26TZl+AwpnLeJZz46N7iRN9gVADEaTfMuNsBkgEWz/eR0m8C8jL+wGNyzW7sg6JwHaa55fBhXDLo6SjHHuLYZSUBc0M+Xx1CMAXygIsfxeUDDzaaEEHC5u5Immzwq3P2TDdtD9++C9TgaKtutsLXQNskp2K3nOFMufzUv54GNzV1s0fCSEBLTF8o1jx8aLaqpYEJUxhcrpCrtWt8gQ+DcJCDOoAphh+akbnvpbap7fgIo/fhj47pQ//HKCaCMdBlLOTkIKbznhiXvBizDbrldk47sB4b4XfJd7hFGweTmM+1MOdIfgU9QzWAH0OowJ7uOow4z509cRxd7KIQ3O76L6JhnpwgVqxGfD586gKZG3/6Insy eppoKooL rwKCwwBdWhXooWAh4bn5NAPp3iL1YnSCCCAqgDVUEuhLmHfDpgun6HgPMvGUx112dEGO++0mDHukQaYAuzDg+f5GVThynjOF1IPP0mpooQ4ewT79ZuZMkycqNopvgtCk4evjQoVJAOhX22/XDElXIzgB9V/yPspwID/v7soIgoMqo/qMxvsYQb66Z36jRngEHtiRKy9XKxrw9IJKVuTR3BbJc4M7w3zZ8XAaTzvy6mZwuRlNXSW3MUUKCgzjlPTYa8w/NuTEk8/fDJW+Zwv1fLfGlIbfUbo+S7ngUZ81oz18ZUOju9WMmD9fQ8NIikG79ied192bz3kYGO5lwglK89i7+gu0Nm4BMq8EbVYermryZHKedSdfUVS92JxTPXeHX7RJADRd7Ebo3DxkLJDIGJ0HtJ1GSR1hD2Od0Z/Kxz9twf6h7sZhf1/fteQDXV5/iQ9BMWyhiUagZPzcMBdAxVDtyJ+eQcmEK8Hp5H/qL3rmvRDRWjtN88F6xHluByIve2qOADrta4UeJAJYI10WDGxvaGFTxx3JWcmUaJrVN8bG51IhL7DaXAlkETscLmyJB4SRYb5aeLcO36jJaNzCxXDOPjxDZvSM/SD4Vi6PmDgAuwC08IfrzECD5fshvIl86AYZMAwzseNBnOm7YZQ6Ad5OIWg== 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 handle of invalidated state in mas_wr_store_setup() 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-handle-of-invalidated-state-in-mas_wr_store_setup.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:45 -0400 Subject: maple_tree: fix handle of invalidated state in mas_wr_store_setup() 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" , SeongJae Park Message-ID: <20230411151055.2910579-5-Liam.Howlett@oracle.com> From: "Liam R. Howlett" commit 1202700c3f8cc5f7e4646c3cf05ee6f7c8bc6ccf upstream. If an invalidated maple state is encountered during write, reset the maple state to MAS_START. This will result in a re-walk of the tree to the correct location for the write. Link: https://lore.kernel.org/all/20230107020126.1627-1-sj@kernel.org/ Link: https://lkml.kernel.org/r/20230120162650.984577-6-Liam.Howlett@oracle.com Cc: Fixes: 54a611b60590 ("Maple Tree: add new data structure") Signed-off-by: Liam R. Howlett Reported-by: SeongJae Park Signed-off-by: Greg Kroah-Hartman --- lib/maple_tree.c | 3 +++ 1 file changed, 3 insertions(+) --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5599,6 +5599,9 @@ static inline void mte_destroy_walk(stru static void mas_wr_store_setup(struct ma_wr_state *wr_mas) { + if (unlikely(mas_is_paused(wr_mas->mas))) + mas_reset(wr_mas->mas); + if (!mas_is_start(wr_mas->mas)) { if (mas_is_none(wr_mas->mas)) { mas_reset(wr_mas->mas); 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