Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Liam R. Howlett" <Liam.Howlett@oracle.com>
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        stable@vger.kernel.org
Cc:     maple-tree@lists.infradead.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org,
        "Liam R. Howlett" <Liam.Howlett@Oracle.com>,
        Liam Howlett <Liam.Howlett@oracle.com>
Subject: [PATCH 6.1 11/14] maple_tree: remove extra smp_wmb() from mas_dead_leaves()
Date:   Tue, 11 Apr 2023 11:10:52 -0400
Message-Id: <20230411151055.2910579-12-Liam.Howlett@oracle.com>
In-Reply-To: <20230411151055.2910579-1-Liam.Howlett@oracle.com>
References: <20230411151055.2910579-1-Liam.Howlett@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Si2e+AoqHgWxkk7+RC6XPWctCN2RxtU/Tg7Z0Cj01I0mR868DdUfks68jy7Y?=
 =?us-ascii?Q?4p7h01Xb3eY2d5zvAdcXvJQnmzHmDT04Xmkj5TzPiW36D9sX4qXlUxUI9hCk?=
 =?us-ascii?Q?1JiJC+dd4K9Gk5P+JHU8er/aNUz7LK6X7doqiOxDH6c5iTP+OQdqMHIN8lsD?=
 =?us-ascii?Q?V2JUTC6fr5ixUTAEfLmTOqjVAz3bwgsS5ksYzl0xga7L1QJK2qeSbPoPOuLP?=
 =?us-ascii?Q?dGEft+bBHhJ0hdt0AiwDXWKjOaBC60zFJrmqfsmxzOSJv205AsnkcH35LMXO?=
 =?us-ascii?Q?UaytZauhT4ybHzb986JApF5B5bsBCqy/tTc1IN/jjnwk879CtYlq30d8itwk?=
 =?us-ascii?Q?+XThX9JHJ8dWncAhZPjcyVlQUnP3LEOrmnPMm4Ax1RaWHqwyOMNDtet/c3/C?=
 =?us-ascii?Q?ZTA1gNTeAr1bsL+McQhRBRzNR8McsE57k0UkrTwqPAookqc0WAjcXOvZQFb0?=
 =?us-ascii?Q?yDtPmBOwNvYDg9YEpwBPGu6lL/IGQb07IX6RWkyhJXh3AVkFZCCGKd3B0poB?=
 =?us-ascii?Q?e8uCRFZOkP29fvIFx6/LbAiaUiRSrGg0RJLQiurN4LGLnGAS5DpvUf+W3MM3?=
 =?us-ascii?Q?DsV/Da6HW0nm+kAyrGM5RQZBNAV94gJxCsSHom/Gj582LvSyt22f6WcJ86rl?=
 =?us-ascii?Q?WF3v7LTUNGQ2gsfzVkoa7yC0+ZqRsnTs28ujl/co1np/qXISkyLhsSQO9gqf?=
 =?us-ascii?Q?8dxKALZ5R6xrJh3nsLd/x6C9QMUodpfmG9f6u9JDo+oUFm7dZDMiKydsbcl0?=
 =?us-ascii?Q?Ov8LnHAGWArgEAPdOjbP7R/CJcIeNZTnmaYatQozMTD5SZWdG2S4/BgOy+CV?=
 =?us-ascii?Q?B/hll2pRjWxLWkIS7RUwHsjxxfvJttVv/BSUk4BoMPncGmUKTi+1VLShzo17?=
 =?us-ascii?Q?p6QXEgS5rjqStAH+eCYFXISKgpw45RfgT9aEL8I8MUosObo0jBF3fwTpAYxS?=
 =?us-ascii?Q?R7rP1YjAzsHymv8MRlmyyp+t2Q7WVvAKvANP5xTSps1FgCGpxTuKQsiJKfd4?=
 =?us-ascii?Q?WvEPI49SPRY2aLpsghbtwkyDXgQUDOthWvbKqSQruK4iaxoj8PGgQaVejCl7?=
 =?us-ascii?Q?e78gIZZ7lBE0NJOec3E1QORa+T3CH9RymX1J3kYVtqcA21HiyC5ab24Usy6m?=
 =?us-ascii?Q?P3Hmp3v1G/+ziyKP6qXF0RtttUJT7NMns79U7CYcFS+WXhOtCuoZAqiN2kxQ?=
 =?us-ascii?Q?23adnmXCIixV2DtrZt/CK28scCUEC8nmZ6gLqkoMXDqd6CPg7awSW0Iz/Rmp?=
 =?us-ascii?Q?HvZxYOAt7Lwyb8gg6IOytlxtNcHHaXBPz9RNHhlgmSUCPr3aPKdDlaKX58yf?=
 =?us-ascii?Q?fP99CYFye6Un97Tie9mNpeRSMJAlVueO3p+AcYUhIkxRqJsbjI07fU+9Bs6C?=
 =?us-ascii?Q?MEOo8I4GY2COpQtlI1xcFHs2Dt16xSygQnqhOxqN9ROHz/bbA0ET1MI9MfpX?=
 =?us-ascii?Q?1Gd10bKtxvkbdS8ku1xwXmXs3Inl4Nwb9R/FzkIL8XLn2qnRjWulJRuFO+dO?=
 =?us-ascii?Q?iDHxF08OWYJTVQx9wR6YErHMmUcbX+NlcGY4Id3WEdKZ7NKlcMNyvj5/0yg6?=
 =?us-ascii?Q?kgxySsRdeJjRl86oDpN7bIdIa/WULA/hVI9maUvhNCPdrvbe1Ic9LlGgSPua?=
 =?us-ascii?Q?6A=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ul+rmDbF4v/QtkrjdytlduULWjAM2XFr/Yil3JW0Ybj4RaMiKAS+qXdgcbN8PGkoW4NjqM2PcsZA5gqz37FkMPAacLfb+BS9UqzXfo0Z3uH1QBCsjgq3FkY8YIrPoxIE6bk9bSYIRyR9eDI3ZUTTwmqRmujp3Y9Gi7AjZCvd9QGTlNUEjBTBePhUyNnRgaMRcprcI5V6earb1oU2rA01x6ByIi51TvoXu8NHcEC/89s48c8BptXAIM3nNBX3UnxptKDAK2RfjPxL+t7ExbNFTSXg4kp3sz5sT0SdP/6abqnKQvHR1F775idylPs63RsJFXJrqd88JQbiJZD9y/TRAt6yyfuo5IRnSHEo8CdwUzqOW/zxMtwPkzxgwIT0ffEAduQoI0j9GCpiGOwOanOGax9KGyttKmQkkzb5pj8mm5mM3fxWrCPX+9K+fAh/mTAs+XbzeRTc9bJFLfFL54AVuwHo2oxYPG4PokLT6hwcenf1OIm0KQyK6VWd7GwbrbjkTptWIEAYj33o53V+ItcQCSgVgCf+6uRrpUr6h7cB+MbmsIPMPPsW+36+LVsqYP8czdZayWYv1q2Jtsl6AzKFEWJItf88S9VYmwe7MLmKWWkafF18XFL8aKO7f8DOBu25tClAAXK1acjsbTC8/qNXd+5JFcru18CMGJyyrr4xb/DpJszOn++jC/DFRXOXrZ1AoiJ1x0Ufz5emqqpiw24OR6XdBjQwC7PCak0d0xgDLd/SuodvJmKiELsjVyyWkr8GGHkhaI0bkAx3Sm/9l+8DtuIjo6O3y6dM8Q8Kk/OTwmrD/YZhNhPslD0fCbQNOsbEgWSDHSWO517boY8/eFxibgwg/Pnp2Te040a3DbiWPts51eFzCZtUhbErGClRP7sigR5VHHSBes9nuqqZPi7cVw==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dc325e29-65a1-495b-8532-08db3a9f116f
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2023 15:11:47.1084
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ZWDVSp7F8UlDT6O22aLHpZy4hpULHbCP6VW5jfPObhMwCZ/nc6Ji0RQl6zoj6o5R+HpqT6JSV1t3uimQuUmMHw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4718
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-04-11_10,2023-04-11_02,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0
 mlxlogscore=999 spamscore=0 suspectscore=0 bulkscore=0 adultscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2303200000 definitions=main-2304110138
X-Proofpoint-ORIG-GUID: SjhcaOHj6L9RN9-2k1-xQA54gax6L52f
X-Proofpoint-GUID: SjhcaOHj6L9RN9-2k1-xQA54gax6L52f
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,
        SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>

commit 8372f4d83f96f35915106093cde4565836587123 upstream.

The call to mte_set_dead_node() before the smp_wmb() already calls
smp_wmb() so this is not needed.  This is an optimization for the RCU mode
of the maple tree.

Link: https://lkml.kernel.org/r/20230227173632.3292573-5-surenb@google.com
Fixes: 54a611b60590 ("Maple Tree: add new data structure")
Cc: stable@vger.kernel.org
Signed-off-by: Liam Howlett <Liam.Howlett@oracle.com>
---
 lib/maple_tree.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 0f0a2d4850e8..281be0997e55 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5501,7 +5501,6 @@ unsigned char mas_dead_leaves(struct ma_state *mas, void __rcu **slots,
 			break;
 
 		mte_set_node_dead(entry);
-		smp_wmb(); /* Needed for RCU */
 		node->type = type;
 		rcu_assign_pointer(slots[offset], node);
 	}
-- 
2.39.2