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:     linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        Andrew Morton <akpm@linux-foundation.org>,
        maple-tree@lists.infradead.org
Cc:     "Liam R. Howlett" <Liam.Howlett@oracle.com>,
        SeongJae Park <sj@kernel.org>, damon@lists.linux.dev,
        kernel test robot <lkp@intel.com>
Subject: [PATCH v4 30/49] mm/damon/vaddr-test.h: Stop using vma_mas_store() for maple tree store
Date:   Fri, 20 Jan 2023 11:26:31 -0500
Message-Id: <20230120162650.984577-31-Liam.Howlett@oracle.com>
In-Reply-To: <20230120162650.984577-1-Liam.Howlett@oracle.com>
References: <20230120162650.984577-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?u2sk2EKZ9Uo93vIfZlqHwOyIhKOrHa2I0hjbfU813rtkWt0GfMX505WOCilx?=
 =?us-ascii?Q?1xbtaHLA9gwam5FwnOKPkwfSOhUpqm88ml/fCXpW9+XYHfnnZxtNTaFjcONV?=
 =?us-ascii?Q?hZGpXx4fA1+7dgdQl9IvpOOnoCs6yLnaaPPrVbNRnMsdg5N8FAdAQ+hUE0a1?=
 =?us-ascii?Q?CaNy5gdUr2aXwhLzqH4iQcS4KN94S0XmOGRFsGu0zM3XCRx+EWSLAyn50MqE?=
 =?us-ascii?Q?irGdVHQ7quW4QoCbjaREYY+fxJiRBSIUz16SWb7o1qesvLyROzzLNEg7n7NR?=
 =?us-ascii?Q?MGceJ69/ZbxkrS9BUdAB5MrAm6kpYjMUOoWHVLczYvQUq3M2A2ARIJ4l9d7D?=
 =?us-ascii?Q?OaBm7PN5AgeWHIN2hHmf+xpf2/qTnSACk4WdYJoFaX3L+SlWER1QPKama9Sy?=
 =?us-ascii?Q?UWXf9bel3qPOOYT12eYsPiyHao/s72qAlb5SWWgNl1sVSI92KKYsc3MTdSjx?=
 =?us-ascii?Q?Q5VHj/6naVxmShDDDrNUQ8mwZuV9Ld7cEDftF36pBEdZLvJ205nbK2cicJb8?=
 =?us-ascii?Q?C79xIJYbJ7pHvLbJq4SOiV1Wl1gvVNcPeZzLs9wadBfT72+TdTrOkJWDkfCb?=
 =?us-ascii?Q?I20RR2nbBm3WsFPW5GfzeXCm3fQ/ASNhgOd5K9xRrQgbylqKAsxhtVjWVbA5?=
 =?us-ascii?Q?QtAIq/bssz4DIlWfK61nb+oIZ+u2klG2MEmUyk+bXXeczEEOYbWJEy+9xWa+?=
 =?us-ascii?Q?sLgTSDr2dQD/qzn3QNvRv1EaqlTc9gV0oKEJF0EWHByY6yvgfJGRyTcrV4ak?=
 =?us-ascii?Q?vvjP4RqZpAOCfYXMaZ4ateeS60sXfRcRXGIqFvh0k15Aq7aQgQqm8AGvt7Ge?=
 =?us-ascii?Q?axsoOG6Z6YlsHY0jci01gHliAjwPz9A4GoRen5JKC8JdkBFcxzCUHNwF1BWr?=
 =?us-ascii?Q?GMQXS4T0dPJE2I8ArNKKFSfKEhgq65XNkepSB1bsyxgVIFXCG2S90qSS0yXA?=
 =?us-ascii?Q?3m1AgnE95KrKg+XCV2pAMBhpBWL3Hi+PwoyMx7gVJ2R/w8fj71RosqGMm9Py?=
 =?us-ascii?Q?6GwqSEge7JaCQF99qy76R/L/EPsfXul/jnaHK8bdBe9iwpqUBJpePLzBP9L5?=
 =?us-ascii?Q?hbOLVvokRG2hTLGZUPOb6rUhQWQybOZKmIPuji5fP0iAlw6sxKmxD4zLRuNO?=
 =?us-ascii?Q?1sbxoB6Q1NuwHywM+ZnZt05SOZ+10CnSGyUijJS2lavGzYpHLpXPKYlwblqA?=
 =?us-ascii?Q?g/RVpWk6tAqIsZNi9aXa4yBNVPeUUX7YBFWbgUjMhwFOL3GFuKog+Hwu4guh?=
 =?us-ascii?Q?IkgMK7wxW5WRz9nCXc1ImYQVG9umKT2UW+67TXsg4jAU0zLgLwJelHQaTAwN?=
 =?us-ascii?Q?bzBtznbTik55u+5sDl58yEIkDxxQFM8H2YOBNUwr6bHTBcvIfJGhN9O/arSH?=
 =?us-ascii?Q?rowFi8h9ikRh9jqbhoE2fG7xTR1zguWxblFm2dy7xyXjkWJEYnucDWesm8Ar?=
 =?us-ascii?Q?wWY9ZAcvouQ6eJT2nYzmahHvCSull4xqe8BnYD4BM0gLJIZcTIKJKpTUSoLs?=
 =?us-ascii?Q?1aJYzbq8+A9GjBz94l25Dd23hySl6xlqkaKKuZpp6oRUpAIIf4y06H9ybZzi?=
 =?us-ascii?Q?hONpSGEvMR0NjmDOObPjQmAdnEn5QYgMyUyFRydJR1nLv3Qx8cnnJMhDfg/n?=
 =?us-ascii?Q?GA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?0il650yBtD7VVECLXg6/RPXCWH4u7w/zlhXfyeUtN+3K2SiWEo13YsMIiPRb?=
 =?us-ascii?Q?+f9NYENy/fqRIbGJiSZqUe+xNIQz1hgLssLCHg+BUKXctaiciDlI/qvAbeO0?=
 =?us-ascii?Q?udNrcEQBO/vbsXC8CzgoxsTCzi4auY/pBHaqKM6KUBIN7a/3P2Z03Yff/OGF?=
 =?us-ascii?Q?nWj0YKIoxHQCP7R83EurJ4cxnpfj96CW57xBxsV5ZLpXZxBbtuG1jCk3rMWO?=
 =?us-ascii?Q?8IYRlA/n8d9/AuYjRv4yXbRox5+4EFDgcyI1WfBltHm3gmtYMM7/wrYv8mtw?=
 =?us-ascii?Q?kOaKZoXovbWiz/O2Jte6wBat/E592g3Thg5UQM24UBH2wayS1oXIj5IByWTt?=
 =?us-ascii?Q?dqB9xvTbIFTvCeUwDV9by4p1DB8VpS0Bkuw5QQa0D0Fy0zwTP6VoOFMAYaqm?=
 =?us-ascii?Q?CTeQeXvcqEtdQHCByEzVHlSh1/VuqQpZSsbtoQxj5wGCZLwr32pfAph4joQ2?=
 =?us-ascii?Q?vXFPuPE3SFfeI3ETpU4KjoQInRgk2EHGGBQZgzUqO6gHNcFEF7CVUMSwfh0L?=
 =?us-ascii?Q?7QXuP2VVT8iEViDNT41unifsF+7FmtbTTxtAeARlECp01kjxyei43an9nb/O?=
 =?us-ascii?Q?LnsSHmKxcsXoUJdtw3xPpmGRx048/eU8+WB0NN4j9SBh5jceReX/ltWGmc+D?=
 =?us-ascii?Q?A9HlpQYzrac2909P82vCuMgCjqPx0Tll3UFJRpo69AbAjmimjmh1RMY1Vud8?=
 =?us-ascii?Q?sn/BQSo95/OlRP7wioYkfdezP15YvH4SnU/whlFWXX8LmosWglmCG4FDA4RJ?=
 =?us-ascii?Q?Wj/svlD/MVX4FKlmOFmNy9SNwNGcXhNU4VBxhmCLZGk+jJ6r1AkeS74ThYtf?=
 =?us-ascii?Q?TvER8zoxh/HWQlK+mwG/42QW9ii+nyq1+oj49jSYO3U9iMCrE34tTdOrw2zG?=
 =?us-ascii?Q?0ACkzpud0ViWDP38V/whFqIvUwJNBMCLAJkpOiGxQfCCkiKTWNMEaS+3eod8?=
 =?us-ascii?Q?7f/hpS1+4dW6Yu8Ewj8/eENz0lKIvdmezuXg4rB1HGTsr3WBXV11GPIZmv8S?=
 =?us-ascii?Q?kUHN?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 34bda718-6598-40ef-7881-08dafb035cd7
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 16:28:28.8538
 (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: h89grnbE46+VW71RpZPRbqCV5YJIAc4hSn8lr3we6MpLoX0/ospOqrEjh8RIKg6opAJuvfFddVqqEvFP5IME8w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB6381
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1
 definitions=2023-01-20_09,2023-01-20_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxlogscore=999
 malwarescore=0 mlxscore=0 phishscore=0 suspectscore=0 spamscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301200157
X-Proofpoint-GUID: Yir3eKu-FTDfnr3b3AGrDtg0yo9fEHvR
X-Proofpoint-ORIG-GUID: Yir3eKu-FTDfnr3b3AGrDtg0yo9fEHvR
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_H2,SPF_HELO_NONE,SPF_NONE 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

Prepare for the removal of the vma_mas_store() function by open coding
the maple tree store in this test code.  Set the range of the maple
state and call the store function directly.

Cc: SeongJae Park <sj@kernel.org>
Cc: damon@lists.linux.dev
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 mm/damon/vaddr-test.h | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/mm/damon/vaddr-test.h b/mm/damon/vaddr-test.h
index bce37c487540..c4b455b5ee30 100644
--- a/mm/damon/vaddr-test.h
+++ b/mm/damon/vaddr-test.h
@@ -14,19 +14,26 @@
 
 #include <kunit/test.h>
 
-static void __link_vmas(struct maple_tree *mt, struct vm_area_struct *vmas,
+static int __link_vmas(struct maple_tree *mt, struct vm_area_struct *vmas,
 			ssize_t nr_vmas)
 {
-	int i;
+	int i, ret = -ENOMEM;
 	MA_STATE(mas, mt, 0, 0);
 
 	if (!nr_vmas)
-		return;
+		return 0;
 
 	mas_lock(&mas);
-	for (i = 0; i < nr_vmas; i++)
-		vma_mas_store(&vmas[i], &mas);
+	for (i = 0; i < nr_vmas; i++) {
+		mas_set_range(&mas, vmas[i].vm_start, vmas[i].vm_end - 1);
+		if (mas_store_gfp(&mas, &vmas[i], GFP_KERNEL))
+			goto failed;
+	}
+
+	ret = 0;
+failed:
 	mas_unlock(&mas);
+	return ret;
 }
 
 /*
@@ -71,7 +78,8 @@ static void damon_test_three_regions_in_vmas(struct kunit *test)
 	};
 
 	mt_init_flags(&mm.mm_mt, MM_MT_FLAGS);
-	__link_vmas(&mm.mm_mt, vmas, ARRAY_SIZE(vmas));
+	if (__link_vmas(&mm.mm_mt, vmas, ARRAY_SIZE(vmas)))
+		kunit_skip(test, "Failed to create VMA tree");
 
 	__damon_va_three_regions(&mm, regions);
 
-- 
2.35.1