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 C2100C77B71 for ; Wed, 12 Apr 2023 08:13:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 659E1280006; Wed, 12 Apr 2023 04:13:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 60A5F280003; Wed, 12 Apr 2023 04:13:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 48400280006; Wed, 12 Apr 2023 04:13:38 -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 38CF2280003 for ; Wed, 12 Apr 2023 04:13:38 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 0C608C0F8B for ; Wed, 12 Apr 2023 08:13:38 +0000 (UTC) X-FDA: 80672024916.23.F0DB7CD Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf19.hostedemail.com (Postfix) with ESMTP id 53A731A0015 for ; Wed, 12 Apr 2023 08:13:36 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b="0/h9dpLy"; spf=pass (imf19.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=1681287216; 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=lqEeneCN+RXtLhENzshnImFtpmSjHVV4Up5EiyF9lAQ=; b=VWzLEvghQ1ISmlYFmcc3va73WV982mbgah0w069g5gJfO0BVLbmcuG2SjNRzCqAeTj01Fr IcpQc15nCj+cg3ZTsqYTpR8kZdwxcuvEs8Cj+Zsv7UpLX2yQvn/1aJQICWCF7exlh/Sswi PybrAN+EToQtb3sJ+/eQCNlUfwV1nxk= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b="0/h9dpLy"; spf=pass (imf19.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=1681287216; a=rsa-sha256; cv=none; b=bA6XEXdCl7BB1RsoSPGVhLBUlIMjstrvHiIBoToim13YGCjxiwHpUEMiWihS4Pa6KkBxVC XhJL0MWgvfKTIvsHTtHBQPgyzcLJbzOVMvX+IZLUE6ZqeVpEywl4nHxtIfPcCr7ckDeCuU 55govhNo8gJdhIv5Ade5OOjZdKTt8dY= 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 8596E62F53; Wed, 12 Apr 2023 08:13:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A359C433EF; Wed, 12 Apr 2023 08:13:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1681287215; bh=rtp1lxIoCBcXmfexl2CDfjNK6ykimn5811+Dt8hoqpM=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=0/h9dpLye5gAo1a8YEfZeRvOZxm0rLDs6TVAbPGkss/sdo8Akvzn8IKm1XC/pKRIc LceIC2+c25a0SDbn7++vHmavZC3HKqPU6BN2vEPvoNQv7pwgH7dTgnZBav3hE7UW2l 7WEjt5SFtUowhmOqLZPcca0qkWWNIlIxWEh5HsdY= Subject: Patch "maple_tree: fix handle of invalidated state in mas_wr_store_setup()" 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,sj@kernel.org Cc: From: Date: Wed, 12 Apr 2023 10:13:22 +0200 In-Reply-To: <20230411151055.2910579-5-Liam.Howlett@oracle.com> Message-ID: <2023041222-nautical-espresso-59e9@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: rspam03 X-Stat-Signature: nzorm3kuc4rh5qdebqtot4t91wq8fmc1 X-Rspamd-Queue-Id: 53A731A0015 X-HE-Tag: 1681287216-386929 X-HE-Meta: U2FsdGVkX19w461OPl4TVYiDW3MKch5Mdc5XNXI3Z/vfWo72XU+ABo3K4Il7qvzzlSLCVawuxzurGvLI78a282EuGhf/rjG39GA7YC+sbTsXFyrc0lKQo2ExPMctN5DT4Pp2eRgF491rBt1kBuiiVLNBE+zPoF30XahPrn4RsK3tKUf/Kb3/6RN/c8niTk/e+LC18fQxlBJdHkgkymCLQVD4LA7Lse7wBd5loaH37ISjacnDXuRNXMlUtY1/eZzJOkku2TkQYf5L9nK4aC4oc/CAella8lFv7ypVso+iCvAhNs8PmSrhRzXkegfPsVraWhQ1Auzg/1IgWYEMhvLGgFJeUwKULdrA+kXlfOX68xFrL7CnhCnyK14XEO14kqD3FsR9/m8pGDgVk4BLAg4jay/pEEUgrPmSqDFbi1tsV1kq0rNDdbPM029BeoLWDHFk9geUxr6Gv04fOitnqKvj1xU36bpqFN10+aP2nqTLL+PLbkuzNJeRnzHq+PIZDSBVqReq5un7TEvMTdBOpCMNVpzB7OgA6IM6XMfcc0hE3s/ea/aHQ9lmaRM4VACvanPbVhaIWL10SRNUoTkYGEz3t+c9NakZrBLISlW7bwcUI7/QDeVFUCGTX+0jnzmpGQYS5YO7iivgwmGCMrSqSGKPFte4+ga1rOBAWlLYzbvz827njwyomBZDLPEV08dPG/KwLisPUJwj5CAIptlvHvwyYrdCbGm3yMAdvAijEMVNQLtN+IM8BGB21eIU2yONsOOhOi3SLaF/qJZhdeDEL81ILSRQOnaFgXmQCG9FHz8IxGmsTGSjykgKYO0fprOYPyjkcW9qVR6yp9rE/Kbz9b1sy+U2ETNnEBbONnIPTtZ6KCjt/dZynX08APIPs1lSvV7WB87pN/nzD6GLrSVdSrrAmmI02l9SjVyWhc+5l9WXB65JN2ccAT6DcBuSflLq1LXm+7c8V3h2vf7/YVvkzNA nTAmJ7l+ 1Gfh8GB/l1oNFkQH9jj2C8TZGm2HAMEVb4WezibmZxn1kWDs2Fh5JzsI/BdMbgDQYlbs1fPTgMf2kkwaWb3rIJdAJmkH4SBcmDm9D4mcJ7qc7kgI+MDhYrxVw0q10MKdG/42ANGkAV9Ux+I4VHEOykZNP/huyfgTNxT70vV6myqhhDWyFvABJX8RlfuYREJQaukZ10Z8w9oxjvZ/Zpc0LDHYCeqKsQ7PG1ikyASXHdFVd32XWk50hS6Awb7GakAlu/MPNbqqdThpUGDBi0dPTnf5T6xqUDJp54q2iXfaaU+Q1rFJzNyPkY+L+sv8kHIYyFrdUkAb7Ywn6sh7Yz8qxEZDPyPlN+Bg4+GQ5ytVMg84c25N7CWnkrLh1Nq2Atnk/pHH+STC9kOsqMiYI/NVX1NWDU/gHXpWu5pkd8Dd9Z1u8Se8xX54LFdG6x7nU7nVj07f2VrFDYqEzHwzaWbg16EiBR68q4Ro3bwfpf/pObS5bkF28ORxrPZCCTssLeN1TibLamGnc2hOKBMZn7zfuSc/bVzUBdtPkcBc9iAY5bucaoTV/WUusRd+Wd1NkggGpFZpQHzJxA9tKZwGa/psZ4bPSIG6xfnEBVkUbPLKb6Y2nUOcT5l4Tbi3epX4WyXQW2cu9SBBWlSquTmuq7452I1Gl1A== 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.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-handle-of-invalidated-state-in-mas_wr_store_setup.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: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 @@ -5594,6 +5594,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.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