From patchwork Sun Jul 17 02:46:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 12920381 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4CBD9CCA479 for ; Sun, 17 Jul 2022 02:47:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E9C6F940020; Sat, 16 Jul 2022 22:47:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E268A940021; Sat, 16 Jul 2022 22:47:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C2EFD940020; Sat, 16 Jul 2022 22:47:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 9B5A1940021 for ; Sat, 16 Jul 2022 22:47:36 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 64390206D9 for ; Sun, 17 Jul 2022 02:47:36 +0000 (UTC) X-FDA: 79695056112.11.A0750F2 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf13.hostedemail.com (Postfix) with ESMTP id 9225820009 for ; Sun, 17 Jul 2022 02:47:35 +0000 (UTC) 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 26GJ8ghs031747; Sun, 17 Jul 2022 02:47:33 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-2022-7-12; bh=EjydbCDeB5HpqcU6479zQpQNFL9mryyodE0dDbbTFv0=; b=Y5uYrE28eo0r5iyExMeN+8yrlCx2z8S/Sf2/P93zH354IAZu4QHAhgOZLNrq0iFqzjnk zbnbq8ToVhtqosVy5rLz0F8/HFPRg/QYdKt9I3mUuBQTXrUHnYHDGPFVVpjXt68KDONG yGeq5s0ulUkfp6PLdgS+fB31HmTaqBw+1VM91anBV7dWb+K2+5uYnWTV2n+29N3lRhwV u58kqxGETSO2M5qHfSXOLs6S7nrXzPVF9Q5u8BolxDadizBip58LIWim9vvIio2YmDSm sU5Cokhm3vM9Imavb8NZdTuH+Qduhzq577bxXm84RTuTtDh4OaRUmBjDD9JTYpuf0KRq 1A== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbm428y7r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 17 Jul 2022 02:47:33 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26GMYISU036113; Sun, 17 Jul 2022 02:47:32 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2168.outbound.protection.outlook.com [104.47.58.168]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1ejp6a8-18 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 17 Jul 2022 02:47:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RaYfobwZ6yl81w627ptY6P81B0mEkERHxZQafDYgpDKhLP21iv2RzROjT1wR0UAsuuijCK+RewXSG19buL9p2eW9CdlRdVGCScVDohRhCKHwF3gaECSZZynlPG3OjsFJiOjNHZWiSuXycjDPvu1WQNaiRkY5lvCy+7pvIHRq2+Q5y8Ht87fCTQ8Spdqx7tjKFIvjx3uXMTjINeIsoFak2Z1qMD9WItI0kIWvVcc4B61NeyqbP3EtugJfr7LbMcxJp8HpIjWieKlnrc5recRxRMx7I9jhbejnXrm2oXn7xfQz6mf4+/dwLDZKVv18HPEyhapdCFJStETRS0tSF/jrww== 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=EjydbCDeB5HpqcU6479zQpQNFL9mryyodE0dDbbTFv0=; b=BFea83I0uHFiqLzBDBvyB8g3qqLTIWqwJUga/2aPxFG/XFRo5cu1vV35ua7WmZYe0XNg9xeDamt9OMmd+4SOtNvV5sN9aU6UnO0JzSkKzbVcb3NqYqz+dDa5GvoS+UxfTTUgRwkmIOk4zDN5WwwrFPibgXuaUCnhnxgLaTVDlVGQhZiXNXWlQ0UGhHr7DG9VSq7hVRlnAUA5PHMcIiRlXB1CifvHQF07iD3dQl14JCmeGpI2korkKsszLHdBIhILKiQ4cqqioFYAj5wAG7WSz6R7vQhT/ZFeaqIrM1NfhFuZTQ+8EazuMkAqBmK6yu/OLwsvfkvLOgbHBS2kFFJbrw== 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=EjydbCDeB5HpqcU6479zQpQNFL9mryyodE0dDbbTFv0=; b=aCBJcmSSTjluZTWLn+e6J2TvI3ddfsOXGr6rNIeUCASd1YKyujk0MF9j3x7rIbQlOoP+ybX59679mG+Muiey9MQ9CFBQQwCXS2l+D4zX73eORJiU7SWLbrni8Bgpv64VeU9IVjJZTWF4/HhGl6j6w3WzNSE65ZbIEfDXBPANUEY= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by SN6PR10MB2799.namprd10.prod.outlook.com (2603:10b6:805:d9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.20; Sun, 17 Jul 2022 02:47:29 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::c4d1:edc3:7d21:7c68]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::c4d1:edc3:7d21:7c68%6]) with mapi id 15.20.5438.020; Sun, 17 Jul 2022 02:47:29 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton , Yu Zhao , Hugh Dickins Subject: [PATCH v11 47/69] perf: use VMA iterator Thread-Topic: [PATCH v11 47/69] perf: use VMA iterator Thread-Index: AQHYmYd46lo7Z618V0K4nq+DRfyerg== Date: Sun, 17 Jul 2022 02:46:52 +0000 Message-ID: <20220717024615.2106835-48-Liam.Howlett@oracle.com> References: <20220717024615.2106835-1-Liam.Howlett@oracle.com> In-Reply-To: <20220717024615.2106835-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: f6ad78c2-afaf-4701-5328-08da679eb0c5 x-ms-traffictypediagnostic: SN6PR10MB2799:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: UrNrb6LQRjGSj/e7h7ZesJKGqro90nKLYY0kYkYmAnY8v2HTZ3iSjZvlFbrZGkyNCxGjmGiG0+ECgESAaqJdOfohKQCjgc9q6SFz/luovfADCLUAlXFTsqbYCpNthDaLCcb0odwAEePIGBx7Fe6/VeG9ZKcDl29cSsFk2G6c5MiV1i5QSdr0ilcJ/tOL+BtvgPWbkA8IkzeWRZGHtVP8hj+fmvGAvwEZWZdSPo8LkEBnyYQxmSzzlnH1Y2jSh3CGPxmLE8zs0KHC+yvi6x2zGEdMYGOTNHFNykx6fnhxi8IMJgZhquu4el192iTNydZiWD8Gu4rEeuQmrOV+gtWvDzrIfVMJmU1PECGxEX9YjfnoZVS43JrsvMwWJauXfPtNzHxF9EjPRacHpcknVUF1Yos2xW4+VBFUxnzoGBCPPJ+K57vzmAUeWa8YsL4Vfz4LkilGqlYpKvXKzl7Yr9kENnNekFDS/wME4xIxKBWRUGFz67z219VhioIOKWYZPjULXIh5dLxVmg8pbG9r9aJHH/fh/qyuWwsOBCsyAJH9ksenpMa0dQtVbVlFTimQZhlqxlFjHg45nhEDmoUE8VvGZvcCPdlO3cj0qOH7IVbnbuSsYeQe/uuOD9R90+WiiCZja1u0QrMDccVMSakTVqMs0b1FVqKHFA7zJjFH05BbB4aXcHTonscOuhrDJgLT4aNlKa2M5QAYqtbWkeuXT2/x+elnrJjHZg9y9qxqRMA6IXNYncW/+E2wqyJPawzj9VNkg07RzPsMaVZXSKJdCu1eX8I6MMbabTSnuEk7aaBikPJ1kXG273NZKEpUT8pmxrcgfNW6qCa1xcfOHFPwxPjQUWsMUz9YFc5J3rE9v/EJ4xkTtWCOlCMTYaz1/gLB/Py9 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:(13230016)(39860400002)(376002)(346002)(396003)(136003)(366004)(83380400001)(66446008)(66556008)(64756008)(66946007)(8676002)(122000001)(1076003)(2616005)(66476007)(186003)(38100700002)(91956017)(38070700005)(478600001)(6486002)(8936002)(5660300002)(44832011)(26005)(6666004)(41300700001)(6512007)(71200400001)(966005)(6506007)(316002)(110136005)(36756003)(2906002)(76116006)(86362001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?5qnzuumjk4TblpR5xVG+MHn?= =?iso-8859-1?q?Zg2m2LsrvJIMZS5MWxpD5IvmH1kv1ViRaLHNbvxn27L1UtKgxkbC9OZtaEJU?= =?iso-8859-1?q?Ipk2owGPBG9xcC6NcGbk0GhQ9bxxHDbOXKNmGvXUDdxbe6jn3/JMMx6B+qMY?= =?iso-8859-1?q?HJBBpid1moJhMbpvJaUvcDIRMAAavi6GlNk9NeHf1ujV3hHq1Sz+MiWr7yUA?= =?iso-8859-1?q?L149K3dQIglMCaFozLM9fNk+VzxQnH16Scgd7/bF4gaOJl+TFNfjTseu3FDB?= =?iso-8859-1?q?G0rA7GgPRaUSYNLj4omLOQe8Zjx9GCcP/gWMPGWc15TT1JOGDXlZvdDUYhD2?= =?iso-8859-1?q?NLXUcs9CDayPW0bLB3eqJ/opw57bG+Zn43szWWwhWN5BhdOj78zGS9F6mkQz?= =?iso-8859-1?q?PW+EfqLbk6wGGs9Tf4hAR+mP88iJUt6rNq/R07wHtsWMmNwhSTzB0DND1t4J?= =?iso-8859-1?q?wz3B+l48WPqKmqTdJgSAQxc7fAQPHq4kTL/w2/C9hj4RX4ZXRpD1zAteAcbq?= =?iso-8859-1?q?m30DFkEBgE+1qbcVe11lEO5AKgnu4PplwWiTnRT64GUMwtHgM1ICczngCono?= =?iso-8859-1?q?usuzZatRriPysx5z+zLy9uNe6S4zKmp56N/9vWaHoAXUAKU+OYyQxUmrk1oI?= =?iso-8859-1?q?UFm74jwohyV9V2jm9YopDf+e3nchqpXMjN6xA+fqbbQAE7pd73afYA7GO2qp?= =?iso-8859-1?q?NhAklFuaq/6ibirXql2ZI6E7Pil9XOtjyIcLnDaGKeBGZFSKZKLPmJxyYem8?= =?iso-8859-1?q?sD+r73fAvNz2pxmN7HcZJ4PLSKoBt/Si7OujchlL0bRTZqt1AtDI7NfU7Bqq?= =?iso-8859-1?q?YdqYGowKYR7L9BhTMfXmO+cZPPZy9+aZRUNB9PLjAAKUESeJ1qYHUDu1IAHi?= =?iso-8859-1?q?zffTYYbEdxB/lTHciZh9noj+BYnGdqYtpiJR2bCzoqfzMpAhl9OUixSTWvpM?= =?iso-8859-1?q?k1vT4IMJ/5+rBFxBJLgwd9Ka78+x9C0BLFVn/vEchy4U3LmRwe5UXpPAnsho?= =?iso-8859-1?q?rEOaUPbl02GL4eLr0N9Y1yErJnaT8C9JBr2l3SerXLbCu9YmOaPRORbxHfRU?= =?iso-8859-1?q?JzfV6cffny0hFtoWdvVcgKd2enwhiFoaXUb3r2gfPXf3Vw58PZMPLRNIioR5?= =?iso-8859-1?q?y0k3x7tL7WBa75d4MWy9lGy5EQ4boC5vgA8vG8beFz9NDIVJotkQ0/Y0T8kW?= =?iso-8859-1?q?rmWwdE73h/XeXRK3Xc1eBd0BtXAx762sbUobetQmK95ICN7AeUq+vQIRLCQy?= =?iso-8859-1?q?dwZ2ZdlF9kxUC7+DFZ+AucPFGSgT4wwdtasKfQqWHclBd23eQR7hru+4tFlG?= =?iso-8859-1?q?XLHeLYFGDzuTDCXHUmFWFDBZV01+S17eFgS2oME00HChqS4XNvWJlnqyzf3T?= =?iso-8859-1?q?euYzvmEIb6lvBSNb7osY3tvorR5O0PHZ35SM1QbJykIlDh6MQ3LnLJQGQr8o?= =?iso-8859-1?q?nLsf5Of1jKzVFm/7KDJ/ZMghkiZJrqI3t9ftIWKimeUqeDGxg8P2+PJhO+Dz?= =?iso-8859-1?q?aUBgbVwIb+E5x1Kfb0O92ksP5ZWDHDWjx46z5B/1VR+0ARSbihkzwvZz7v2C?= =?iso-8859-1?q?WLqi5sX+x4k9LR671mG+bM9Vautud3VEOsKsPxoGnG5IbPMVHUhvP9nN0kNF?= =?iso-8859-1?q?DM/ouHfR59qc7RQUAK6VkOOn4MDSow6/4AuNB8A=3D=3D?= 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: f6ad78c2-afaf-4701-5328-08da679eb0c5 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:52.8180 (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: XryxOXqQjLnTKF2+n3Ic0Dkbu/MF1O7ToXZmmACuvooKwaKKjYr2vuK1JvEpM3YcP62fJVbtjhzNmqf/lmx5OA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR10MB2799 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-17_01,2022-07-15_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 mlxlogscore=999 suspectscore=0 phishscore=0 adultscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207170010 X-Proofpoint-ORIG-GUID: 2xKb-dk3WnbcwboBIcqGawXjHwW4JUG2 X-Proofpoint-GUID: 2xKb-dk3WnbcwboBIcqGawXjHwW4JUG2 ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1658026055; a=rsa-sha256; cv=pass; b=tSOAAeE0A0xKJFysQL/TnFJ/dNvMaItwFGKdOn7VaQGqi+i7snxT/yrqDUttX3mjP4XDiz snH2kEF7RLJddJNXR0xOIeSHOJStw4vCTDM1o0BMFdnw51P1DfOG3rGxe1AGEhZ8VrAjqe CmB4rkt0RS39po0eil6iJdjibNUVovc= ARC-Authentication-Results: i=2; imf13.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=Y5uYrE28; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=aCBJcmSS; dmarc=pass (policy=none) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=none (imf13.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.177.32) smtp.mailfrom=liam.howlett@oracle.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1658026055; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=EjydbCDeB5HpqcU6479zQpQNFL9mryyodE0dDbbTFv0=; b=uFED7Tnqde2492timGSpVgScq1lFTNe5J7EKgeP0DhH4egtZJMqaPhhadY0hZT/YCOs/0p iU1uChz4T3gPeR1eujP4NXZseXot0Khfs9rHIy47BoRu+o0IKY+gmFRBAl1Yapdi/lxY0p YKV+nzwNG5bnViNdJJdiINnGZcm/MAQ= X-Rspamd-Queue-Id: 9225820009 X-Rspam-User: Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=Y5uYrE28; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=aCBJcmSS; dmarc=pass (policy=none) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=none (imf13.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.177.32) smtp.mailfrom=liam.howlett@oracle.com X-Rspamd-Server: rspam08 X-Stat-Signature: wghx4mp4mqoi85pqo85ndh4dewqub9cb X-HE-Tag: 1658026055-372078 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: "Matthew Wilcox (Oracle)" The VMA iterator is faster than the linked list and removing the linked list will shrink the vm_area_struct. Link: https://lkml.kernel.org/r/20220504011345.662299-32-Liam.Howlett@oracle.com Link: https://lkml.kernel.org/r/20220621204632.3370049-48-Liam.Howlett@oracle.com Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Liam R. Howlett Acked-by: Vlastimil Babka Cc: Catalin Marinas Cc: David Howells Cc: SeongJae Park Cc: Will Deacon Cc: Davidlohr Bueso Signed-off-by: Andrew Morton --- kernel/events/core.c | 3 ++- kernel/events/uprobes.c | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 80782cddb1da..61ad10862c21 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -10210,8 +10210,9 @@ static void perf_addr_filter_apply(struct perf_addr_filter *filter, struct perf_addr_filter_range *fr) { struct vm_area_struct *vma; + VMA_ITERATOR(vmi, mm, 0); - for (vma = mm->mmap; vma; vma = vma->vm_next) { + for_each_vma(vmi, vma) { if (!vma->vm_file) continue; diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 2eaa327f8158..401bc2d24ce0 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -349,9 +349,10 @@ static bool valid_ref_ctr_vma(struct uprobe *uprobe, static struct vm_area_struct * find_ref_ctr_vma(struct uprobe *uprobe, struct mm_struct *mm) { + VMA_ITERATOR(vmi, mm, 0); struct vm_area_struct *tmp; - for (tmp = mm->mmap; tmp; tmp = tmp->vm_next) + for_each_vma(vmi, tmp) if (valid_ref_ctr_vma(uprobe, tmp)) return tmp; @@ -1231,11 +1232,12 @@ int uprobe_apply(struct inode *inode, loff_t offset, static int unapply_uprobe(struct uprobe *uprobe, struct mm_struct *mm) { + VMA_ITERATOR(vmi, mm, 0); struct vm_area_struct *vma; int err = 0; mmap_read_lock(mm); - for (vma = mm->mmap; vma; vma = vma->vm_next) { + for_each_vma(vmi, vma) { unsigned long vaddr; loff_t offset; @@ -1983,9 +1985,10 @@ bool uprobe_deny_signal(void) static void mmf_recalc_uprobes(struct mm_struct *mm) { + VMA_ITERATOR(vmi, mm, 0); struct vm_area_struct *vma; - for (vma = mm->mmap; vma; vma = vma->vm_next) { + for_each_vma(vmi, vma) { if (!valid_vma(vma, false)) continue; /*