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:     Andrew Morton <akpm@linux-foundation.org>
Cc:     maple-tree@lists.infradead.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH 11/14] maple_tree: Move mas_wr_end_piv() below mas_wr_extend_null()
Date:   Wed, 31 May 2023 22:16:02 -0400
Message-Id: <20230601021605.2823123-12-Liam.Howlett@oracle.com>
In-Reply-To: <20230601021605.2823123-1-Liam.Howlett@oracle.com>
References: <20230601021605.2823123-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?XotL4NPDDPjRxuvXlsapMIYZ/LHMQ2osz6DER3HshBxgOAYKqbwCXNkrWeb5?=
 =?us-ascii?Q?+kfog6gLmMIOfnrVAx9tzgJA7s8TNc59Eytp6PEi2t7iG2q994kjLUkoc2bY?=
 =?us-ascii?Q?fSgZ0TNX4mpB1haQDqtq069JDuWEfX/9Gj3g2I/16xQ4v2QjmyQUtAVvsYy7?=
 =?us-ascii?Q?U/aDwsoaAMBkqVNhVsT4OqJsOWevb5nxS6xoGIR+V+urDnLb3IsrjevVBMUl?=
 =?us-ascii?Q?nAV6p3ArnTKksY+JMyED4GQWqY9un1gm9k6NWWG3JO3w3sAJ1hq7W8fudb46?=
 =?us-ascii?Q?8GvkJtZxvbcXubtxnpaD8GJhDHx2Qp8gT8ic9PI6j196Z9kHJTkklKFhwkKV?=
 =?us-ascii?Q?xWyRDa7MIpfisuSgEudmfZflQsnVNHfZOlZJ3BMaPGuxq2BihKQtVlUAEV2/?=
 =?us-ascii?Q?Dm0RxW2M7GRg5N/+UzPd4LMteMtrjDpNULidfFcHog8r/hURm0VQ37GB3qFj?=
 =?us-ascii?Q?6Bnjv+vOiG2flWXF33ZC1gS/8KI72cQJmKK+mPOI8fviB9JNjU0QGu+7xh9E?=
 =?us-ascii?Q?I3V4zZygnOZGeXsGXgwIQ/Ne0LdNVKzzTPkyXnCG0LydmvspYDxflej+e8th?=
 =?us-ascii?Q?seV1+jTYYvIzUIcyaZvpRkXcl9HzPIeQ0qTYjObt/OcNspVDXWhsRulfE8V5?=
 =?us-ascii?Q?pDlCK8gkLwaHLn/PmhFEI9xU61F/80rVq54UMVcUOuUcqLs9tK7I/KyjpDeN?=
 =?us-ascii?Q?uSqS60a5w1F0cfMeNpPw2poDeRF/wa71fINUTDZPLqfhQrRTB6Dgu2hS9jqx?=
 =?us-ascii?Q?kpfMNsIAeHtZ+PtmJxD2tsvDhMh4BZL124fXVjSErtXuBxXFH/dMDm48O4pz?=
 =?us-ascii?Q?8+PE6aJrGgPttmAd3cXEYN7+T+OXZjHSgxFG2LDCmuYLj3atf1waR4nwdEHh?=
 =?us-ascii?Q?ol2xHY0RkU4GHFv0QeKDuuiR25yRCztSQMXSpS5wsWk2gWRvtAkccN9Csvcx?=
 =?us-ascii?Q?xJrwrlyvcMDNRb/VX3diqwVds8ztBIyAI6SZW1nvp54N0saytBcIB+2CMEyY?=
 =?us-ascii?Q?nhcOmb7qYpy6+wvewW/EXDImwLW8Nag4gb+eTbQiYe8z5sRGVsox/Gm2fWVk?=
 =?us-ascii?Q?NLA9k+ASIN3fTzLgk5naKhiCFb0k2veHQVsji1Tos77AjzxDyY4UtocQmugf?=
 =?us-ascii?Q?Pjvv86r4L4lkLgMgGGYDmnCpJTh1xY+qJnio9kb+cglXN9NuASitSZ7sa/8S?=
 =?us-ascii?Q?p+7rzh3RY95kio1bZ4xWaXcnlJfr5S+FuWmi8i9HH1swHyisrH6EnJhS1NND?=
 =?us-ascii?Q?gY+06gUD16dMNwkxFLblHyC4pRs5/Z2Uk2u3QqPsVMSEBnocMV6/8Vm8TtSt?=
 =?us-ascii?Q?bepqWR5qeEPdT/8gdl1eA1T+dsr5IRpfKGsQ20/vjUo6Q9yh6khuRsgtU4XP?=
 =?us-ascii?Q?dmxvDZSJu+o1ZsPRCCM2XK+2+OD4EoI5H+9Eukw3muedaqJuK/g2y6wE/NLj?=
 =?us-ascii?Q?5hsx8pTXKuF2AY3V5tifTDyiifrWzaELLnans/FeP1UBNlMiiyt3B/NSUZN3?=
 =?us-ascii?Q?kLzB6WY7vOP7qoaIZGkK5IPeMG5qOGdk9VxiuykKqVJfoM+kLL3TikVu24Te?=
 =?us-ascii?Q?f0H8ozXfgvuut/p2066GZoF3Cp9KF65sGIq1DTu9SH/BJ6BqjZcIgQXviRvC?=
 =?us-ascii?Q?Hw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: K422l7Od0trKM7ZtFKRkpuHFgq5FDnQAajLlp5Lqwr3/7bwC7+BXBwJAK/Mt44/sJ6d6wLm29D+NiGd4GT7mVzZ44NVk5XtLG9VTOuUsuNYg80ZJnA96UgCWDtys4Ztu44WHhBU/gkCTAhL1fwpIckBZKmfSPMmQx1Sbiy/5FX87UW2w8yjE4MpWVhdtgBsckT14HHPxIni4OS5bQ3JyuLQ9l2zTwWa8l0KYZ+iFgTfs7XM3r82qVvQT6zQ8dWe/9dy7qpsUnRrTxsk7qVrKl6NfbovqsCH+gimMasqn7r3Cuzt4Gb1E4Nm0afIKYrWGJhdQg9QO86GkDVBRAmCqswm7RpgPzyCiNCjCjNyJr+KCZyXeAO10RWglDMEy89bLMmVYWDYsP7XeY+TcAHEev4qskIcm+dlT3RDxBtAtE+jMMYG8eQRg8sHtOguyofa/0kG10IqrDDBwuIsGKzTzx9fpqKkv+Pvus6ke9ETsnEqR/+oWSYwDZ1ZiwvwOijYmmxMG/2cinE5ZMXzwAUksD6vWiPO8Vc/Yqzv6N7mOxAxNBFIbUXZ5gJdftZH8oXOcwGEXQlIxh6gQpf042KpC9DEpT4xxNbaOC50qVwXYHXxty9zELKtR7QEPnucdrCQZ/bTA3bzinRpF7rRfFSJvpung1IBEsHuxDZmYJSFMjcVYUf/APs3YPVOibBoqnJ9xExLyQA0+2QA32HTIl99uSMIDX+lNcp3VOJW0nTIzO56A0H/CY8chRkVtkSC6InkbvCGPtZrFZhbXIrHwtqOGd7FozaZgseuD3T0w2zFtVMXfZQNjCfaXzpSPQdQVmp3Bz0FqKxYvjua15q7h38s4BaaCUlRghNFq0i+SMeVS1Z7RDz8w2aKno1TZB51IheKoiEwtIoBd3b8bGwg4kCY+QQ==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0823f243-7bec-4265-3f17-08db62463ead
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2023 02:16:44.3309
 (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: R6BJQ73z9Mrg8d5wP7VQgVXgbmbjWN9MzZ1B7nDjQN9MfAhh1fF5BGqNhweEkRe7h21F09NikHoIxJUpP1nkXg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4687
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26
 definitions=2023-05-31_18,2023-05-31_03,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 mlxlogscore=999
 suspectscore=0 malwarescore=0 adultscore=0 phishscore=0 spamscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000
 definitions=main-2306010016
X-Proofpoint-GUID: _2xj_LCbJZY3wadi2aao3ZIQYNZjATUN
X-Proofpoint-ORIG-GUID: _2xj_LCbJZY3wadi2aao3ZIQYNZjATUN
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=ham 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

Relocate it and call mas_wr_extend_null() from within mas_wr_end_piv().
Extending the NULL may affect the end pivot value so call
mas_wr_endtend_null() from within mas_wr_end_piv() to keep it all
together.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 lib/maple_tree.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 34eccddb0b47..adf662bc413e 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -4197,18 +4197,6 @@ static inline bool mas_wr_slot_store(struct ma_wr_state *wr_mas)
 	return true;
 }
 
