From nobody Sun May 10 12:49:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98244C433EF for ; Wed, 4 May 2022 00:26:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244680AbiEDAaN (ORCPT ); Tue, 3 May 2022 20:30:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244638AbiEDAaI (ORCPT ); Tue, 3 May 2022 20:30:08 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 988D218E28 for ; Tue, 3 May 2022 17:26:34 -0700 (PDT) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 243KsJW6018676; Wed, 4 May 2022 00:26:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2021-07-09; bh=UMVtfXJ0Dlf1aeg6H3yWSnihQ4t5SMLU/QgHB0zb7ck=; b=nNvq1G67dkMayRjWXetfV34oIYkJD2KF/2G3khY5CJwViDmipr+0vLPqcMlSCIHsu8St u3V9wqXuEVykWREh3cuGqf1ED4NtFU9f6G3phC169pUaUp0Eer90jojUfyKnxTyP20wq Ym39/Htu3jJ4zwUQqP0Se1k8WehnS5/3W/CnfwfK+bY2uGQwsetslpKaYOe81RQtpeUL q3SPjloOCOIavGgaL7M3CgFWC0xJghXAcZCp6TjvY5kIZFqRo6CLo0RaC8+JaT+8LlPS vwMJusfgtrwt4Ih1sPKMocNDYxQkY483q0osUXAa/OZX8MgkBweiNMESP0OiLFh8qMid Ew== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3frwnt733e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 04 May 2022 00:26:30 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 2440FRZP031746; Wed, 4 May 2022 00:26:28 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam08lp2169.outbound.protection.outlook.com [104.47.73.169]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3fsvbmu7qk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 04 May 2022 00:26:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lWD5nF1I6K2gcGZzsjDD9QXrzYgP4Sh99wMVTxPpwlA6z1HmwhfZ1/kwnpumNKie+7/LU0berp3havi964ra4u4Sv/DIr30Tyj1kmn9xDH6zGUl1/d2U0xCJ1kmMlXsiTxClnPrGiAj3Lkn6hSz/WkVrd9tC5n7Rnb057zyWeGyP5rGY4NywCQDbJb74dynvJCawRJph47tSS8iYvVE032vlXiONektXskjhdcHDH12T59QBCryAxH8ir1SKw71dq/D1jpExouP4vtdnSzVuo2xZ8DdCqi6xYFjWKSqYhDLh0MSrIwH8EHX/MZGotrcrAoOtQ5DUFm+qikvA9apPug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UMVtfXJ0Dlf1aeg6H3yWSnihQ4t5SMLU/QgHB0zb7ck=; b=S6Fz6keQf5E0opDFJMYEhENicsCneTyybXJ1GOEK1uxg7ly+R1A2kjYp0OnChPgvZ/uz/yTH54QTdWtxKyTbkOEgpxKRyTRG6pg4LoYYVn4H/wJV0TVJdF9ZUyv2Da2lBHYlD+oN8y3Eo3xKnDjLXU0gjIJgxnCzMNN4PAwa1bNWH0a9JYpQPl1QUoxcB1hYZphE0s0hlhwBgx0eZ0nWaBEIPjLSWrtf90vW8TW1N+il2YJNVfNxdFNHuNm3J2KcGCA0x6mBAR9c4Z3AO45RGm/wY+34pVT7ZZtvtbVWAuieClGDhCZVXWkwn4H8dOu44h5BxxGxkIlLGMKH+KF2Hw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UMVtfXJ0Dlf1aeg6H3yWSnihQ4t5SMLU/QgHB0zb7ck=; b=Uvjy3kI3HCvKUBRxkTrda0PMQcmaNXjbcx7+e6YorIPPZaZRvlSxMKmvKh+GycNmbnQTFaaCMa7WrWX6Lbia1dsOp1Oiuwz3fPdlvsNswXHNacxq0VOfKQ+8TbWk9G7y6tCRmOcS2KXU3MvggPSlQRkyIQ6/WZGD6gCpJnbZtNg= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM6PR10MB3081.namprd10.prod.outlook.com (2603:10b6:5:62::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.17; Wed, 4 May 2022 00:26:26 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::318c:d02:2280:c2c]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::318c:d02:2280:c2c%7]) with mapi id 15.20.5206.024; Wed, 4 May 2022 00:26:26 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton Subject: [PATCH 1/1] mips: rename mt_init to mips_mt_init Thread-Topic: [PATCH 1/1] mips: rename mt_init to mips_mt_init Thread-Index: AQHYX02XagZmmFBYlUCIETC2LE4BNg== Date: Wed, 4 May 2022 00:26:26 +0000 Message-ID: <20220504002554.654642-2-Liam.Howlett@oracle.com> References: <20220504002554.654642-1-Liam.Howlett@oracle.com> In-Reply-To: <20220504002554.654642-1-Liam.Howlett@oracle.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.35.1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d3a02a32-211c-4c8a-7bb1-08da2d64ba04 x-ms-traffictypediagnostic: DM6PR10MB3081:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: B7Vjii1t59xNddnDJ3W8hufJR1VOq6BiB+uVKC0ukOmVL9eZ1ePl826ADPMoA6lXg2phMT7c0OARM0yO8fdI/SzOl8ZuAOnxjwB/WFoy/PDZYtpASmv32/x5JpzSy6wqha2kGuwZJejfm+yio1yxW0hdKEYTHLQWZcI8Gxpsju96oEvoe9EgSFjC1Recj5S1G9x4InaK2A+Oe1FU86tcCqOn+LKC+B22xdQqP0VFDXFUuYDJJBYS6FJwgGp6XttKmbWVY0VQQTFgD2LsC3jPaoru60uLCOEs8ThVy7s/AFeVHJR3NrcPt80Des8Ryy6D4cLA/lVhJlrOgXC0+Qq5unVRrNdhirz7T4T658pNG8vuk/ibnJT+RpKHZBY5RkPTZr2tSIj0dBQKtp00wCotnFsux9rFeScti1eDcB00OetbwuQarl/zko00SpHgmq409aHJOCDvsSdZ8iVvYuB4kr0ZPHKCJACUmG34ZzRyi6f0Mm8Goh1icZtCnu7moRAR/e1cBBT5i6BiHrpjxvGDX3YkRvhWO7/Stt50AF+Pv7EPkFLTa6FVESIOZBVwnP2k7etsTAfFNike2CyCuapD5ZNV3xvgsdqMLQ/DHBLFRgYSyZ8aVW5FGLsNsNgQnAuTH5eGOOIZitpUirmgLZPv6vU7gVLQ/5y76yBfppIgaFLP8DuFf+BOnTq3G2a/1rl/KAAiAc0FiztKXx5I0UMUvg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3022.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(36756003)(6486002)(83380400001)(508600001)(66446008)(66946007)(66556008)(66476007)(8676002)(110136005)(71200400001)(76116006)(8936002)(44832011)(4744005)(316002)(5660300002)(64756008)(2616005)(186003)(1076003)(26005)(6512007)(6506007)(2906002)(86362001)(38070700005)(122000001)(38100700002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?tnliE9osGAhUlcNvX27XbbngsY5utv3vCqlkNPAjtl/+ywZ4X+YYYj2U64?= =?iso-8859-1?Q?BBI+nAAdqJSLwMXfklIWI5AVQ6z6HFdwPkDV5wBO7I31cMKpEbGyJt9c7E?= =?iso-8859-1?Q?0SRBEIpbery52FPwQfvaskdE6YBKHRVRMyVFHw5wAak1l/LotqVeTw1CW0?= =?iso-8859-1?Q?l1GTQ3S9630Z5v4hDQ7MG3femuA/nRpMKM/7PKF6FQEu2zDT2rwFQEqLxg?= =?iso-8859-1?Q?B/qDshbJpa3+/a8t72CITSVqdxDQPr+Voa6oZ/kkIwzOQiucemACXO1UsG?= =?iso-8859-1?Q?v4idQ+4iP++9dW22S9nPFiNw19z6zuWbEcAB4brJ+ZphhkB7djD/Mb+sVl?= =?iso-8859-1?Q?C0jswKcMJ+F1kajy02yVD35BJteg+rWXFtKYEGcj0E460DHRy43S5laB6H?= =?iso-8859-1?Q?+RzfhYZlouTCMC/nWG0FgMeBs0BCjJ51jgdh8U8QeQyjRDeav1Bih5g6y0?= =?iso-8859-1?Q?28QsjhxTmTjS/gVtuY8ZG0JcJInrvRlzzCv5vC+aMTmhW4+PUNj7LYAE/3?= =?iso-8859-1?Q?aLN8Guxr2JfYC/H9Z9S/JrmvV7dxyfIpNSd7/10pDU8q3Wvdg+hYHifslq?= =?iso-8859-1?Q?Vk6VbXUMYDGfYXC88KkGcFzbAGGlbq/cWv9Ry4COq30UC0NyFD7tRt8g4l?= =?iso-8859-1?Q?gQgLZYDSGZxpi0kNigECJXsN/f+IRYSbt8QKLdrgQIJ7M0oXNqg0n+W7VC?= =?iso-8859-1?Q?6OfX4KBKD41njnPEFoTog16Gs1GiZ8HHPQwUXEF7LBtzJLKhsplkTc/fqn?= =?iso-8859-1?Q?7C2+rwNzD+XCjuz4rlkJ7hockqa5SmKk6FsqbKccKPiuqUOpdLo518CJ8j?= =?iso-8859-1?Q?3tX+JIH4CZDPs13wiFUGfMxunzALNrrtjvwBvYBJCk+2jtYk85LrlKgAl9?= =?iso-8859-1?Q?g7DEOIZybvOf6wmmh2TAlMQHBguHjMvSq+lgGx8bbUwbfw5r9AeE8pMj28?= =?iso-8859-1?Q?Vlhe8gVaOcotGI4VfSI4+H3mN6gzH1ZqGzv9CAqKtCNg5IYRRCl9eHZUg/?= =?iso-8859-1?Q?mhYzF5uHCf/pHYXEeMFhgO2deRTsUYC7RNC2kXJxpyrNtNZZOCe1HYGg6T?= =?iso-8859-1?Q?WSu75kf9PM9m2golmiF4UqLvJoyO6NQYPgttMShdXqlm+SDbokeuM0ioDa?= =?iso-8859-1?Q?JQpICigNjGPriRiqBIh1O7MDhAYy7huJv7IULIpPBARH2+yqPl1dn1MYJq?= =?iso-8859-1?Q?VaxbO0KRwtymrxWPR/nmubH2vxqkGh+PeEX1eEn9TFIsbK6judnYImxqdH?= =?iso-8859-1?Q?B/A9HPGKX26IOkRu1vfFdpGq2XRxdqAINBvTQ3IuSpd4RnwREhepXZ8NVd?= =?iso-8859-1?Q?FCBCSqef8PR97HqAEPFTfHKnw5Lue/5XvShIfwaE6OIogwDZsvRehpM6/U?= =?iso-8859-1?Q?uGAZ8LZjLj4ejaQ7V2FDFNpJJpOoe8IWEPpN7Ij9pcsNQQEWcZVU/Cn61r?= =?iso-8859-1?Q?0Xw8Cju7OPZOWfn/d3mgxk13bLO4OWLxu8IUvUl0Yvmn3xMjSqRCXT0ugB?= =?iso-8859-1?Q?VXEwyqXSa6ETcuNJYrf6qtGXKBpKe9KnoEKwbrymzO6IydLJRJz84rpGYE?= =?iso-8859-1?Q?0hHx27LvXXsi+b1cGqR6yGLpJWHZXpt1do+Ziy9b0PsiBxr4zOWXH43WP0?= =?iso-8859-1?Q?qpwUFZiIfP5gE8yVrYqgBllWwkDdDJ3fs5g8Y7pc7ugaXuRMEBxqFnKnVX?= =?iso-8859-1?Q?0PkPOo3dh7q7ngzCereURKq0EBWVDrgqlZ2G3L5MX/3SJIaY1gTcyWbNNy?= =?iso-8859-1?Q?rNc+99RjIUtJRwucKEqNyOtJc85/yMGszMu7aH/mnD0IthedBGmyK4+AoC?= =?iso-8859-1?Q?8XyyVK/L0+vqnlxwVinMBb+Ws5LnISM=3D?= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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: d3a02a32-211c-4c8a-7bb1-08da2d64ba04 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 May 2022 00:26:26.6869 (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: +270mVuxwDk1myJ65J+9h9wSRCN3X5Rc8qZoPGLk+4454GzN18qHrlvGKQW83LagGXFJdWz1QWQA03Vi8+/xGQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3081 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858 definitions=2022-05-03_10:2022-05-02,2022-05-03 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 spamscore=0 malwarescore=0 adultscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2205040000 X-Proofpoint-ORIG-GUID: UuztD96C5fF1AlTU4I8ecxDUOKQ6VHOU X-Proofpoint-GUID: UuztD96C5fF1AlTU4I8ecxDUOKQ6VHOU Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" Move mt_init out of the way for the maple tree. Use mips_mt prefix to match the rest of the functions in the file. Signed-off-by: Liam R. Howlett Reviewed-by: David Hildenbrand --- arch/mips/kernel/mips-mt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c index d5f7362e8c24..dc023a979803 100644 --- a/arch/mips/kernel/mips-mt.c +++ b/arch/mips/kernel/mips-mt.c @@ -230,7 +230,7 @@ void mips_mt_set_cpuoptions(void) =20 struct class *mt_class; =20 -static int __init mt_init(void) +static int __init mips_mt_init(void) { struct class *mtc; =20 @@ -243,4 +243,4 @@ static int __init mt_init(void) return 0; } =20 -subsys_initcall(mt_init); +subsys_initcall(mips_mt_init); --=20 2.35.1 From nobody Sun May 10 12:49:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45CB2C433F5 for ; Wed, 4 May 2022 01:12:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242666AbiEDBQW (ORCPT ); Tue, 3 May 2022 21:16:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238289AbiEDBQR (ORCPT ); Tue, 3 May 2022 21:16:17 -0400 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF447B75 for ; Tue, 3 May 2022 18:12:39 -0700 (PDT) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 243KctEm024988; Wed, 4 May 2022 01:12:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2021-07-09; bh=wMnXYZ6ilXCCmNJwmRifegQ+iz/dSmHFhbRUOQ2lNXg=; b=BFSRW9wEgqnVVu/t0IDQWGUBa0GmdZTfO7Ev0j0ng+bdcJiAyQX7seAv1zlIPxzW1aVn Vt5SogMtCFrrP3nvfzZszBDynIipblkxtXYyx4Z7O7PhuDxzLv0R4+eu4lBYFHkLUFi9 +978JFc+Q9RIaDvszeExWSrVVbTBZE0uHtbSZZV5TP4pvP1UgUHTc4o+oH5yyhje1A0l txMQMUjnXFOOZ8jM02o3W6S0AQ/DmvNubi6Ctm/8kCtUf4oKm5Bgev01cz16ahxZFLuT LsR+CNLGDetUgSEXsb3SMc53EHQWOp/0nSinHgnxlhHGhGJFVlcTZ4x/QFSmrbOff2OC Uw== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3fruw2f6a9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 04 May 2022 01:12:28 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 2441As5n020085; Wed, 4 May 2022 01:12:28 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2107.outbound.protection.outlook.com [104.47.70.107]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3fruj9223a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 04 May 2022 01:12:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FV02A98bHCXj/GCk331MgxzerwEX9mltNwHxyEC1XOP+wZbbq1l86KRBHmEivjqAKyRWElv2sNsrb0lDNHcwtPny7h3CecKjEoufZE3LH0CHo5WdQbI741/aKYu/65PEJAU0zhXBOmaqjvVSXDPtYgAC+X1yqyHTUyhGpIYcyKAGTCpwMWHSC8RL4E8v6c0ey9p5HfEYbQgMHrbRJgLUqFXg0GOWE5Q6V2DUh379MNGLA33O6mBHOgwiCpq3UhhA9DTqfq1b9TFXGyeZQXhQM4yn14CK5jrkneabUdZL5Wcsq4Csb1UhNZkap/Ry5xmcLeLcgtK/sClZWgBPo8/bfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wMnXYZ6ilXCCmNJwmRifegQ+iz/dSmHFhbRUOQ2lNXg=; b=bc5j457y4jYDmSG7XhdCPHjEU9h5Zb02+4ADjJXVIhDhfS0h4FjmIYM5gvHpJ8v7duMMS+7Mnx7aphtfC/2ktCw3Z3EW2jZMFTbBYbrwsDitA+gJhTYkvvIcKIyy55P2/aStFLt6jX/zpugOO0tTXNeUeJ5ZIpXHHuPrSHlDCzUn9v5M8UOjQMkEcXPAo9TeFb+sqeOYpm1QqtyJbpHHeHHm0jUshBtg3tW3WrbUDB863lrzVaKEuT+C7POsmS9SLCXbYkQDW/u9Jm/6wCxxKJbs4DyNZELQziKaAATRSqmQCdvWbTiINuzS9DwwnOPmwVxqdQsPtFSuIr6RnHTPYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wMnXYZ6ilXCCmNJwmRifegQ+iz/dSmHFhbRUOQ2lNXg=; b=MVEMXXHaCjw9iayVJ5TTtXfCOPya5DiJTjs7Q3DBagG3Xl5EoSWIa4kEs36KNskcTabJeJ1hXzv3AZFWCfJX//JT/2ue/v1vzYWQeYT87XGO5qxdUG4ZSDXDGxLPT1+Wigw5O6C83EJaHV87FbTvSl4DzX49/mTpaeQq9SJLLkA= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by PH7PR10MB5830.namprd10.prod.outlook.com (2603:10b6:510:127::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Wed, 4 May 2022 01:12:26 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::318c:d02:2280:c2c]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::318c:d02:2280:c2c%7]) with mapi id 15.20.5206.024; Wed, 4 May 2022 01:12:26 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton , "damon@lists.linux.dev" , SeongJae Park Subject: [PATCH v9 15/69] damon: Convert __damon_va_three_regions to use the VMA iterator Thread-Topic: [PATCH v9 15/69] damon: Convert __damon_va_three_regions to use the VMA iterator Thread-Index: AQHYX1QE+HvcVvuhWk2ltHXx1nzXSg== Date: Wed, 4 May 2022 01:12:26 +0000 Message-ID: <20220504011215.661968-1-Liam.Howlett@oracle.com> References: <20220504002554.654642-1-Liam.Howlett@oracle.com> In-Reply-To: <20220504002554.654642-1-Liam.Howlett@oracle.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.35.1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3a9024bf-e8a2-4fa4-a46c-08da2d6b26cd x-ms-traffictypediagnostic: PH7PR10MB5830:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: pgg1b/Sag2KxliTD+rmYG0L/GONovo2z9V7yZCz8ngyoORAO7UHktGsxA8g7J4pglnDLCyZpG4V1WWvdDSzZrv1tA+4l9PNyu7z82de9dCR9qigBc9ha6y7EAIdtHAHJoeu/QliJO3RlGU+ad+S1UJyehN4qtJMBovklcE1xttw2j8ymWhc0Xh4HU5k8lNk11oJ801RZ1Z4W/ucbbIXFM+UAvJMbMsf9HgPO5qLF1VIrSwjz87zJOpyn9oeIhLglYdm0LsV7hBS+QQaLzbgPTT2ck5GLCYTojXjoBU0NRj/IKmS3Lez1yOau3QK3xM1SAeZGJUDQEtGBg+E7IVr148dvsGFV43ff4B5LoPAYMoDGsG0KAwdoTOS6fEJgwJJNt8S4U/7clRbJJRion0yQqoXomOeWmaC6RobJU7m7bbVh3d6k3L4WgHoYNSwljXzffsMxi8NEaDWBaRg3MBQs6rSytmlC1pBTQlut4WQ+vwJ1AauQ6n9vP4HHbiP4RxMWMAu+hqx7lRKHs3c6eCYPcst6KMM8J38Dqa2U+m6q09/8kCql9L3wPt21FNTT+IPuzQOtrSNdCnn16xABqJLS53Qek2XLCzKtkFh2e6IptWgeS+YO1HVGGhTtP9XVjb1XWCxiabQ0DiCX1HFKcO7wN4TlrEnBSR4bpXZc1SlbnyOxFh/eWogsQy8uOWGszJfwZ0u9XDBoyMQ18OOxOgncSw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3022.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(86362001)(71200400001)(83380400001)(38100700002)(38070700005)(122000001)(316002)(110136005)(44832011)(2906002)(8676002)(5660300002)(64756008)(66476007)(36756003)(8936002)(91956017)(66556008)(2616005)(66446008)(66946007)(76116006)(1076003)(186003)(6512007)(6486002)(508600001)(26005)(6506007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?/mD2xn3N0kFKerH7RPBlVX6XtmIn7IRqpXB3JPP/P8s0w0A+D8/73mHZlS?= =?iso-8859-1?Q?Z+L9oE9jERdAXMRmQ12jbZjTKH8ma92Ac9J7cMpU/bLaQIbSi0tyubuMxj?= =?iso-8859-1?Q?+QFJ2PH0xgamKHy/IGEGT3mY6a5aGi1M6kPixM5mFtGG6Wu9+TuTBXImOM?= =?iso-8859-1?Q?G3h9DINdqreh8SZRHV8jeByprd8+hcdSo9pScqUieWZvIAafAmR3Ykxjo7?= =?iso-8859-1?Q?iSHCLINYppkr4kwhGz2TRVgdUk/ESL44HX0eqcRm6Fah+9OwDkO6sw93BY?= =?iso-8859-1?Q?Fm94UORdOOZvKruRvibYrCcJMODVZoExafgd5dyOARPx+OBJGskKu1Gvk9?= =?iso-8859-1?Q?zrVMkMUcUFUM/c0cqQF3jSVlaXYcOTEzkmYDr1DW6+q/h+4XZwa4kDkMEH?= =?iso-8859-1?Q?kx5h53QvzXFdUpFLtUNPdas4ToDGw8z+GhxzFU50+JmhL9ngRDEEQsfYzR?= =?iso-8859-1?Q?uJDk71oxqBQm7XseLfQn9Vh0CVjIH4ieWkW7UoHjNzHBkLMxWRp4RkyQF5?= =?iso-8859-1?Q?EfrQGyoVCrTyNoLHTPezw+wX9pTqvkMnEKgok6iGQ4UDUPCMbere3LQazD?= =?iso-8859-1?Q?8QCbzoMof4OOsKF5xwsE+b1CB+cECLORP/vzqu7O0lGMg0bzxZ+tTcHKTW?= =?iso-8859-1?Q?gv0AKbHLz7dajRugoFoNX3+eehuZAMlDftAMQJkBT6vUgHyfDDBnXuMYWz?= =?iso-8859-1?Q?dSV3kzPZ2ike9z88yTqsxf4g0992INBEmCNCrHQ9rW8GVE7QtZDgTzuo62?= =?iso-8859-1?Q?9FRuoU9JL9A0NmzAEuPE/6n7gJ6d/TdzNtNrzHmLegPbfVEm4RPTgu+fCZ?= =?iso-8859-1?Q?eYjSAZd70HZtJhyaHwcO3fmxzsxND+B87t9glzMVIGwjfZ+trX33GfDq9f?= =?iso-8859-1?Q?7JuX5qb41RxuwXnitmQyiCoKIrnMme/EQFEURQL06a7ru3COCLd7NiHG4v?= =?iso-8859-1?Q?F3iHFtUHd88Offksb6HBsiTraGPJiD7Y4QbA43n1GRfZs3QOvgAMQW++KI?= =?iso-8859-1?Q?VuZF1kkM76GztRVAQKm99Ku3TrAPik/gGAizC360+i1EemioN1l36WASgP?= =?iso-8859-1?Q?s4BJNZEqAdZVZyQQW8edLC8SDjipWob2UpOSKEMYzlnIwoNAIfQ9VIZ0db?= =?iso-8859-1?Q?X5crqMEAB6QnelOzv8Z/r9jm/GO6d/HrnBaUhZpjoaWb11rPjEa9kaBoL4?= =?iso-8859-1?Q?bqmaPSAAYzPsJ/VfT3ykLFAG2bNHFzbFLyGjNP8D39rcc+kcDPkTvDIKOJ?= =?iso-8859-1?Q?yNM9ktAw3417JPFuakXjKSAiiPtAFexS4q9+/GzYkOV8Jl7NxVO13NOvpT?= =?iso-8859-1?Q?gKZzKUCJXor8se73KriKn8YxirrIIjDfhhWItfgL0qkDRHp9wtBXFBQhsQ?= =?iso-8859-1?Q?pZf6pb0t6keAj2Aa7tX5aX/pJOdvrMqn8S07RZaBWQfzpkit+42kZal1mD?= =?iso-8859-1?Q?FQTfOfB59PwXO6j09XxzVehqrPwfRHE2ZX61e7hN1DqpQ9SR+ny1Rb6a4N?= =?iso-8859-1?Q?GM/C/BMUixJPwPz53psPmpGeP6aYkk1rBghUVaP2a4zI/TFWryCL2rir2i?= =?iso-8859-1?Q?kpHHeSkSd3cTfEHfk9pHnOeRUyMQIY6ZHCvjgJjZt5dySnuNHG/QnHkl/A?= =?iso-8859-1?Q?6NcmCt3Bt7ev1IECweUUotSxK6214hK10KfQsF6dSFdW4fjBUfTgYxrze0?= =?iso-8859-1?Q?8smGFyUvIiRsr1y9ZMK0XuCoMtGWtWa1XGaSovguokV/nrKqh9gOn8DQVK?= =?iso-8859-1?Q?E/JVtxKN6MINILJg9caU9qWV6zQ7bWP+oR/UQN9MOQfP4557QsluwoJM2L?= =?iso-8859-1?Q?362Ppq+belpvFqKcfIB1iU+I7SxtWUQ=3D?= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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: 3a9024bf-e8a2-4fa4-a46c-08da2d6b26cd X-MS-Exchange-CrossTenant-originalarrivaltime: 04 May 2022 01:12:26.1795 (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: mdjtnHRLR4OkPoHsMzDNz5DqKLmeJKxAOL7mlWlx3LQKCW69MfthjJoOCrjt+TJI+QxOnJVHfSrSOZmSuh7+sw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB5830 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858 definitions=2022-05-03_10:2022-05-02,2022-05-03 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 adultscore=0 bulkscore=0 suspectscore=0 mlxlogscore=798 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2205040006 X-Proofpoint-GUID: xM11dKXUrMJiEHMfD0cRDmHNUGg5mIge X-Proofpoint-ORIG-GUID: xM11dKXUrMJiEHMfD0cRDmHNUGg5mIge Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" This rather specialised walk can use the VMA iterator. If this proves to be too slow, we can write a custom routine to find the two largest gaps, but it will be somewhat complicated, so let's see if we need it first. Update the kunit test case to use the maple tree. This also fixes an issue with the kunit testcase not adding the last VMA to the list. Fixes: 17ccae8bb5c9 (mm/damon: add kunit tests) Signed-off-by: Liam R. Howlett Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: SeongJae Park --- mm/damon/vaddr-test.h | 37 +++++++++++------------------- mm/damon/vaddr.c | 53 ++++++++++++++++++++++--------------------- 2 files changed, 40 insertions(+), 50 deletions(-) diff --git a/mm/damon/vaddr-test.h b/mm/damon/vaddr-test.h index 5431da4fe9d4..dbf2b8759607 100644 --- a/mm/damon/vaddr-test.h +++ b/mm/damon/vaddr-test.h @@ -13,34 +13,21 @@ #define _DAMON_VADDR_TEST_H =20 #include +#include "../../mm/internal.h" =20 -static void __link_vmas(struct vm_area_struct *vmas, ssize_t nr_vmas) +static void __link_vmas(struct maple_tree *mt, struct vm_area_struct *vmas, + ssize_t nr_vmas) { - int i, j; - unsigned long largest_gap, gap; + int i; + MA_STATE(mas, mt, 0, 0); =20 if (!nr_vmas) return; =20 - for (i =3D 0; i < nr_vmas - 1; i++) { - vmas[i].vm_next =3D &vmas[i + 1]; - - vmas[i].vm_rb.rb_left =3D NULL; - vmas[i].vm_rb.rb_right =3D &vmas[i + 1].vm_rb; - - largest_gap =3D 0; - for (j =3D i; j < nr_vmas; j++) { - if (j =3D=3D 0) - continue; - gap =3D vmas[j].vm_start - vmas[j - 1].vm_end; - if (gap > largest_gap) - largest_gap =3D gap; - } - vmas[i].rb_subtree_gap =3D largest_gap; - } - vmas[i].vm_next =3D NULL; - vmas[i].vm_rb.rb_right =3D NULL; - vmas[i].rb_subtree_gap =3D 0; + mas_lock(&mas); + for (i =3D 0; i < nr_vmas; i++) + vma_mas_store(&vmas[i], &mas); + mas_unlock(&mas); } =20 /* @@ -72,6 +59,7 @@ static void __link_vmas(struct vm_area_struct *vmas, ssiz= e_t nr_vmas) */ static void damon_test_three_regions_in_vmas(struct kunit *test) { + static struct mm_struct mm; struct damon_addr_range regions[3] =3D {0,}; /* 10-20-25, 200-210-220, 300-305, 307-330 */ struct vm_area_struct vmas[] =3D { @@ -83,9 +71,10 @@ static void damon_test_three_regions_in_vmas(struct kuni= t *test) (struct vm_area_struct) {.vm_start =3D 307, .vm_end =3D 330}, }; =20 - __link_vmas(vmas, 6); + mt_init_flags(&mm.mm_mt, MM_MT_FLAGS); + __link_vmas(&mm.mm_mt, vmas, ARRAY_SIZE(vmas)); =20 - __damon_va_three_regions(&vmas[0], regions); + __damon_va_three_regions(&mm, regions); =20 KUNIT_EXPECT_EQ(test, 10ul, regions[0].start); KUNIT_EXPECT_EQ(test, 25ul, regions[0].end); diff --git a/mm/damon/vaddr.c b/mm/damon/vaddr.c index b2ec0aa1ff45..9a7c52982c35 100644 --- a/mm/damon/vaddr.c +++ b/mm/damon/vaddr.c @@ -113,37 +113,38 @@ static unsigned long sz_range(struct damon_addr_range= *r) * * Returns 0 if success, or negative error code otherwise. */ -static int __damon_va_three_regions(struct vm_area_struct *vma, +static int __damon_va_three_regions(struct mm_struct *mm, struct damon_addr_range regions[3]) { - struct damon_addr_range gap =3D {0}, first_gap =3D {0}, second_gap =3D {0= }; - struct vm_area_struct *last_vma =3D NULL; - unsigned long start =3D 0; - struct rb_root rbroot; - - /* Find two biggest gaps so that first_gap > second_gap > others */ - for (; vma; vma =3D vma->vm_next) { - if (!last_vma) { - start =3D vma->vm_start; - goto next; - } + struct damon_addr_range first_gap =3D {0}, second_gap =3D {0}; + VMA_ITERATOR(vmi, mm, 0); + struct vm_area_struct *vma, *prev =3D NULL; + unsigned long start; =20 - if (vma->rb_subtree_gap <=3D sz_range(&second_gap)) { - rbroot.rb_node =3D &vma->vm_rb; - vma =3D rb_entry(rb_last(&rbroot), - struct vm_area_struct, vm_rb); + /* + * Find the two biggest gaps so that first_gap > second_gap > others. + * If this is too slow, it can be optimised to examine the maple + * tree gaps. + */ + for_each_vma(vmi, vma) { + unsigned long gap; + + if (!prev) { + start =3D vma->vm_start; goto next; } - - gap.start =3D last_vma->vm_end; - gap.end =3D vma->vm_start; - if (sz_range(&gap) > sz_range(&second_gap)) { - swap(gap, second_gap); - if (sz_range(&second_gap) > sz_range(&first_gap)) - swap(second_gap, first_gap); + gap =3D vma->vm_start - prev->vm_end; + + if (gap > sz_range(&first_gap)) { + second_gap =3D first_gap; + first_gap.start =3D prev->vm_end; + first_gap.end =3D vma->vm_start; + } else if (gap > sz_range(&second_gap)) { + second_gap.start =3D prev->vm_end; + second_gap.end =3D vma->vm_start; } next: - last_vma =3D vma; + prev =3D vma; } =20 if (!sz_range(&second_gap) || !sz_range(&first_gap)) @@ -159,7 +160,7 @@ static int __damon_va_three_regions(struct vm_area_stru= ct *vma, regions[1].start =3D ALIGN(first_gap.end, DAMON_MIN_REGION); regions[1].end =3D ALIGN(second_gap.start, DAMON_MIN_REGION); regions[2].start =3D ALIGN(second_gap.end, DAMON_MIN_REGION); - regions[2].end =3D ALIGN(last_vma->vm_end, DAMON_MIN_REGION); + regions[2].end =3D ALIGN(prev->vm_end, DAMON_MIN_REGION); =20 return 0; } @@ -180,7 +181,7 @@ static int damon_va_three_regions(struct damon_target *= t, return -EINVAL; =20 mmap_read_lock(mm); - rc =3D __damon_va_three_regions(mm->mmap, regions); + rc =3D __damon_va_three_regions(mm, regions); mmap_read_unlock(mm); =20 mmput(mm); --=20 2.35.1 From nobody Sun May 10 12:49:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE703C433F5 for ; Wed, 4 May 2022 01:14:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245013AbiEDBRh (ORCPT ); Tue, 3 May 2022 21:17:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243029AbiEDBRb (ORCPT ); Tue, 3 May 2022 21:17:31 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9803531348 for ; Tue, 3 May 2022 18:13:57 -0700 (PDT) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 243L4Hl0018680; Wed, 4 May 2022 01:13:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2021-07-09; bh=K+PxLWd+b/ySh0+LKvwuaq1AXYixHSY9W4j7RUhjs+Q=; b=ABgmNuG1ZoymVkkpjdIgBJFVKKE1NJspn9ag3Q26Ep4lXe1cLVd/3SbIbJ293O1uXNWn w110FkWinyAHBCQZ86eYGmLEWCD5ejE9AvsFwE7yL/6l/ln2I5PtnrAevmHbxEjxG1wT awARnDKq33On9FesiHOqbx2FxFo6Vzwevn+fwEliHD75im8MgmxqQWdQKcY/EBBonUff Rr0i3TsaqAErwfIix+h+hzkFcl51Yo3114eWqeVjfyNUa/UjiOAde42gGm38KaNEPLm4 GJfVqx+7pJRaOXAlcVHhnCUBh0+ROpvk53+fca6QnNIFqy5s7OwDyaasjhCyTZZGGOZb gw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3frwnt74ge-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 04 May 2022 01:13:52 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 2441BRJP013094; Wed, 4 May 2022 01:13:51 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2105.outbound.protection.outlook.com [104.47.58.105]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3fsvbmv3ke-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 04 May 2022 01:13:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H7tFDccd57MIq+t2TNopnvuTQFkbQtfZ0bZnmX8DQ2uBZfxyCbr3suSmNpHqLAvkpUTBFNl4C0nyjZd+0XU+Z8Z5w1Ta2iqwyIr/OcwmgzTJtv8vdf0wYTCHJSdqulJO1riTdnvxjwHQCAnNFmBvWyoo2B4H6JA7hVj7kevaT7qH6rYl72irwaa5SWoh1P9u76fxReSHFP+NGaMHDaDtuKDs3pmcxjfcrH7Asa1aMffZoQ/ILH38xp33ltc2nk4OgFQ7B5kCm28vlz7Wu3Lt2S2g1Yl1MdWhUHYqZtghExcUgAaLBSMYGPEL/udT+OkJAKyvTlyp2Fzz6NvQnaI1+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=K+PxLWd+b/ySh0+LKvwuaq1AXYixHSY9W4j7RUhjs+Q=; b=W0ACyDE83AASQsSwEIyPs+t8mAi85POgO5oshV0G5vQbT9VTN9G7HXSGik/l7+7uX+Hb15ugbSEp0UdmqWn6ZZCFWSxCbm7rUdikjHia0S8kh3FfSiwhajU4IiaVKoTWTKS4zXK+JyG28ThYr6SbmOW8GrMxxZreaU5Yx3Wsyne+cVMLn4zRmJKd4wFrwC4SA1+jh9D32UTBwSDitr82SjZRvRDd6DlSCRuA88wi1cfzRnDlhvec93GdFOwmlIXXHG7QvoAO783EsAQpDxilyHEBewq9TcuqmmAv0T0yVIBtey6nVh4SG7zJgXfahX8s13rrNqBh3fhWvvLm25Ii7g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K+PxLWd+b/ySh0+LKvwuaq1AXYixHSY9W4j7RUhjs+Q=; b=mj4LqT3R9oLWZQXXmoZOKGqyhF4zglRMB9nLndSkGFaxppOvSr1K3d41A4LdiK3f5zIXr9cA0dTvLp3HS/iHbO3V8NPsQNZUEOdEq6JXOIHeU7fnLRxUaJ0kMDkPUDa1hEk+uQn+u35qbEom3kXZkHm88ICiTYJaP7FW9TkX0Rs= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by PH7PR10MB5830.namprd10.prod.outlook.com (2603:10b6:510:127::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Wed, 4 May 2022 01:13:49 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::318c:d02:2280:c2c]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::318c:d02:2280:c2c%7]) with mapi id 15.20.5206.024; Wed, 4 May 2022 01:13:49 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton Subject: [PATCH v9 16/69] proc: remove VMA rbtree use from nommu Thread-Topic: [PATCH v9 16/69] proc: remove VMA rbtree use from nommu Thread-Index: AQHYX1Q11b3lP4PU/0O+Ik1X3e8Ukw== Date: Wed, 4 May 2022 01:13:49 +0000 Message-ID: <20220504011345.662299-1-Liam.Howlett@oracle.com> References: <20220504002554.654642-1-Liam.Howlett@oracle.com> In-Reply-To: <20220504002554.654642-1-Liam.Howlett@oracle.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.35.1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 31c3b192-91bc-4826-d2ad-08da2d6b585f x-ms-traffictypediagnostic: PH7PR10MB5830:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Oj3yumaeWRlZdyUztu8z7bYLKkGZf3O0L6As4yS8FcANAbT/gzZmfPMpYTFZXvwAgvOu61Iqr7IURMmvlXnZL07Cop3Tp3s5j7azBtOxjZy7YeJ92+dENZdcMq5gDqGY2QWnKZ6Tho0eXwHs4C4AGx8eVKSnL/nmMiLFcaJuPrbjvvTng1BOs6yl/LpDpRcntCa2P6ekZ30xauviG47C8lt7WAIP8b4mHptS5yGHkv2GDJjUCTeMdeDqyEaFiqhTWLQVXJ54d33Eq5Ln+aU2VdVqScWpSxHaQcjGN82uA2Pk/fbEY1eSjXvL4Wbg7RbZ2kBU8VFN2NymvPG0UA2MUMWvCUvHB264LBlrXLe1Vu3pgGNLg24THX8sKxrDTpcUOrl6wjYu3ySlPBfEdTFSjpBzqfHVcYDl1+1qY4EdTWtMSgD6PM1ZboGz8E+rTokiVnY0oEmfOksx00AE255apBfOlbm5rz44rEvNpgQC2h8HnmK0dukeI/9LbM2U9KUwEoq3Kp7Z74V5tL0tkJc/GlH803cj6InD8E3XqYFF5vs2YmZCv+w4G7tEX59T8Un7d/kedBYeXaQ/lOVNxoj7p58gz9jgt79FsbwzmHYwLQ84pV01K4qca0IzkcsA8Q8MIIeCCemtkL9GgugDInGenoe6LnALTCh2QeZxJLSLrMLC1ZxV9KKM/SG2x5OpAPTYqNhWFUunfBetZJYolLqaUg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3022.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(86362001)(71200400001)(83380400001)(38100700002)(38070700005)(122000001)(316002)(110136005)(44832011)(2906002)(8676002)(5660300002)(64756008)(66476007)(36756003)(8936002)(91956017)(66556008)(2616005)(66446008)(66946007)(76116006)(1076003)(186003)(6512007)(6486002)(508600001)(26005)(6506007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?XNPQ/dDDQPlgmh8A88P8jjc3ki4CNhwpBCXjxq78flNUJhsAkpkeLnHTOL?= =?iso-8859-1?Q?TSBl3+MZ3bp9mbsfD3SLQZHkWb5d/9JGHQkwV3GwHHNdJwHUB5RdUuMPk7?= =?iso-8859-1?Q?SJHzjE0iydzymq101P/EzObDsKsG+2g1xpCYJgdXVVFqNBFQY5Z9/vDjrP?= =?iso-8859-1?Q?3suAAlM+VGS5DDPk3KbfIqPX9uRLbrTmwVXvJA65VK+RvNP5YCdLnPRVU/?= =?iso-8859-1?Q?EPFDFTBjDdmb5Zv/kkGquUC6k31qPPpykySUsAkuT/EcmsL1gRz4kKSEFT?= =?iso-8859-1?Q?bPuCo85LuKtKqadK9u18m9c8RrncbKaBkh+0CR16GKId2yQ/8o926Y1/Lh?= =?iso-8859-1?Q?pJFp7QQqFaAmKAL15wFPuXMiXJeMxS7AAYTF70CJGqp90EYRdqYL8LEpLj?= =?iso-8859-1?Q?Doin9FQd3UVXRYWKkyGqy0MbyqyJhicnBecYX9RB5EIa/XmQIz0XF3Ck1t?= =?iso-8859-1?Q?+ma0eB+qEgocXkOpExDT2YkP2C78qHgQIDoIFhPAdi2D2XbKqyX/FyZvMH?= =?iso-8859-1?Q?B1En3HzHWfRDZS6wHgMi/egcDt0vTkFKl2kaYyccbl78HuocZQX/pw9RpL?= =?iso-8859-1?Q?5/XhGhp58eKU76tGK7L/BoUiCjnRtWC1FGYQ33Z3/aHcepL1+6hvbpTRVO?= =?iso-8859-1?Q?3n/HYsdldeDZy4KKqdWTJvZhn29Kz0fXFOnnjItXq6q7hkfqmZQr9dCwcG?= =?iso-8859-1?Q?yTv89CfDNisljAdHhS7X3sgU/rcZ794SN4VlmjaWdSiCa83/fs3IyOSrBD?= =?iso-8859-1?Q?/C1MCFITZdmuAaVy95Is677Asj9qdYmCYElJs/5VTELZLqkkdLAGA2BUOW?= =?iso-8859-1?Q?hqBykKD3bwB02Ro5lUdn2euIgW1g0T/4cjJK7M8DCFWnquW+dwkT0VYOz4?= =?iso-8859-1?Q?mK2OrFJ8OSsOZbvthWqm9fbCSx7r3AMeQmrbY4On7qWxp6kDhs8VBeK+5X?= =?iso-8859-1?Q?JQHNNPh6pYYmZAQq62HQ/1a7X2eDusvkNJ48SHrS3IVXpsA7OyVocWpq2W?= =?iso-8859-1?Q?QS9fvk5ewy1yho86hYRygauk1nP+msq5ZZstdCZirvXIFxQCR9KiVA+Qv0?= =?iso-8859-1?Q?CdFMJWmRbZG8kN+UpGjKjv+MuC66+kUCyqRtwJbKn4hI4GMUbsZP1Wke6m?= =?iso-8859-1?Q?97bCcUCck1y5kMe4L9kcSu0Y9ql4Y+3FiP/q/hk1yWdTNkzCGonBZBxQNF?= =?iso-8859-1?Q?UNcak+2hSKDA5GQZbkK9sZ7wWLtQQpjVpEhf0ytZeDWv2HYFBIBAZ509Wp?= =?iso-8859-1?Q?R7mlyUSk1H7SWskRnhGaZdJ714N7UAQ/eknPf1PG/aA/hK5fNn31jmLQNv?= =?iso-8859-1?Q?+H3WmjuZ5RIN48QGJJTt46y2MPkYvaxICxCGPKoDQN5ogHihDsXXEPQbqe?= =?iso-8859-1?Q?NwhTd4ohlTsgq8WVmaBW4F+DjQyaHVfADB4ANtrzEziU+5Cl5HZr44e8s7?= =?iso-8859-1?Q?j9CJf1pGf9QPaytt25PJcGdp+LxqA2O5KSj30yCMe0aJtuvjkgQ338Wz+B?= =?iso-8859-1?Q?D1TbseE9VsulItAkvl0vti+unG8MswFCBDLus5rGsSu6BrgjlmDw6+btt7?= =?iso-8859-1?Q?Q7x3abJYz3SREmZTCmiNqszGDKFWE5VIvEnZpwUaEXz6pKNykPH3VXnJeQ?= =?iso-8859-1?Q?ioQEzDdGy9LllUIjaOpAo9C0Ew1SeUN8qJ15nTt13oR+AC+MqKL6nyihGK?= =?iso-8859-1?Q?sQ1TIq9URDB8+mmx6CnN0r1bMyqfoh3uc8e/yBCnzIaq4mJZxwJWFoowvh?= =?iso-8859-1?Q?6+fDsmYs/PnaJ+e8N7XaYr7MYPQOjs354RNnl5dQSwA+WRfAXkaW3n/5J8?= =?iso-8859-1?Q?7aaQtNxVBJxACjyJACXTKVgjhB7GB2I=3D?= Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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: 31c3b192-91bc-4826-d2ad-08da2d6b585f X-MS-Exchange-CrossTenant-originalarrivaltime: 04 May 2022 01:13:49.3303 (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: WfrUDSofeG6IYlSjhrM0LofklkBWbdWP0AfiOQz4S5MaDRHSh/B92zRZseu0P6JdgxcU7qKctehgwjnjCyk4lw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB5830 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858 definitions=2022-05-03_10:2022-05-02,2022-05-03 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 spamscore=0 malwarescore=0 adultscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2205040006 X-Proofpoint-ORIG-GUID: JO50EmVZCEcuTqXhJ4qbnLmIh5mfEw7H X-Proofpoint-GUID: JO50EmVZCEcuTqXhJ4qbnLmIh5mfEw7H Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: "Matthew Wilcox (Oracle)" These users of the rbtree should probably have been walks of the linked list, but convert them to use walks of the maple tree. Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Liam R. Howlett Acked-by: Vlastimil Babka --- fs/proc/task_nommu.c | 45 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c index a6d21fc0033c..2fd06f52b6a4 100644 --- a/fs/proc/task_nommu.c +++ b/fs/proc/task_nommu.c @@ -20,15 +20,13 @@ */ void task_mem(struct seq_file *m, struct mm_struct *mm) { + VMA_ITERATOR(vmi, mm, 0); struct vm_area_struct *vma; struct vm_region *region; - struct rb_node *p; unsigned long bytes =3D 0, sbytes =3D 0, slack =3D 0, size; - =20 - mmap_read_lock(mm); - for (p =3D rb_first(&mm->mm_rb); p; p =3D rb_next(p)) { - vma =3D rb_entry(p, struct vm_area_struct, vm_rb); =20 + mmap_read_lock(mm); + for_each_vma(vmi, vma) { bytes +=3D kobjsize(vma); =20 region =3D vma->vm_region; @@ -82,15 +80,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm) =20 unsigned long task_vsize(struct mm_struct *mm) { + VMA_ITERATOR(vmi, mm, 0); struct vm_area_struct *vma; - struct rb_node *p; unsigned long vsize =3D 0; =20 mmap_read_lock(mm); - for (p =3D rb_first(&mm->mm_rb); p; p =3D rb_next(p)) { - vma =3D rb_entry(p, struct vm_area_struct, vm_rb); + for_each_vma(vmi, vma) vsize +=3D vma->vm_end - vma->vm_start; - } mmap_read_unlock(mm); return vsize; } @@ -99,14 +95,13 @@ unsigned long task_statm(struct mm_struct *mm, unsigned long *shared, unsigned long *text, unsigned long *data, unsigned long *resident) { + VMA_ITERATOR(vmi, mm, 0); struct vm_area_struct *vma; struct vm_region *region; - struct rb_node *p; unsigned long size =3D kobjsize(mm); =20 mmap_read_lock(mm); - for (p =3D rb_first(&mm->mm_rb); p; p =3D rb_next(p)) { - vma =3D rb_entry(p, struct vm_area_struct, vm_rb); + for_each_vma(vmi, vma) { size +=3D kobjsize(vma); region =3D vma->vm_region; if (region) { @@ -190,17 +185,19 @@ static int nommu_vma_show(struct seq_file *m, struct = vm_area_struct *vma) */ static int show_map(struct seq_file *m, void *_p) { - struct rb_node *p =3D _p; - - return nommu_vma_show(m, rb_entry(p, struct vm_area_struct, vm_rb)); + return nommu_vma_show(m, _p); } =20 static void *m_start(struct seq_file *m, loff_t *pos) { struct proc_maps_private *priv =3D m->private; struct mm_struct *mm; - struct rb_node *p; - loff_t n =3D *pos; + struct vm_area_struct *vma; + unsigned long addr =3D *pos; + + /* See m_next(). Zero at the start or after lseek. */ + if (addr =3D=3D -1UL) + return NULL; =20 /* pin the task and mm whilst we play with them */ priv->task =3D get_proc_task(priv->inode); @@ -216,10 +213,10 @@ static void *m_start(struct seq_file *m, loff_t *pos) return ERR_PTR(-EINTR); } =20 - /* start from the Nth VMA */ - for (p =3D rb_first(&mm->mm_rb); p; p =3D rb_next(p)) - if (n-- =3D=3D 0) - return p; + /* start the next element from addr */ + vma =3D find_vma(mm, addr); + if (vma) + return vma; =20 mmap_read_unlock(mm); mmput(mm); @@ -242,10 +239,10 @@ static void m_stop(struct seq_file *m, void *_vml) =20 static void *m_next(struct seq_file *m, void *_p, loff_t *pos) { - struct rb_node *p =3D _p; + struct vm_area_struct *vma =3D _p; =20 - (*pos)++; - return p ? rb_next(p) : NULL; + *pos =3D vma->vm_end; + return find_vma(vma->vm_mm, vma->vm_end); } =20 static const struct seq_operations proc_pid_maps_ops =3D { --=20 2.35.1