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:     Linus Torvalds <torvalds@linux-foundation.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        maple-tree@lists.infradead.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org, Matthew Wilcox <willy@infradead.org>,
        Suren Baghdasaryan <surenb@google.com>
Cc:     "Liam R. Howlett" <Liam.Howlett@Oracle.com>,
        stable@vger.kernel.org,
        "Liam R . Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH 6/8] maple_tree: add smp_rmb() to dead node detection
Date:   Mon, 27 Mar 2023 14:55:30 -0400
Message-Id: <20230327185532.2354250-7-Liam.Howlett@oracle.com>
In-Reply-To: <20230327185532.2354250-1-Liam.Howlett@oracle.com>
References: <20230327185532.2354250-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?qgPdoDjL3Vb08/IcTEjush9XtmG69m5zjcnGxtVpxE67dObCBvX+9aetB7UH?=
 =?us-ascii?Q?t13mZVaiZN+bhHVFkixbp7BXQMzHKbEogUlNfylxUEGGbdwQhcn9JF1bm8td?=
 =?us-ascii?Q?/s28pOURhuIcSNkHijEk5UyURKngLCCJ6Fkr+5JhT8L85orxX5rovGrZoYLF?=
 =?us-ascii?Q?8cwrpA18+ewlfkJ5W+GdXf5BKOkIjpQmQdR8RrTsGXJXNCJ/Jzp6i1xeykH6?=
 =?us-ascii?Q?gto1vda35jHlWde7gi0tolE0w6mbv+D8UlbAERFK17/tEuspPrHaD3D+QYkh?=
 =?us-ascii?Q?TH9CFZbnj7DguJxdSWBSkXxProzZju+p57fk40n0q3RaCOqBjCUkR3NDizNO?=
 =?us-ascii?Q?ZRXiggHZ7Coz+ZZxr72g3zWJidKyQzYe95rHvWlr6MOmu8Ft5Fe2Jtpvc4Mh?=
 =?us-ascii?Q?5dmxebQLIuzXeC6fgns46f2WPY9s5Oxg33aHUeqQPwrflDiDbFTjrYrvNUTE?=
 =?us-ascii?Q?TyQ2yJeJhd/aVcbtXh9Ifm9j4JjmxSkoVACrFIp/wOCJoL3i7Jo1tqPYlVZV?=
 =?us-ascii?Q?iiEmv1YE4v1A60tGYANGZB+WRHK84+3I8IphHzL3EZlYemmWnmLkOhMWBbLP?=
 =?us-ascii?Q?UwK+yjJHuIyzkcuf1xn/7NrtH9E8YY6+rz3m7eFg7Z9HSgQZrVbutPqp++rE?=
 =?us-ascii?Q?OCvE0f4NJERyzknWvd/eml23ufJoPlxG7AqKdEJ/bKgamIEOAX3kFqsGZVqb?=
 =?us-ascii?Q?ZBSpe+NGkW9DsjAUmXAZU0iLkmUCxe+Hv0a2pYOXV8c0k1tiguzGHUCVdhzX?=
 =?us-ascii?Q?OSpYy2Gaurl23ti4PNSqalMj+ZWVYEfe/WSgJwaNPBfKkXyEyhMlbfOcYRZm?=
 =?us-ascii?Q?akQreloab5EBYN2x8izOxwwVgvbunJcgMWQ5r4sfur95wxTBPF8/EuUvs/VB?=
 =?us-ascii?Q?gpt3e6De3sGYIOmD7TR1pg0q7Im/RSSHRWDbKj4zgbmhwqGjSBrBKDJl6OqV?=
 =?us-ascii?Q?HGOa4MJWKfQGFJQLL+ooUZYDl0YGllw+ur661RgiJ7W8dx5dxPX8FHQvnukP?=
 =?us-ascii?Q?d7QVa3yO50YYhtySTB2zlsUjwk4txg2YBTfktGE53KGafLKDy/vsTickGzcD?=
 =?us-ascii?Q?brpQBpfeW5MXizKwmhoRhYG+fdtfBFv4eML9oEAGq/BiDM2W00xc5CHO6blB?=
 =?us-ascii?Q?sg2JEiBY3CLoj9wraQSVWRyq8HrKrOAE6nVdZOSvdqj20GKfehBB51nznrZ3?=
 =?us-ascii?Q?1xfdUJn/T3xZXOGCysI/7CB2TsEDK6cO3TzOiONw8YmCaowF8XQfN4McQJy6?=
 =?us-ascii?Q?EqKnUvZ6a1tSIq9FyValGeCy8aK81fp/7oeb1EW5sOOzomIzVm4+OsIYWDgZ?=
 =?us-ascii?Q?KHQnlAnA9fny3NajO9AtZIfrxSboh/boH63s0PQiiz7VhMze8oTM3ZJeJWPv?=
 =?us-ascii?Q?P8yQOPNxYw07/Mq05pCHVSITxKxWYuvOBhFNUCEyG8t5F3mvMVW3WyBdIhXP?=
 =?us-ascii?Q?Qc7PCmyd6hdUl64lstWQurPqv6FRYVPoA9jVaZ1vegf7VnQS44Y0yXlEnKGe?=
 =?us-ascii?Q?SH2h4iE0d15bo3yrUiz5CUl8sdmofUWtMoofpcTQFRN1rKTzhAa7gztKX+Qs?=
 =?us-ascii?Q?28EanQlXvpEDX0XZJzZdqaqczx4MBToWTbyFcAXUlnJfIFuUUpCajAep1gE8?=
 =?us-ascii?Q?LQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?8ggrrtl7qbNhepSMk4wFl+WtmNB3DvZBVxbb4oo9X0X6bZUi6mFZWDI2g2J8?=
 =?us-ascii?Q?VAs7dJ6r0yO6QzNS1baOeO6n9kzL8homooU9ekTQGBGbZwrwR2eQzWkXpopZ?=
 =?us-ascii?Q?t3/2fO4f68Z1i3b7L1RSF+ec1emzfTIUKYDm9czcovyTTZiNDt0z4h12jdNY?=
 =?us-ascii?Q?K5+yGqhQkkZeIy1pUzIn3A49fbpzGHRQ7NuLM+tciVgNlg6NounxCEkWnBpR?=
 =?us-ascii?Q?xP/jJ109e0nK/uE4W9ssnlmd//qZ1c7pXzJzkpgxFeLxCbXlW3ln/47GeBx2?=
 =?us-ascii?Q?T4dhggFz5jf28sA70iWOguMwsc++08H4TfOed626VpVniQ3VQXAqThA34CAP?=
 =?us-ascii?Q?qcS2F6fNwDaqKki+59FPVbLrXEy5bGJFQ5nkdwThOU9PTFajJvCYk/D/Rf1T?=
 =?us-ascii?Q?dT059KsxvqaCNd4U33pr1PDWatDPZkbrtfWbUQwdg/TSR4IUlBaXaivQwM/+?=
 =?us-ascii?Q?8fLSZAgmOamfKdqxpPwbZTy4IZpVo/mJjbMPYcTXZA5AJ139DKhYxYvA/yIH?=
 =?us-ascii?Q?jb4pY/gMOYkxc1FBmBoQtGbw/dIXBrqQq1QrKPut63N1EkwC11RX1vAkO1P9?=
 =?us-ascii?Q?HLNDQLOl0TlgHeKQfqtbmcsz0/v48rdKhovpyq3AiVwxYAbdLfxxnOZLw56W?=
 =?us-ascii?Q?swKi7Ly+3EhxK3dXf9QGD7S/PhAJAmwAvVvSkaiMV1KxNsnHOkMZwAucTjdx?=
 =?us-ascii?Q?9MVHNWMLfrZmVUw4VRe1zEqfYQcFrOWBy/E2E/Wj+dhzVO+0A/2Ra7dn2OW0?=
 =?us-ascii?Q?w/YCouQKvUBpB9yFetK6dt2puw2LLX3xaa4TSibKiMjaOXYLkcifzumwsbB6?=
 =?us-ascii?Q?Cm7Rv4fqhLD+eahrP1/7Sm1lS2RpzZHRwIesSvEnbJtnY5hhfVrZZwa82Qt6?=
 =?us-ascii?Q?TIWI0BuzAkhP0DO669vaTOwftE6YKyzUS3hueY9179EuIdoZ9yzA5FtOj6M8?=
 =?us-ascii?Q?cCU9OunN405B5A2xjwmmuQ=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0c76710f-387a-40c0-f97a-08db2ef4e229
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2023 18:55:50.5457
 (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: XlxcQ2/cq0nfCnGITXRh69FFwD5xrZkj8OXP+pk+M/kqhOiWj8/0QKePIOlx7VYhI+T7kRVvTJAB8JypeKMq3Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB5722
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-03-24_11,2023-03-27_02,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 bulkscore=0 spamscore=0
 phishscore=0 mlxscore=0 mlxlogscore=999 suspectscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2303270155
X-Proofpoint-GUID: MYRgeADDFXDmnMbBMZ0SVXaNARkkq41C
X-Proofpoint-ORIG-GUID: MYRgeADDFXDmnMbBMZ0SVXaNARkkq41C
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>

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 <Liam.Howlett@oracle.com>
---
 lib/maple_tree.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 6b6eddadd9d2..8ad2d1669fad 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -539,9 +539,11 @@ static inline struct maple_node *mte_parent(const struct maple_enode *enode)
  */
 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);
 }
 
@@ -556,6 +558,8 @@ static inline bool mte_dead_node(const struct maple_enode *enode)
 	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);
 }
-- 
2.39.2