-static inline void mas_wr_end_piv(struct ma_wr_state *wr_mas)
-{
-	while ((wr_mas->offset_end < wr_mas->node_end) &&
-	       (wr_mas->mas->last > wr_mas->pivots[wr_mas->offset_end]))
-		wr_mas->offset_end++;
-
-	if (wr_mas->offset_end < wr_mas->node_end)
-		wr_mas->end_piv = wr_mas->pivots[wr_mas->offset_end];
-	else
-		wr_mas->end_piv = wr_mas->mas->max;
-}
-
 static inline void mas_wr_extend_null(struct ma_wr_state *wr_mas)
 {
 	struct ma_state *mas = wr_mas->mas;
@@ -4245,6 +4233,21 @@ static inline void mas_wr_extend_null(struct ma_wr_state *wr_mas)
 	}
 }
 
+static inline void mas_wr_end_piv(struct ma_wr_state *wr_mas)
+{
+	while ((wr_mas->offset_end < wr_mas->node_end) &&
+	       (wr_mas->mas->last > wr_mas->pivots[wr_mas->offset_end]))
+		wr_mas->offset_end++;
+
+	if (wr_mas->offset_end < wr_mas->node_end)
+		wr_mas->end_piv = wr_mas->pivots[wr_mas->offset_end];
+	else
+		wr_mas->end_piv = wr_mas->mas->max;
+
+	if (!wr_mas->entry)
+		mas_wr_extend_null(wr_mas);
+}
+
 static inline unsigned char mas_wr_new_end(struct ma_wr_state *wr_mas)
 {
 	struct ma_state *mas = wr_mas->mas;
@@ -4377,10 +4380,6 @@ static inline void *mas_wr_store_entry(struct ma_wr_state *wr_mas)
 
 	/* At this point, we are at the leaf node that needs to be altered. */
 	mas_wr_end_piv(wr_mas);
-
-	if (!wr_mas->entry)
-		mas_wr_extend_null(wr_mas);
-
 	/* New root for a single pointer */
 	if (unlikely(!mas->index && mas->last == ULONG_MAX)) {
 		mas_new_root(mas, wr_mas->entry);
-- 
2.39.2