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,
        Suren Baghdasaryan <surenb@google.com>,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH v3 12/15] maple_tree: Update mas_preallocate() testing
Date:   Mon, 24 Jul 2023 14:31:54 -0400
Message-Id: <20230724183157.3939892-13-Liam.Howlett@oracle.com>
In-Reply-To: <20230724183157.3939892-1-Liam.Howlett@oracle.com>
References: <20230724183157.3939892-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?7CKbdWgHMhVjs//HgDj1qvkyhazeJ80wMnE4U8YCuZjWfMB0VnFnxWc22XQV?=
 =?us-ascii?Q?3hLKhAX3xlDSbuLyZw2hwk7zb+mSBbhp/4W/i2Z1eeC4nudLtmzZXzHPSoHn?=
 =?us-ascii?Q?9c1KSpbWb0VnT5JDpXvQFckDJWeRyi74U6tdHgArWZRftewE4qZZXCstkufS?=
 =?us-ascii?Q?j1j2y9BIwcHSg6oMoyGeGOGymj3tKpJWBP6sldg1Rs0Kr8WMB2ZNvZJ4ZLOA?=
 =?us-ascii?Q?YbdsSsHkgl4yqLNzGD3e7uIj7IkNL9o33JONOK+c20bVGoxdHnYmUjgiGfm5?=
 =?us-ascii?Q?1Vd8uay4rbQtflfkDhgCatukpJLfolKEISD8TK3iNFPOAMSk3ZZn+0oc+bvY?=
 =?us-ascii?Q?BgSIMS5ZRW2aBKABGhXAYWsdunjnJcbXKthB94ViAZRBSw925bENu5qKHWYl?=
 =?us-ascii?Q?3eKIc0a/iBEiVnVZdGKvAHQA5ng740VbwvlFMWa//FuXiU2at9/gzfxu3BAp?=
 =?us-ascii?Q?gANAEkES7wrxe2svpEKtui4RAM8Lyx7yKf0ac5TBODbAxVY0FKp8pbiyJpcY?=
 =?us-ascii?Q?iBu5Rsc9NOVamaYCcpD1MDT8MyjQSTNwTkvgBRtcfXlIJlBdGwMLElJ69Ka1?=
 =?us-ascii?Q?hNOwJwTqU9yJEE6O1d0vFKtu3XeqTQOFmkOZBznipvSK08DqvnujU+35dDYv?=
 =?us-ascii?Q?NoaqU9HEEqsfXbfa7//8Chf+pGXWZ7NKMvd4tQ8eER2d8wBayCGJJ6mTw4de?=
 =?us-ascii?Q?LDhb+yWN2ZhJkAB9ySocfH90hW137y/h+qac+aJTvp2Q7jQI6d3Da3TpBaSu?=
 =?us-ascii?Q?0X86aGCjPBUS6tNSybBXuCSkMjRVDVCWP/ytwd3ze31Lm7CRRZusGPUNHUNk?=
 =?us-ascii?Q?AOH4mClbYBuHkMyXrTkSiuc+eYP5v19h0spEZESgT00z1uPwH6/YV1MR4gfX?=
 =?us-ascii?Q?H8/1hWTWlAdmjoeodRaehn7hIST0q8sfHDHwmNL/5pjHC8NpDEQm5oHpQLYJ?=
 =?us-ascii?Q?SS4jw6Eaiq/h+X1bpZ2A/Zfm9KmRtxYYxczS4DHoM8ExJrePd6HH79UnY0J1?=
 =?us-ascii?Q?Rw1c89A/R3LddrLbs1U0AbHlLdBAu2gEajttxzfMADqrq/8SNaCcY9qff1SU?=
 =?us-ascii?Q?Ta7Fw5MlPdDQVfdRn2sw0WXSbwgeMy9tVjGUR0fxtg9q9CeqmjCACH9Qiqox?=
 =?us-ascii?Q?ZSZhCCLp+AjYGIV2OmcIeRY1b93ncNjLe00xf+XM2ay2m4gpl8P6pgEpB58W?=
 =?us-ascii?Q?Jk55CI3okxTgxRo+UWetGjZvWyymLN5UHwyosERL1SqraqG8QPclUgWDAoup?=
 =?us-ascii?Q?vLoBDrvit/g5wWEs5rHSaNYKr6Oz56pyMbUQu++N1YG6xyShs5GfDEXQ5k3x?=
 =?us-ascii?Q?syiKDo19sdbmtLdDGagUwOf4lMa90QLOLMTbH34GD4l/Zu8scY1nT+U7KB2/?=
 =?us-ascii?Q?A+Jz6QdT906XY+DVfZaMORaSyjwux3BeREnxowCKMUvcKLoVq5ub3E31XaOt?=
 =?us-ascii?Q?rhJL3jC5F89rbYxZKxbVfQE9dFNJ102QuPimGqcecf5c2dMRNTEeeDv0dKt8?=
 =?us-ascii?Q?K0y/Gq5vVqHBjEb5U74NRg3yC5AzCoZ2XSR/7VuF5rn+GschVudwWo0erUAz?=
 =?us-ascii?Q?JMmmJhi/XX/1KouigUQH/af4I6mnO6a0JP4/TJhRGKM8szTQsUwE+/1stIFB?=
 =?us-ascii?Q?IQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: uk71LjPvycxlkowjeF02z0VIk24oTBfaj987FHASpT6yfYvt/eQtyRvTlBQjrs08zIWDC8LaOzHZzV8i7Do2uElz87XOlupH+gdsJGwb3uueZtaMqJrQQrdXR3q8y0uGGP7JQW79tcnZJk2T881kKOkuKoZgU2TIo7/okSNFWdVIkZ5tYcoxz0ppph9Kcnmq5tz7txGBYMi09/MJt2rPMDTELY6NeVYjMCVhTrmA1QAPSbUTJYJ05ZVQEFluBirLt4tiS8Gqv2gb6576nkZu06YHMEOgcb8/0yMsvXvkdKtWGdkfjAnUfNEWVaRvj3eO9LGTKJkri6Jw1AvoRi4sX3nC37xRMsj65bHd/zzuHMeSeuDINSG0BXRThFlYCSOLVfMXWuu1asd3es59Ed1n+HG/qyVIcdg6EqGvAaTL0sfEEgoTko4JqR21vVwosmidpMxK/ispGeY1hi02gEC4Cucj/7eCNjI9lN5Xr4BSc7H08HBKVLfQFUPZB75NKaPg/ga07Ks1BU/UchYUwVeZDngNjGvkTkKuCYs2Lpt1Ybjbo3o5osRgVUlhYApapuzgkNA2wcJ02Y+uzftsKddcPD3NwxSpn9fqFzPYCfuX6op6zSQqZ6CsnEIGX3EWEt5jAKaxZQAT7ewmU3xcpM8YIO6TSvBhBtA9v5PjX50LcyMErV285YocZtziuc8yloWCYjPs/jwdqCRASFGVEwPKPl3ebimYs6FND2d0aO3+JegeJNxokRYqDc3DyHJ+A1zxibeaFMnCuN+JZEyaV1PT74mhYGhtfGbIm9tplvG9I3ykXbt9BP+cgl1F8bE32I0kMLfoBZOlp32FGoGocCDxNaF+eig4ZBNCIHC8h44DPUh1916qNhmWEUvdgCjoKCKJn5S4EJRkdJFtZErXm59o0oXiBN9EhslJYal5oUC6t7E=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6e89d217-44ce-4cc4-c0d3-08db8c746044
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2023 18:32:46.3354
 (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: KcXMeKWhgN4NyoqQwVuN25bfmRv7rnoJZ+totijFRqC28HRN2qesysrjbk5AuZyOdvpbqXkHAxtfwqmQcODPQg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6609
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26
 definitions=2023-07-24_14,2023-07-24_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0 adultscore=0
 phishscore=0 bulkscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000
 definitions=main-2307240164
X-Proofpoint-ORIG-GUID: uec6J5yuS6NTB_FBsKlP8pHa1b0G236h
X-Proofpoint-GUID: uec6J5yuS6NTB_FBsKlP8pHa1b0G236h
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

Since the mas_preallocate() calculation has been updated to be more
precise, the testing must also be updated to check for what is expected.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 tools/testing/radix-tree/maple.c | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c
index c6c1c5109deb..e5da1cad70ba 100644
--- a/tools/testing/radix-tree/maple.c
+++ b/tools/testing/radix-tree/maple.c
@@ -35458,6 +35458,8 @@ static noinline void __init check_prealloc(struct maple_tree *mt)
 	for (i = 0; i <= max; i++)
 		mtree_test_store_range(mt, i * 10, i * 10 + 5, &i);
 
+	/* Spanning store */
+	mas_set_range(&mas, 470, 500);
 	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
@@ -35481,7 +35483,6 @@ static noinline void __init check_prealloc(struct maple_tree *mt)
 	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
-	MT_BUG_ON(mt, allocated == 0);
 	MT_BUG_ON(mt, allocated != 1 + height * 3);
 	mn = mas_pop_node(&mas);
 	MT_BUG_ON(mt, mas_allocated(&mas) != allocated - 1);
@@ -35495,7 +35496,6 @@ static noinline void __init check_prealloc(struct maple_tree *mt)
 	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
-	MT_BUG_ON(mt, allocated == 0);
 	MT_BUG_ON(mt, allocated != 1 + height * 3);
 	mn = mas_pop_node(&mas);
 	MT_BUG_ON(mt, mas_allocated(&mas) != allocated - 1);
@@ -35509,7 +35509,6 @@ static noinline void __init check_prealloc(struct maple_tree *mt)
 	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
-	MT_BUG_ON(mt, allocated == 0);
 	MT_BUG_ON(mt, allocated != 1 + height * 3);
 	mn = mas_pop_node(&mas);
 	MT_BUG_ON(mt, mas_allocated(&mas) != allocated - 1);
@@ -35523,33 +35522,37 @@ static noinline void __init check_prealloc(struct maple_tree *mt)
 	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
-	MT_BUG_ON(mt, allocated == 0);
 	MT_BUG_ON(mt, allocated != 1 + height * 3);
 	mas_store_prealloc(&mas, ptr);
 	MT_BUG_ON(mt, mas_allocated(&mas) != 0);
 
+	/* Slot store does not need allocations */
+	mas_set_range(&mas, 6, 9);
 	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
-	height = mas_mt_height(&mas);
-	MT_BUG_ON(mt, allocated == 0);
-	MT_BUG_ON(mt, allocated != 1 + height * 3);
+	MT_BUG_ON(mt, allocated != 0);
 	mas_store_prealloc(&mas, ptr);
 	MT_BUG_ON(mt, mas_allocated(&mas) != 0);
+
+	mas_set_range(&mas, 6, 10);
 	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
-	MT_BUG_ON(mt, allocated == 0);
-	MT_BUG_ON(mt, allocated != 1 + height * 3);
+	MT_BUG_ON(mt, allocated != 1);
 	mas_store_prealloc(&mas, ptr);
+	MT_BUG_ON(mt, mas_allocated(&mas) != 0);
 
+	/* Split */
+	mas_set_range(&mas, 54, 54);
 	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
-	MT_BUG_ON(mt, allocated == 0);
-	MT_BUG_ON(mt, allocated != 1 + height * 3);
+	MT_BUG_ON(mt, allocated != 1 + height * 2);
 	mas_store_prealloc(&mas, ptr);
 	MT_BUG_ON(mt, mas_allocated(&mas) != 0);
 	mt_set_non_kernel(1);
+	/* Spanning store */
+	mas_set_range(&mas, 1, 100);
 	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL & GFP_NOWAIT) == 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
@@ -35557,6 +35560,7 @@ static noinline void __init check_prealloc(struct maple_tree *mt)
 	mas_destroy(&mas);
 
 
+	/* Spanning store */
 	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
 	allocated = mas_allocated(&mas);
 	height = mas_mt_height(&mas);
@@ -35564,6 +35568,7 @@ static noinline void __init check_prealloc(struct maple_tree *mt)
 	MT_BUG_ON(mt, allocated != 1 + height * 3);
 	mas_store_prealloc(&mas, ptr);
 	MT_BUG_ON(mt, mas_allocated(&mas) != 0);
+	mas_set_range(&mas, 0, 200);
 	mt_set_non_kernel(1);
 	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL & GFP_NOWAIT) == 0);
 	allocated = mas_allocated(&mas);
-- 
2.39.2