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 Howlett <liam.howlett@oracle.com>
To:     "linux-mm@kvack.org" <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>
CC:     Liam Howlett <liam.howlett@oracle.com>,
        SeongJae Park <sj@kernel.org>,
        "damon@lists.linux.dev" <damon@lists.linux.dev>,
        kernel test robot <lkp@intel.com>
Subject: [PATCH v3 30/48] mm/damon: Stop using vma_mas_store() for maple tree
 store
Thread-Topic: [PATCH v3 30/48] mm/damon: Stop using vma_mas_store() for maple
 tree store
Thread-Index: AQHZKhwz3Un6d8d2IEit8wQQlG94yw==
Date:   Tue, 17 Jan 2023 02:34:19 +0000
Message-ID: <20230117023335.1690727-31-Liam.Howlett@oracle.com>
References: <20230117023335.1690727-1-Liam.Howlett@oracle.com>
In-Reply-To: <20230117023335.1690727-1-Liam.Howlett@oracle.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?9IVXSVnzgsH0m8ifXaHUabbIpwiZi5+0D0w7WJ45qFoBJbIkb+FBttoXI5?=
 =?iso-8859-1?Q?0vmiKgvBlJVjebi5HyYgNxpUSGZh14wR3bKzvekUmJV93F6+UIIqcTbxXb?=
 =?iso-8859-1?Q?eZIp2I/1JeTofC6psVuBbVpPI0B13L2onyJRDMfc71JkHQZixZ+Ao8wmjt?=
 =?iso-8859-1?Q?S8LFj2XGKrsj3SSx+lnvqXWAWhBWt0cmcK59wpa+WFutu3PqptgGkojr8l?=
 =?iso-8859-1?Q?bv3ajY9JJHE1lrF2H8/bGoFBqVVZGrBGxGrIdpzkvqygKOih7hFdXN9F6z?=
 =?iso-8859-1?Q?jol469xGIq+PKBUCGCg2smpYS+RmnRmOlrRpOap4KvQZ6Rif51TCPbE684?=
 =?iso-8859-1?Q?6BvhTY2yGwlvGzOcuz/PRSPy7Bqng4m/KaBYrYmQ+4KQwERgtcbhs7vXxf?=
 =?iso-8859-1?Q?+NzWnaQRVcfoh56qLkPW41gvdzmWxiI9LjlAagVFL9iwebQHX2jeK+3xdJ?=
 =?iso-8859-1?Q?MNQgoPNTRoIwdWUyGqU/x2RXn2xOE88rgr1zvHnvFRBrwt+/3lWXUYGX9q?=
 =?iso-8859-1?Q?q1IB249/VJk/hKi+6LDoDP7rjrtH8RZrJgbyNgOj/S9BCrhce/QVj7GMny?=
 =?iso-8859-1?Q?bI/8XJHbUDveknUGUcE+gHzBz6EqfBiWiwnVoG59CwsMpZVzbRjziPLiF6?=
 =?iso-8859-1?Q?WEn+ystFRw1uaWQiG4NGQF9o/XJ461u1DTBGZH/IaNXoq0wlZUot7vHb54?=
 =?iso-8859-1?Q?OdfNSZQnN/NZex2BGg9+iFPOMUqd0hNUSauttYq2KcJihrjG5E49C0TNX/?=
 =?iso-8859-1?Q?3tIQ4KtN/GvZf4+hrL1wwcxZngswyjqbafi4KoCYYkHW3GlQ2T39m61pFM?=
 =?iso-8859-1?Q?SS559j3qjvtX9mNvZKNLiMFJ27oJaV9gR/Pi0LWxARc/uHYC0FzKnj+MLN?=
 =?iso-8859-1?Q?JVbjR0QhbijlAyWnLT2onO0nFO9MCEtDgDhcJmRTD8UePTBckhgT4o0IGv?=
 =?iso-8859-1?Q?DNzrdpEa8q7h+0e9msE3qvYOUYuvQx/0LTH0Nsql399/Yetcoiy7tbxg1x?=
 =?iso-8859-1?Q?X916SfaqvchKc66i6DCc9VpekUpEQRvrW9TAzAdrSaESoegJov1FZX9ZBk?=
 =?iso-8859-1?Q?1mwxAqbyPtRXEOyh8XkkhCY1IbtJX7Nxru2CfI9o5QddT24WCXGR8hczao?=
 =?iso-8859-1?Q?QwHGG6XCgYbO5UiUQH1uEPE8sXS73GrxRrSyqfcTtizX151nHPl+LGhZWQ?=
 =?iso-8859-1?Q?S1qzWkO2Fkc5ulV1DcN7XUdblQgSxdHKvoUfB+5IbObCb8ZzIN5nxZJYE7?=
 =?iso-8859-1?Q?dY76siB6vcwD+edYoxhW9B/vR1+w2XIzqEHPu6Jtmxckwx0aRAUlZnBrZb?=
 =?iso-8859-1?Q?amDLVx5WPdwYIO/WQKvknsFLh6UT3a5MQ2NxGg4n8bU23ia8dTg8IXVyaQ?=
 =?iso-8859-1?Q?bOazGxFz5PRw8xgxeo1TtIROmnBIFgaHrY1GqYPeoL3n93NcNMulInymk+?=
 =?iso-8859-1?Q?tne6zlHp1ZOW3ysBABq5GbgHw++2MgqSZYgqH0Q1mojKMcRL4R+EHmR+o2?=
 =?iso-8859-1?Q?pyj37/tTHnluEp9Kx+vFexUF3odrqAN0jH/Eicr+Xk36FNWSkk9QDFvCLU?=
 =?iso-8859-1?Q?4o8eRhIyPQpBEo05rG6KowB+NTw1tNKT6HitjTuudesezOrnLMbq2YLylA?=
 =?iso-8859-1?Q?WkmAtvg3ws086zmrmgSK3p60C51KKN96utePuIGZhvgy2Dw7Gz6dhb3g?=
 =?iso-8859-1?Q?=3D=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?iso-8859-1?Q?VyLf78F2bjaAgz4Fk29itOFNOO0cyPBDQsVmuMF9URziQrQs1ZtrEL74mJ?=
 =?iso-8859-1?Q?hA9sxzJr9ftMXwhOKwMf4fJYBMLOJPbYdtlBC480FBtMNC7OxNdHIxm59y?=
 =?iso-8859-1?Q?AVee0YTsDxCTEvvP/ZhoTQZAFW1CROqiaLExjgAeCa/CGRyQViRAn6Bmcm?=
 =?iso-8859-1?Q?E2ECRJZO5DQCPHauRamQNXukG0la+H8/XT2nBqlGkxnH9iRJ3pI10hkdiR?=
 =?iso-8859-1?Q?sJ4HU+GVlKejrZrnv0Ifg4YOod4ZeYAe+gAKx1Q4x4pHcuoJbRXQkXqB0C?=
 =?iso-8859-1?Q?DCr2ja2Jq+kYbHt/UieVBJFsO3AqebwllsK8psgXyNj0zDQy7cXGKkWX31?=
 =?iso-8859-1?Q?b4/4IXcBqgIIjC/kTzN0yfpeIdbBcTd/PjPoYPIH3pjXxbxZ2KqpllZ3OJ?=
 =?iso-8859-1?Q?GuPzir1QX6kYOlahj3C8QKXfmetUQap7GTyOHnlQpi8s869xdEH4asJpiq?=
 =?iso-8859-1?Q?AizrEk4UYXvd/Frs3At8DqkExVrgrEZWXlcXllJUmo0d0XdWGT/0xnvCCI?=
 =?iso-8859-1?Q?qVDoM55q5m1MtlUUoI5+vZhuVOfh3nybwGOZvKYXS+f++tD2Pe0v4NAuEu?=
 =?iso-8859-1?Q?HHeqOErCXvHbZ2hdK6b8Ni+YSWHzkIS23/80hkGsrmLaooZZjqHfNeLFyG?=
 =?iso-8859-1?Q?v5z4Obni1ky0Qoy+T6elCEOVBBWLcDaUb43g83EN0IDIn1xW7OSZiZe5gP?=
 =?iso-8859-1?Q?5WknQIm57wZQABRm1gUmpWJjEOKF6CaKR7GqTJpY3ZwtzwfsX4dQt8RSCo?=
 =?iso-8859-1?Q?TungG15CnXfeUCdOjVUILNqRujTzApmIH/VLknAupPe4dmqumE2piJVEg0?=
 =?iso-8859-1?Q?nIuBn95vrdehO+5ottCEHv9OBEn0gZFKzg4qILM+px7q4xR9/9K0PdcOuV?=
 =?iso-8859-1?Q?2R9vHDJajqQx+wvIPzhzOxEaRGaKIHWpbxvaglCUVD/CRoTl3Ys8vl5ayG?=
 =?iso-8859-1?Q?1Iiu+Mb8jnwQ94k7fPDpXerLLMXcNeEh0REjbGJ3QML0E8OBRleGh/2ZQS?=
 =?iso-8859-1?Q?VXFDKQsvhTLegd6JT1Th5SR66cdxeKjNISeYKc?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b0383868-e724-4938-5cf7-08daf8336ac7
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jan 2023 02:34:19.6091
 (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: ihdsyY913nlrM094iRldbP/q48+mo6j3KFe5M1BvdoZnecyo68XiCSY0UY9Tnj+uPUZb5VwxS+9pjKVUlGEElQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5538
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.923,Hydra:6.0.562,FMLib:17.11.122.1
 definitions=2023-01-16_18,2023-01-13_02,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0
 phishscore=0 suspectscore=0 spamscore=0 bulkscore=0 mlxlogscore=999
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301170017
X-Proofpoint-GUID: CAhge6zkWoe2C1NJMMrL1AtaPlYlnb_y
X-Proofpoint-ORIG-GUID: CAhge6zkWoe2C1NJMMrL1AtaPlYlnb_y
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

From: "Liam R. Howlett" <Liam.Howlett@oracle.com>

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 | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/mm/damon/vaddr-test.h b/mm/damon/vaddr-test.h
index bce37c487540..6098933d3272 100644
--- a/mm/damon/vaddr-test.h
+++ b/mm/damon/vaddr-test.h
@@ -14,19 +14,26 @@
=20
 #include <kunit/test.h>
=20
-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 =3D -ENOMEM;
 	MA_STATE(mas, mt, 0, 0);
=20
 	if (!nr_vmas)
-		return;
+		return -ENOENT;
=20
 	mas_lock(&mas);
-	for (i =3D 0; i < nr_vmas; i++)
-		vma_mas_store(&vmas[i], &mas);
+	for (i =3D 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 =3D 0;
+
+failed:
 	mas_unlock(&mas);
+	return ret;
 }
=20
 /*
@@ -71,7 +78,7 @@ static void damon_test_three_regions_in_vmas(struct kunit=
 *test)
 	};
=20
 	mt_init_flags(&mm.mm_mt, MM_MT_FLAGS);
-	__link_vmas(&mm.mm_mt, vmas, ARRAY_SIZE(vmas));
+	KUNIT_EXPECT_EQ(test, __link_vmas(&mm.mm_mt, vmas, ARRAY_SIZE(vmas)), 0);
=20
 	__damon_va_three_regions(&mm, regions);
=20
--=20
2.35.1