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 F2C91C7619A for ; Wed, 12 Apr 2023 08:12:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8081E6B0074; Wed, 12 Apr 2023 04:12:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 76A8C900003; Wed, 12 Apr 2023 04:12:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5BE256B0078; Wed, 12 Apr 2023 04:12:16 -0400 (EDT) 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 463E26B0074 for ; Wed, 12 Apr 2023 04:12:16 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 15094AC623 for ; Wed, 12 Apr 2023 08:12:16 +0000 (UTC) X-FDA: 80672021472.22.5F48B9A Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf03.hostedemail.com (Postfix) with ESMTP id 3CE1120019 for ; Wed, 12 Apr 2023 08:12:14 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=FG3My6mX; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf03.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=1681287134; 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=Y550TwXCdFJP5DpS3glWZm2bkLc7Kb45sA4Kbw3QsGI=; b=G6OGRNEddGYpXRA2dLAZiwNb8ckkWhKtRct2FpzQRmedQIZ8cQeRphrQP/cdoLt3uo52QR mlEbMLFj5Iu9KhzeeaGze80DBzGHDRk4YSbrbBCWvkHxUCeVtJYT14MHpb9hri935UCCzk wwpa96lEyyvwdYILeNAN2fl+7era53E= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=FG3My6mX; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf03.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=1681287134; a=rsa-sha256; cv=none; b=pXuEGCm0X5H6pizw1VXFwmXPJ+qLlgv0AINGIDU9PdGSbJ6iwHfKuKwJSNbHJgyyC+T8Zm Z6VFVGY1ebZfnBWo98HHkxXc0hP4+ME6vfQ3sueCiybSl3XdzRWpZ3ALWV4qyeED1Xz4OF DqKvSGqM7+shSRrkKAsvlU4h0D+Ev90= 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 4493162F18; Wed, 12 Apr 2023 08:12:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58AB1C433D2; Wed, 12 Apr 2023 08:12:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1681287132; bh=Ooe3wLv2PBxUt8bRm/egiVkvdeY4UiBXGN0NWlWNJO0=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=FG3My6mXWki8gGlDTEVOgBF/zqoQjBhdDBn55xbsIFZankVG/oFkBzlOWRrlONFl0 G21W/5Car3THU48y/5DTilyYQWM++n/rrivoKz15hUVvgeLcTrHis//oor+9FoYqWz sfh3hYf6iR1fX7fqIVmfsKnZgltbFKQki//Xw3Eg= Subject: Patch "maple_tree: add smp_rmb() to dead node detection" 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 Cc: From: Date: Wed, 12 Apr 2023 10:12:07 +0200 In-Reply-To: <20230411151055.2910579-13-Liam.Howlett@oracle.com> Message-ID: <2023041207-remember-implosive-2b34@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: 3CE1120019 X-Stat-Signature: oo8phtbj78mfra598zit6nhisoj7tz6j X-HE-Tag: 1681287134-556899 X-HE-Meta: U2FsdGVkX19j1vdF4NMmwsUuo+TNqt8bTHJHkDNY1B1qTFSF1Et5YeFxNbs7StCS8OdWXmuuY6jET5FYI82ayiG1Gw1Vqb++sTmAEVHrItzBmy+UJ/DSn1PMdATLWaGj5q0edTchGgx2/dJHJTyUjPtye9Lva38SS4+6RQERHVyJaqN/ilpPyE/rTE/6MYM3k86hlvLmvddVlkPwAmLUUwvC/SiXndjXhByJocdlQ382K7bd2d/rhbmauq8hkKbc9v+VYw5vNVv/4gnZOiqz6suUw2sICdoUWnzXdN8nGKopBBZ47jiHU8cAoMAMd2YSOfmIRgI7R8vn1kjBxFNQD2eXPGZiA0kclPOftaEwpeHM2XUdLZzXzi9JohNE3Tcd8Gdi+Q1wSCwtqjyg4xUBdlPPSyNPine1a5OfgZMCBpHX3aOCDmMyZk86SJUBsGL5upeQl47iCx5IaEuEadMmcGBv4z0Hkvy5RI8qLG0B8wwj+qYLXfkMxf2NoEXERSsQEAke6i4nJVcFiuvl6IhMEzKLTUIReBvZ8k0UlbzlwPiqqQkgjvRsKqLSTk+ttKsn2SBJx0fsDQ1TbXNqUzs7fuW2vuYLcdHXfWE8lDJ+ZUq/cmjwchw6fdFzmbaVU24l2jJ6tgakfbWp9Lei8CxyZvBAB+eiBbg3nVTtN6uWVmUWpf3QlQEaI8Wpk6razk6jsMtjj+2mTxUNEI06Q+8CxNXp8djHG0EBc2Woyj098OJcDGZD7uZO3vLLncEcKNn4eK2r5jUSrtbztFG5A3+VEDIB9ogwsvRhvWgFFbPbI0eMIOewEby923ngL7voQ2eFqWxPsxlBmaJoXBhal9D8PJ07DvWr1kU1aJ/z0ZTRzQX4BUfmhwbCbm9SKIL4uBsMRFvNC29PCIZUyHhGWr+KUSY70dm6UM7QJDJFQMtkDZvkx+59GjPCMa03igTpc+s5z2Qxyb3Nk4km5EJZhXj ChUr4QsE e4U58Qu0F/oxNcw9ZfTg8fd1yA0Xqo8hDKe9B0T8y6ojRuivdTow6ay8DuHuaV7X9TU4aDRRmhlOnDxmC5dao/Ajbi6lO/bs4tlyrpL36DkkLZcpYQSiJ5LrboA1D1vSCpGi+elgnuCHWL+h5lgaktmNO9FdgsFRgyo3koQml0y2i8R8adXnjFu3B95T7hKOEd9wTkNnsvBHm6kK1jo+lMzlyN5FdCxRyjq97JplQPkNvc8E3V6lAXQv46uftDyzfiPY9YdZBGd/tmZA2SgaILjrbh+vWfgfjsKk+syWPUmx6CR8z9EwawpF6RGvZtsbhmaomW5S8BWx5LgEP/ruy6tk3TjvwnBPybaqgDBORN4GS0vfeJNp7pWhpr95v0tgcIVUcyMCAyu6QpWRzz+3mgYzyJMYQhRfvFIOlf1tFJLBHZyJgC33RiA3s0ABxj0iR5SVfCzFsae3hsUOK46Mx6HnosrkKsqrN7sAl5ChYCfD7Mt1CR6r+iw35s9shd/rshVji4eOVgCHpABeZz+//EKo/O/wk4N7wQ0avc6MzcaTuB+CsdKSIht8nSJeLR8a8sQ8rLN/jWkB9+bAh1Hvg9vz+69PwC6SjcfscCMmPaiPwyB9XSZ6P3Xy1ne9vu193l/rGwac9GbdihgcbLLKorvO4hQ== 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: add smp_rmb() to dead node detection 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-add-smp_rmb-to-dead-node-detection.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:15:03 2023 From: "Liam R. Howlett" Date: Tue, 11 Apr 2023 11:10:53 -0400 Subject: maple_tree: add smp_rmb() to dead node detection 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" , "Liam R . Howlett" Message-ID: <20230411151055.2910579-13-Liam.Howlett@oracle.com> From: "Liam R. Howlett" commit 0a2b18d948838e16912b3b627b504ab062b7d02a upstream. Add an smp_rmb() before reading the parent pointer to ensure that anything read from the node prior to the parent pointer hasn't been reordered ahead of this check. The is necessary for RCU mode. Link: https://lkml.kernel.org/r/20230227173632.3292573-7-surenb@google.com Fixes: 54a611b60590 ("Maple Tree: add new data structure") Cc: stable@vger.kernel.org Signed-off-by: Liam R. Howlett Signed-off-by: Greg Kroah-Hartman --- lib/maple_tree.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -534,9 +534,11 @@ static inline struct maple_node *mte_par */ static inline bool ma_dead_node(const struct maple_node *node) { - struct maple_node *parent = (void *)((unsigned long) - node->parent & ~MAPLE_NODE_MASK); + struct maple_node *parent; + /* Do not reorder reads from the node prior to the parent check */ + smp_rmb(); + parent = (void *)((unsigned long) node->parent & ~MAPLE_NODE_MASK); return (parent == node); } @@ -551,6 +553,8 @@ static inline bool mte_dead_node(const s struct maple_node *parent, *node; node = mte_to_node(enode); + /* Do not reorder reads from the node prior to the parent check */ + smp_rmb(); parent = mte_parent(enode); return (parent == node); } 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