From patchwork Wed Dec 1 14:30:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 12650101 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 7CEA8C433EF for ; Wed, 1 Dec 2021 14:54:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7620F6B00D8; Wed, 1 Dec 2021 09:53:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 710FC6B00D9; Wed, 1 Dec 2021 09:53:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4A0D86B00DA; Wed, 1 Dec 2021 09:53:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0164.hostedemail.com [216.40.44.164]) by kanga.kvack.org (Postfix) with ESMTP id 37FEB6B00D8 for ; Wed, 1 Dec 2021 09:53:25 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 014618249980 for ; Wed, 1 Dec 2021 14:53:15 +0000 (UTC) X-FDA: 78869518308.19.C6D0C9C Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf30.hostedemail.com (Postfix) with ESMTP id 52E7BE001980 for ; Wed, 1 Dec 2021 14:53:14 +0000 (UTC) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1B1EP4ml018222; Wed, 1 Dec 2021 14:30:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2021-07-09; bh=o6T9RLReSyAul2/TF7gPSLi2ow585BDqa6WngvG/QW8=; b=PFQTeKVZQOrKZoiwZnpTv5T/lelzT86pur/n9514vIurU4S9F0YTfL1nFEaP+MPLH7qd piDHT232nM5/gE16jc949mM0+Fz+knN+pTvC9nG5f+KWBNbcdaXboWiIiM5/X/Oo1VW5 /6XbFnqPjAJbfEZsAW0MKNoFb5w8TXQWmHIG0AzAY7azGImfvDlBAVWvoDpQhU/S/uct agsKmE9CZzCp29g+IENScr6HlnWHeZe6IfWZp4dzDDpimeK1IDujEFeMjgTxcxklslTR monF+jL0niivFSeVvBDrFxROGmWlWOG8lnIZwEf4CAvmUf16EWbk/ZbU/x9cnBCWxtmB WA== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3cpasyg15d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 01 Dec 2021 14:30:52 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1B1EBl7b109791; Wed, 1 Dec 2021 14:30:45 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2102.outbound.protection.outlook.com [104.47.70.102]) by aserp3020.oracle.com with ESMTP id 3cnhveqcc9-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 01 Dec 2021 14:30:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NUEavyKNahYfLD3wPaR32TKmIXlwkWLBGMBgp4P6Cj3A9KyHr+XftAUW2jnLwzRgVF/hgeuOf+ZyOTwh+eI9icpJS+0ChtOBQwApBR6Ber+WRw1IbRIZ1NAS7FbdSyplZPI4PSACEko5Zo9QchyzYc2EKc9fLToNFCFp/YcpkJnp9F80Vpzd6gb0PThiqdY2/gLPNqp2SiXVnlqjb2BJtWLC13+Le/pQE5RwpZPi2kN1tqBoMSWMRpd36qG7mp0+1BNonhVUSFb+TUS4P9I/gHptdzROCtbVzA4qg4sxUcc8PNGzihEjZNJU4XUCDgGFJgzzExI6+offowuNDEhRSA== 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=o6T9RLReSyAul2/TF7gPSLi2ow585BDqa6WngvG/QW8=; b=YvPgEJFvFbWYNs1Hl2POEDIgMASApsoNB5ApFDotGfi8m1NK5sSTWbo4UgegQ4R1L25YcdVK75E4vDJGl6Sspt5JhcELRsv/6rJazYD4uMGzmh97AklhtfAlYyFeWNKtTdG78fMGbDNh2ERS7N/1HUTSlj8vi94CRwKq6zg/b13Jn46r4q/rJCPy05YeUXXM471Q15SnfWYJg8FWxbgkzypRXDPK6cLExGHoT1al5CVDtyJGz2HIpeOjdgJAAZ8ZWbXSUdMkrB+l93D4iZuufD0yky2vcVHJgsUq6S66nGF9XbQFgDXyFxHJiSzJfM6+/JYC4BdLNhd9r0YkkGKIDA== 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=o6T9RLReSyAul2/TF7gPSLi2ow585BDqa6WngvG/QW8=; b=y+nJ7hGib7YpYYRc3jzpGjXvg+cEgVKrL+2U5Wr5HXp6PElnAlCP8BG5wo8TPIvRyyfIPX/Xp2lhBKtqPYYpAz+3c0vCx0Cci2+ZiAq4Cc5b8TVbtVllOinQgq5ZLahLC0qpmKAhJaDQmOp9pCOVZ0gpZH+wiLEuEsmKAvYeWI4= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by SA2PR10MB4508.namprd10.prod.outlook.com (2603:10b6:806:11d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Wed, 1 Dec 2021 14:30:38 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::c4d0:8291:84d:ac66]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::c4d0:8291:84d:ac66%7]) with mapi id 15.20.4734.027; Wed, 1 Dec 2021 14:30:38 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton CC: Song Liu , Davidlohr Bueso , "Paul E . McKenney" , Matthew Wilcox , Laurent Dufour , David Rientjes , Axel Rasmussen , Suren Baghdasaryan , Vlastimil Babka , Rik van Riel , Peter Zijlstra , Michel Lespinasse , Jerome Glisse , Minchan Kim , Joel Fernandes , Rom Lemarchand , Liam Howlett Subject: [PATCH v4 42/66] fs/proc/task_mmu: Stop using linked list and highest_vm_end Thread-Topic: [PATCH v4 42/66] fs/proc/task_mmu: Stop using linked list and highest_vm_end Thread-Index: AQHX5r/xefKkkGSxLEyfIjGHfmNy0g== Date: Wed, 1 Dec 2021 14:30:09 +0000 Message-ID: <20211201142918.921493-43-Liam.Howlett@oracle.com> References: <20211201142918.921493-1-Liam.Howlett@oracle.com> In-Reply-To: <20211201142918.921493-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.30.2 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1b4f391e-d94c-473c-2be7-08d9b4d7252d x-ms-traffictypediagnostic: SA2PR10MB4508: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:873; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: h8wVk6Sw4SaykK4DtaYcE+fB49y0rXnZ3N0CiN+1TE6dvjKKZic5NOolU6Edi+QjWi+w72GlCngSV7xX6l3hT7nTVd4hoWZ8Nw9CdX8u6CjmK3BFkP7JVF6m/QR+Dm4jM/7F6x5vWIG0ocs8udyqCRgH1StcBLItenOvVP8FLzbFsBaf7w7oeX5rc5kf0TKIjvENLboCTFnsWsOdx4S+6OphVwOFRBLXhD+RzhplBKzQ2J5b4odt+KtW+/5zhKsHUaadqybBLzD2mz+F7L1KLBsN5JEuu1VNHojmurV2K3FP20VmeqVJgScAENHbD42IYlYnt6cxmAR9elPQFXkZhiWRbJ5HaDRwSh9qukeV7QsK2fu/HMsJcdfT4rufr8x8VyjuNth1B9rzW6wP8+KcF0YXiMovjn94W57ll3KfMOjS3AYsBFSPK5sjrOYQY8uN2XLkLoUkpbJjeJT1iUBM/+Gf0L7VodVQuO2p0+jRwNxi9wp8uXckm1x08Bpp/s6mUp/i0V6A9PPvGGzSGfyl1ryu5DXIM2yJhU9LT4WY+mCJOA7QYWieqAl6vw462iY5ScHtjuMkHN1m/1PbQfXZsZ9iq6heJsCH24KgfkncHXk/g64ccFxT8pyZlW87nCVjWk3dpQgU+VIcXHtIPhzmVBtAzQTtMTdU0m2daWevA2yY7bQpILstttoGcUGZjfXBEXzShy3QNDrR3+rVNZPkcQ== 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:(366004)(186003)(26005)(7416002)(1076003)(2906002)(8936002)(54906003)(83380400001)(2616005)(38100700002)(71200400001)(66946007)(86362001)(66446008)(8676002)(6506007)(38070700005)(6512007)(6666004)(122000001)(508600001)(110136005)(6486002)(64756008)(66556008)(76116006)(91956017)(107886003)(316002)(5660300002)(44832011)(36756003)(4326008)(66476007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?6WJvKmi31WR0/LShIHTE7n3?= =?iso-8859-1?q?6DxDoXWXVfZ4I+Qe8CE4HAUVl1aZspqMc2FKUH+bmdvBvOI9EWtoPSDNGUbG?= =?iso-8859-1?q?SBik9c5iLUGGN5j5L3EbAqg0xXWx99kaeKcZl/4KOS2JgGJt4BPRV+7XjfQv?= =?iso-8859-1?q?fUo2ZbmhNFeEqFVbUVBNm756VXGeisjs4mSvsv2H9QtSzc/mrLxalaMFDpd0?= =?iso-8859-1?q?cN9agBYFLL1CbRUaU2AM2HOwZeB5Uy7wJmrWvvD6eWvkfCs7dPgv3DOzrIIN?= =?iso-8859-1?q?YZl+liukIJrDoUe+IHDEuy1SAOsR18xCiW5Fy0U5/cSElqnbhPovl6QG3e98?= =?iso-8859-1?q?Ytl3cWicdHmXxtBN3W/Cyq93x5X7lDX0BHyyFDoB87a8f8aUptn7g3x56pqK?= =?iso-8859-1?q?IN0SM6QQdEN6/xeZ3V85SPeKKAoHVbxN0fwafRci9BkZyzt7cL3TlCfuTzaL?= =?iso-8859-1?q?5gWu0vGNW6Xkj2q3Ms1AlYqsaWd2cJ/8RBTu2Gtc4+W6gybTgDtA8RhYslnN?= =?iso-8859-1?q?c4XOkb8DRvZeAbgXKN2qDh3p9+c7UhfetkG+cLQGPyZ71exKSL6Kcen5tTU/?= =?iso-8859-1?q?RzQPJpPxTXLnlQk92SjX23rzwHauzOR/+ifvA1Z3RLRBeAxSfIoM4ukNYXkT?= =?iso-8859-1?q?vyLnTj5Ix1bT9xJzJTIXTIt3qBIZ+zVAq+v3aUkVjA+EaKO1BqzgBRhbHdu0?= =?iso-8859-1?q?RTiFneWJbPNoMtzkTJ32JqUed/9NJt9izA9Pq+Qch7S+roFcYpAkIK7afcfI?= =?iso-8859-1?q?z1CBLLL1NMOSkSMB0Dh+voHpJn46ZyceZdnPBhSRCoBZ+jIHoUSTas197V/s?= =?iso-8859-1?q?1rQdPTDCIiIwQN97eJkZ1fdBy/Sg4SBgUj9Jq2e70jObKK5OwA5MMucP6hM/?= =?iso-8859-1?q?ht+x1Sz8ZVhpOx2sNab/zEUjFjSRFvy3C9xdwbC425/6DpTgVh6QJSRxgEYP?= =?iso-8859-1?q?aPb7/jXK39/+ZZWyTzzESfhr+pNOpofpM4kpLJTR1tU0R5XLdp5RV6FMprbA?= =?iso-8859-1?q?tkMDP9B+pfV8EQF8mrRrsPe9+ORRHifAdB6lkzsO86c404pkGbY5HnIjw78z?= =?iso-8859-1?q?Msggf8QsBoTg2nB1iVDxDPtPZaQ3e/7zVujZ1yz0Efl3ZVv2N34Z/a20cZuz?= =?iso-8859-1?q?3OJSap0XRiP21NMWa+jfyCcEK+v4oqxP3zTVBHcAsB+StPQWXYVptvyDhb9S?= =?iso-8859-1?q?pjgioxvnKmLwCCX6TTCppLZarCtL6TYb5ppVfvPvn4VD2Nn890HlXzHyvG1r?= =?iso-8859-1?q?R1XC+ssWEwQR4juV6t4/APSRLWFn46nDcb/5uncu3YkeMXrlDg2KokpHl8vd?= =?iso-8859-1?q?YZyC2myLmG5zlQR5BM4sCjF4pioWFnYHLlojaXbEmvX4BiiYUUHBHqgwlZfH?= =?iso-8859-1?q?l8xF6CsuJuKNvl0erW1l9JeYoqD81DDcyWMHTqcuDVPAremGaogKFDMabq7Z?= =?iso-8859-1?q?uR3AP2fRCKqHeCmd5dzrarwJSr7VjUyvQ4cV/cvltqdmDNhnA/LNuycvvTE6?= =?iso-8859-1?q?Bu8Gk7B6u+XFu4CbATUjqd4hle0PEvFZD2+aTbeRWGHS7AYFRARscoPd0Ujs?= =?iso-8859-1?q?jQ4wzz1B9vXBrI0cJ1XYVbIAf/gjREEfbBn/LC42Vhv38JeYHDH/+vc3Ovn5?= =?iso-8859-1?q?HLp7frAXET3aYxWnf9mBaU2/cDQsGc1Xb+xnw18CWC6LQO+Ypzn86yK6Ieb8?= =?iso-8859-1?q?=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: 1b4f391e-d94c-473c-2be7-08d9b4d7252d X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Dec 2021 14:30:09.9094 (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: LXO4K4czRth6l0xJb6XNttTcWIDuI35Yx+rjGKYwKlPQ4eesb8zkkaXMKYm+xmLsnSkGRoiprFx8cQbYmXCB2g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4508 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10184 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0 adultscore=0 bulkscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112010081 X-Proofpoint-GUID: 4-388LoRnQmcB9WC-ZlHqM-lAWIZ_AeP X-Proofpoint-ORIG-GUID: 4-388LoRnQmcB9WC-ZlHqM-lAWIZ_AeP X-Stat-Signature: qwpgn98bjyrgrwy8gmkxiphic5rqa7d6 X-Rspamd-Queue-Id: 52E7BE001980 X-Rspamd-Server: rspam07 Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=PFQTeKVZ; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=y+nJ7hGi; spf=none (imf30.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.165.32) smtp.mailfrom=liam.howlett@oracle.com; dmarc=pass (policy=none) header.from=oracle.com X-HE-Tag: 1638370394-412471 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: "Liam R. Howlett" Remove references to mm_struct linked list and highest_vm_end for when they are removed Signed-off-by: Liam R. Howlett --- fs/proc/internal.h | 2 +- fs/proc/task_mmu.c | 73 ++++++++++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 33 deletions(-) diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 03415f3fb3a8..45b132c609ff 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -290,7 +290,7 @@ struct proc_maps_private { struct task_struct *task; struct mm_struct *mm; #ifdef CONFIG_MMU - struct vm_area_struct *tail_vma; + struct vma_iterator iter; #endif #ifdef CONFIG_NUMA struct mempolicy *task_mempolicy; diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 300911d6575f..7cc97cdb88c2 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -122,12 +122,26 @@ static void release_task_mempolicy(struct proc_maps_private *priv) } #endif +static struct vm_area_struct *proc_get_vma(struct proc_maps_private *priv, + loff_t *ppos) +{ + struct vm_area_struct *vma = vma_next(&priv->iter); + + if (vma) { + *ppos = vma->vm_start; + } else { + *ppos = -2UL; + vma = get_gate_vma(priv->mm); + } + + return vma; +} + static void *m_start(struct seq_file *m, loff_t *ppos) { struct proc_maps_private *priv = m->private; unsigned long last_addr = *ppos; struct mm_struct *mm; - struct vm_area_struct *vma; /* See m_next(). Zero at the start or after lseek. */ if (last_addr == -1UL) @@ -151,31 +165,21 @@ static void *m_start(struct seq_file *m, loff_t *ppos) return ERR_PTR(-EINTR); } + vma_iter_init(&priv->iter, mm, last_addr); hold_task_mempolicy(priv); - priv->tail_vma = get_gate_vma(mm); - - vma = find_vma(mm, last_addr); - if (vma) - return vma; + if (last_addr == -2UL) + return get_gate_vma(mm); - return priv->tail_vma; + return proc_get_vma(priv, ppos); } static void *m_next(struct seq_file *m, void *v, loff_t *ppos) { - struct proc_maps_private *priv = m->private; - struct vm_area_struct *next, *vma = v; - - if (vma == priv->tail_vma) - next = NULL; - else if (vma->vm_next) - next = vma->vm_next; - else - next = priv->tail_vma; - - *ppos = next ? next->vm_start : -1UL; - - return next; + if (*ppos == -2UL) { + *ppos = -1UL; + return NULL; + } + return proc_get_vma(m->private, ppos); } static void m_stop(struct seq_file *m, void *v) @@ -843,16 +847,16 @@ static int show_smaps_rollup(struct seq_file *m, void *v) { struct proc_maps_private *priv = m->private; struct mem_size_stats mss; - struct mm_struct *mm; + struct mm_struct *mm = priv->mm; struct vm_area_struct *vma; - unsigned long last_vma_end = 0; + unsigned long vma_start = 0, last_vma_end = 0; int ret = 0; + MA_STATE(mas, &mm->mm_mt, 0, 0); priv->task = get_proc_task(priv->inode); if (!priv->task) return -ESRCH; - mm = priv->mm; if (!mm || !mmget_not_zero(mm)) { ret = -ESRCH; goto out_put_task; @@ -865,8 +869,13 @@ static int show_smaps_rollup(struct seq_file *m, void *v) goto out_put_mm; hold_task_mempolicy(priv); + vma = mas_find(&mas, 0); + + if (unlikely(!vma)) + goto empty_set; - for (vma = priv->mm->mmap; vma;) { + vma_start = vma->vm_start; + do { smap_gather_stats(vma, &mss, 0); last_vma_end = vma->vm_end; @@ -875,6 +884,7 @@ static int show_smaps_rollup(struct seq_file *m, void *v) * access it for write request. */ if (mmap_lock_is_contended(mm)) { + mas_pause(&mas); mmap_read_unlock(mm); ret = mmap_read_lock_killable(mm); if (ret) { @@ -918,7 +928,7 @@ static int show_smaps_rollup(struct seq_file *m, void *v) * contains last_vma_end. * Iterate VMA' from last_vma_end. */ - vma = find_vma(mm, last_vma_end - 1); + vma = mas_find(&mas, ULONG_MAX); /* Case 3 above */ if (!vma) break; @@ -932,11 +942,10 @@ static int show_smaps_rollup(struct seq_file *m, void *v) smap_gather_stats(vma, &mss, last_vma_end); } /* Case 2 above */ - vma = vma->vm_next; - } + } while ((vma = mas_find(&mas, ULONG_MAX)) != NULL); - show_vma_header_prefix(m, priv->mm->mmap->vm_start, - last_vma_end, 0, 0, 0, 0); +empty_set: + show_vma_header_prefix(m, vma_start, last_vma_end, 0, 0, 0, 0); seq_pad(m, ' '); seq_puts(m, "[rollup]\n"); @@ -1229,6 +1238,7 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf, return -ESRCH; mm = get_task_mm(task); if (mm) { + MA_STATE(mas, &mm->mm_mt, 0, 0); struct mmu_notifier_range range; struct clear_refs_private cp = { .type = type, @@ -1248,7 +1258,7 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf, } if (type == CLEAR_REFS_SOFT_DIRTY) { - for (vma = mm->mmap; vma; vma = vma->vm_next) { + mas_for_each(&mas, vma, ULONG_MAX) { if (!(vma->vm_flags & VM_SOFTDIRTY)) continue; vma->vm_flags &= ~VM_SOFTDIRTY; @@ -1260,8 +1270,7 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf, 0, NULL, mm, 0, -1UL); mmu_notifier_invalidate_range_start(&range); } - walk_page_range(mm, 0, mm->highest_vm_end, &clear_refs_walk_ops, - &cp); + walk_page_range(mm, 0, -1, &clear_refs_walk_ops, &cp); if (type == CLEAR_REFS_SOFT_DIRTY) { mmu_notifier_invalidate_range_end(&range); flush_tlb_mm(mm);