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,
        Peng Zhang <zhangpeng.00@bytedance.com>,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH v2 12/16] maple_tree: Move mas_wr_end_piv() below mas_wr_extend_null()
Date:   Mon, 12 Jun 2023 16:39:49 -0400
Message-Id: <20230612203953.2093911-13-Liam.Howlett@oracle.com>
In-Reply-To: <20230612203953.2093911-1-Liam.Howlett@oracle.com>
References: <20230612203953.2093911-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?usWxw2IxcrfU1uvE/MbMXTIqYjHtPFi2xROnhDI83KMes8h5dPHPXIZZtyhR?=
 =?us-ascii?Q?kVuME2lj9nqkW3fdp8abD/qe5qemTk3hpI4Dpm/niHspO45Zfgr7yrITjqlU?=
 =?us-ascii?Q?H/T+LSddQOCaP/pMx1AaTx8lWhTLlRoGfa0cYCsUT54v/aJyuvTWaXywmVuh?=
 =?us-ascii?Q?40LPHc2jY8kLMWcZnr5L1sCiclKOLFW5XNQBhwA2iBYGA7IGDRrJL2Kc97Rd?=
 =?us-ascii?Q?1PT1AU7YDStkoDU1A3PR94q/ts3JFnk1jdcKKytM+VrnIqGSkvNl+Nbc5d2d?=
 =?us-ascii?Q?ybQF0N4ex6oNS1xez4cw4pcs6kNBgJkcsVCekLtK3jgs2EkRW57b8kcBftS/?=
 =?us-ascii?Q?PzHoqJkqYMAiO+3CsyB9O6PBmnrDiujzwZEsfDTodrkPeTQNRMlzfCovOirS?=
 =?us-ascii?Q?fVxKgBEzPAPoJs7nu2rWWIxMf0RdR/kArQC9O603mbv+7rD9DZz6ZJWdlt+/?=
 =?us-ascii?Q?4TbDsL3puYRE8fDGNcQsLTiN7wY6xAd1Q0/qBRIwmk47iyxJB7GW0WTDbqft?=
 =?us-ascii?Q?Q+RA5m0ZWIXQANeaAOCXXyz3mDmpHESofiO3AJSZnT7K5UN/QeyA0QTcEUxb?=
 =?us-ascii?Q?RHr3pFn7afTvUipSSvyVYHP8yFq4eVypwmkBGoLK79Ohlov3gGpJudmuUpp+?=
 =?us-ascii?Q?OxNzauLCr3ziBGC1hmV9KR2TMoYV2iEbbIoNsZnhUHPTgOXxd+pWt2AldDrp?=
 =?us-ascii?Q?Uqv+bpgz2GxWQirVuTWIYx11lc3CWXDWzcG9uqtvKC0O1sZVDe6O2zIBEyAw?=
 =?us-ascii?Q?x45GfEGKvH/Yb6ym5JJ407gkMliYT3bhFacsDZp7nYvSugXdlr53vKaFnsrB?=
 =?us-ascii?Q?py1i6mpfjZfEoZ18lZX1REIdaFn8gbHsOqDfAYeIwSt6ayiNEJX7EZ1T2JD8?=
 =?us-ascii?Q?GPVGkZoHAKj4H9jPvOmHbVQTS/tustPS5MEvnroNLODw3PVdAtMZeGuNhtku?=
 =?us-ascii?Q?gCu+r1M4rX8sysDIdK/vHCK6ThNMzIbBoah7+oYrU13Zr89OdQieotSQVDd8?=
 =?us-ascii?Q?JGWRuBKCnzhG4bVcX81Y4/fDa3XRMcuoL+5RMRlKDVBFjzEel6fOF0Ah2078?=
 =?us-ascii?Q?y4caymKpsVLmM2aItCIpoulrweXM5GjugrGfJ+peUgoGnlKsrkxOi0JNCW99?=
 =?us-ascii?Q?FD9xjpBf7id7/VcwVHnhR3kmPX6ldF9nr3mAxQx5Jaogjo6FlaFocnFG6t2l?=
 =?us-ascii?Q?gZgVpc7pCbuBu/Z9BBUiFA2tOOL+wdOiHpNNCv6RbLvx3ksWoEE+NyXzboZI?=
 =?us-ascii?Q?YeMS0a+liRawZeot45lPy2wXvyHcNdfFL/eJneKFCenmCsx2QyjpWqxusokM?=
 =?us-ascii?Q?gnJS8SVkiypFzwdzdf9oXTqDpMXTRCyvK5Kh9hKtTnVioYn9QMfyPfZ1MR5f?=
 =?us-ascii?Q?tQkSvITNFEi7WBeTYpLolK8et4KYFBS8tWdG9Bq+DTwX1GTKwR8zBQ4BdjOP?=
 =?us-ascii?Q?YQllLtbImA0YX8ruEMlHLPHmgMnT+4Je1Ppfpm5BT50Lqs3GeDDB4v9U9NSB?=
 =?us-ascii?Q?qiwEHXhAcg8+nA21OkORdhcj/JxTPvJBJx5CCgirVeThZ2SL08OlQZrwIziX?=
 =?us-ascii?Q?NPx8A71ZjSd6lSG1f/Ox2nnCLMogxWwJYVIBltu+T5pmHfLM/JH8mKyD26h+?=
 =?us-ascii?Q?Dw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?wV3+jlgnum1LrCKv0q7WDVrZgsIwm3lFLGaHUyhZAaT6ajzSvO9jUey5Qauw?=
 =?us-ascii?Q?u/ZlrpNjwKh6q4imbSqyjd5CqnojBrum31cELcN/mmIigiUXWeroOUw1t46L?=
 =?us-ascii?Q?GyJA5nWjv8K0ybUNJ7P6OmCij2kFZ0goQFDoWq+a7VIUyJxKSJv7CgwiYQEI?=
 =?us-ascii?Q?2wR5cyN9ayP5LbOB/hQsZajC1pCaETzQru7Zm7TQMAc8+HC0TYOrgER/wvXB?=
 =?us-ascii?Q?iNZemJhxVLrzXgvrHulB5qf3R+BFQCPA68BKnnVf6zCK5p5LgasyrdDm7R9t?=
 =?us-ascii?Q?LB8u4HfRcT8B4+8hDMNIuS9510RQW0HxTjnSUlKortk38zHQLWP26A2nl6Rx?=
 =?us-ascii?Q?KAufNAzHaYBJEMMumacIiej/t4bUsNLlkOnndF60NLkKftVsd9MNc/fnrpLv?=
 =?us-ascii?Q?ctfkVhQRVMbXkGc8Fe+r+nf6VoRgwwTASJ1GdKjTVs+XivjgJFzzqYWxa6WL?=
 =?us-ascii?Q?zfeXX8dyct8G+VTI0yvjUBARH8poKdpSdDaxSvkQ7u/8IziPl72neipmUP+v?=
 =?us-ascii?Q?lhUBJLCKR2lQ/Hlfe4bbH+SS4+EgMcUEc9UWI9oHSs0WkGlXMs7aRIFjrLxw?=
 =?us-ascii?Q?sboaQHWoYnP4FXHfIIo/Q2+N8hnKstL0CiRQC4lLj3acHAF73F2HW+Eh9j18?=
 =?us-ascii?Q?oa2WqQMRRHAVYer10jCOPKMgI3xad+NL5Lk57qJvK/n3/lG8fhul2M73Zew0?=
 =?us-ascii?Q?SPpVXnWRAmfW5FTU7TDC76cqdWutAP4AQ1YQvaOxul3aNQlO51TMQRCh6UKO?=
 =?us-ascii?Q?CMq2xPbTLIsi8sQU7DoZVBNypBCgWlgF+rkJR5eEak1HUPOB21PI/yzf04bD?=
 =?us-ascii?Q?is3UPSKVh/vpy8/G00XxcIWJEvNhpOtpdlJCnTIM0IwzJXMnyTYUFE+Z8Sud?=
 =?us-ascii?Q?XlSwd/yVzD6Sa5POW51ladf7mHNC6kyQ0B54mBvTdSQnvUwWYCnms8H5tE6T?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c6bff715-1590-4ef9-c30d-08db6b85432f
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2023 20:40:30.5932
 (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: MQFbMsgksgOUf1JYIbjWwi+WRpUwRYR6ST9WO393gcvd78A0wTelpsRH4wsiFOFzhndbAqP6TxZSkvRVasip9Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB5868
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-06-12_16,2023-06-12_02,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 phishscore=0
 suspectscore=0 mlxlogscore=999 bulkscore=0 spamscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000
 definitions=main-2306120176
X-Proofpoint-GUID: ijbDhC1EBN1bpxeSwa9t00WFUerEOBbw
X-Proofpoint-ORIG-GUID: ijbDhC1EBN1bpxeSwa9t00WFUerEOBbw
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 fa51abaab09b..048d6413a114 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