From patchwork Sun Jul 17 02:46:54 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: 12920419 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 C7319C43334 for ; Sun, 17 Jul 2022 04:14:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 594A0940036; Sun, 17 Jul 2022 00:14:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5436694002D; Sun, 17 Jul 2022 00:14:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3BDDF940036; Sun, 17 Jul 2022 00:14:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2E22394002D for ; Sun, 17 Jul 2022 00:14:49 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0319220845 for ; Sun, 17 Jul 2022 04:14:48 +0000 (UTC) X-FDA: 79695275898.30.DF5FC8E Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf10.hostedemail.com (Postfix) with ESMTP id 791DBC003C for ; Sun, 17 Jul 2022 04:14:48 +0000 (UTC) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26GJ8OBc003742; Sun, 17 Jul 2022 02:47:35 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=gVKwu3mAF/BrzDydDYF3kwhOpwQY3z3J/rdlaKypkQE=; b=Me8kOB6AckNG+4AHibAMWOq6wfdtXEVN/SFiJpsJG4Joi3SFw/q1ehemIQbP79rwu/0Q IJVv7qrNFUigtb/Y19Etwbx9K5uBltnVy1stD3JE2fayeIXDZr5S41gmUPXD9f0UMINE Cs3u7ITq6+fQzi5g/o6ghqzGXX30uwMovlm0xsYcN6iMnXPuQwT54BXQKltN0LRpop5C JqTGIKtwgbYLiJ13NFqLfPj+xHwvoMkPFdt8C9NYybhN/FOoTsrhQQlE7TmSeGFf8GGY LWqLWmHkzGiTGwXTzSJdoN/p04GyqHkqSDp/iq+Qq17QVVAMWfXRtPLgWxp/0htUgGyK vg== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbmxs0x2c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 17 Jul 2022 02:47:34 +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 26GMYIxt036125; Sun, 17 Jul 2022 02:47:33 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2173.outbound.protection.outlook.com [104.47.59.173]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1ejp6au-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 17 Jul 2022 02:47:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lvXN3b2AmMEVVIpBEXp7010sZ8zSSDOzG5gB+EUTsIKp65JGshrJoa6TP0vOqqgEdjRWypzuE8x6SMyvy49Gf5gkGvob4vIiy8t8Jm7NEDK9FT3z4Ck9F7V/lhowdJEYCs2UVJ7OHKvjr0rRKIr6BjUUf8NieN/tzFX5YSRcba6FIqbDsUfNgwwRBBuO/yjA0P3cLMNSt/Y5ts54ZpUMmvC9zuTU/bbYtZJi9SNYbAY+WTFqIaIF8D+7BDUyd66oqXX4fVeRkHUVRiPIsnmchN0H7TO8O+pBm10L0rHWroFdyDFT2nN1XyXdOhUaVjMKQg8+Nt2879vAHOIjvRFOgw== 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=gVKwu3mAF/BrzDydDYF3kwhOpwQY3z3J/rdlaKypkQE=; b=oCnia650DOV5lD8vi5BT+NEHguxBEMycIIlMgzowUiNyBn/YtwRzlhxY3EL9LMhP/xtpR1pF05F84cKYPeZkQ0NXvo3rUWbM3jROBqXrvwRcdCuEPDwXa+vMRscBiBpb6C2pXkeHYlPubZtHSAby1wub/Ji7sQrVMcJKer3xJ8LvwQ1vIkxsUZMy/+357QvQcbI/b5Y6BxwbXVQvknhYnNvCU5bu+B7CyQ7731Fn4rUaFjGe74FzEwJF4k49+wfLyW8EXG0PVFFhrHeG86bizpQuqfu04argdk5eplXxKrqSpBGKNfuzStH7Yzq4sJj3/ywzoiUWFmPa2VetKa5PzQ== 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=gVKwu3mAF/BrzDydDYF3kwhOpwQY3z3J/rdlaKypkQE=; b=TjUZyODf8IAEB54H8IZJzb2GffaYmz1mYw8xeUHJER9M6ZTAf4HgSRDM90RJUrKmdbB+7CAxxcceq52+GcFiGpp4JMlcikIgEVSyJ40Chw1sunMzqDexunq9KDicYGLhciAvV9NpUAsoQqqYoJMK5bBQzf6klZmjC0EMS6IhKoc= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by PH0PR10MB4504.namprd10.prod.outlook.com (2603:10b6:510:42::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.14; Sun, 17 Jul 2022 02:47:31 +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:31 +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 53/69] mm/ksm: use vma iterators instead of vma linked list Thread-Topic: [PATCH v11 53/69] mm/ksm: use vma iterators instead of vma linked list Thread-Index: AQHYmYd5PG73IiVjkk+SAHrjt/8oZg== Date: Sun, 17 Jul 2022 02:46:54 +0000 Message-ID: <20220717024615.2106835-54-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: 965d8c29-4c24-417b-efbe-08da679eb20b x-ms-traffictypediagnostic: PH0PR10MB4504:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: PIUCscPNtvnZTO/2GP2t4vvfZm30lNUVGuCf1qeYwg9urjzWYkRvhSzkcprJ1f8bc5YbhKRBOXAmNhsWxtRYDjjvhliCGM+m6v1hhSuL8uO0v8hiOTq0gvT4gd+H+bgVBuW/rZiFXODCjMYNu8vXAK62uTEHfacXviwt0sJ46X+W1VQL7W9PlQFoZ3TC0LKW/IG4VIdxLq0+yowfP+2EJdwBaGZmFVx/nVRgju4j7gBubFJ+21Dw6muV/uZs5OVX6bKP4ACpZ5UTSMzfIjisc46nEI+YrWVv+mI41MYcBtQafIb2COc+1to8I0ybVKN4SGx8snrDPpPY1wzB/sK5GAD+Qgjt3ai5+Qy1NI6bHUKQ8iWab3dAwSKYxQZVUScP2IwcluDj7WwKBHC281ea3vHNdJPlBii0iEPeZHLyMNll3jWPCQAaILfjGgunDMFSOYt9ilKOYV2yUFG0q4MUVnVAiyYBf7CsORAmVRaT1ZroEaE9tEqisyTZJeGez671OJ3s8+VhaI79kpta835C1iorhJOYurZ2R0iSqJMbutCTBm1JfjRtvyMojLkBLzasP0Kg7XzaALIscomynCAxGR77ip4njXmJbKAPh5qdiEnl+A9wK1vc0xMK11vKQk00Bal/b413QBikXUlGmMRSFCS2tt+IIqLTgpdndldJ2UxSzNZHVJoxv199Mlpz9WtDu1J8oGACG7LwTfzWJnfC7k62XXVJDiFE/FuOAAtT/IMPEMu77gdnPwe1sa3/c8JgeCou+zGBjfOyLkYXGgBislSW4NsyNq1AGu41kqSPSwZmcSQjomV6orMNxG35Sy1c0bASBZxi41Z5s3LoEg8ElBodttETuFzCBk3ytbqRUgtHKCnQykmea59VOguy/+Nu 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)(376002)(39860400002)(366004)(346002)(396003)(136003)(966005)(6486002)(83380400001)(1076003)(41300700001)(2906002)(38070700005)(44832011)(8936002)(6666004)(478600001)(5660300002)(110136005)(86362001)(2616005)(122000001)(6506007)(36756003)(26005)(6512007)(38100700002)(186003)(8676002)(316002)(64756008)(71200400001)(66446008)(91956017)(76116006)(66476007)(66946007)(66556008);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?iowQmyGzuCYtBesz1ctA9WB?= =?iso-8859-1?q?Eqesh/wsUvAh+mn6IxBtDRKZ6wM0lxHIVt2pevOeD+Vdk5HDfvmI3NmgKrzS?= =?iso-8859-1?q?4c5zfdAH1gU8vyTXEUljfKcgKVcO9W4l60x54S/YTNueawCrDJBkT5Sh5/O3?= =?iso-8859-1?q?UXzWG0MzQ5b4H4JNQGv+sagfdan7YSM+CYbZpYoiHDYBH5KPJd+lwswf6rzm?= =?iso-8859-1?q?NckrAL4IkWDryyqv2sWGs7O84mLjB2GbJqONuwxSlYrlmSLYmv3ZbaHA13kt?= =?iso-8859-1?q?OtKL/L9PbSHm0/b4LKM6+h31SJvFXbsycuh3I/Aj9fMcsCzJLaIdnHscpj6j?= =?iso-8859-1?q?OYnM6DlAB1AGkwUBAH2I769HvD7CLXtdoBbBJ5DYjzM8EMciMxArMUvOHv+8?= =?iso-8859-1?q?W+vH73axYwqCOe9WveMjhUnh7LjA4F40+aNMQt3rW4XMVdl9hIJ7jSulsdVx?= =?iso-8859-1?q?tYqDeDSSkWxllffzL9Brfzm+EcoSzc5hPtoLOQLOwwN4KuEvhLxOgCbkm2op?= =?iso-8859-1?q?NLjqlCfnNK+M3vfck6Fkjg8BtDWi/zXPSilYV6x4TYdSCIDUikN2bIJLqAd+?= =?iso-8859-1?q?RLVD/jpiaN1Xihn9pZmXOeo62DLWsosu5bxF7hYTeczddpy4VNCbr0F5xe1J?= =?iso-8859-1?q?JZI+R2i2H/aTZLtb1tcrnesmT1hWPtl5GgnuA2/F/MxOKoEzh0uzSUY/Nmy/?= =?iso-8859-1?q?Sqw9GcKbULjP3EBsK5IxdJs9VMyKGCHG90jjIWADBr//vSf0o6LI3etaLx7L?= =?iso-8859-1?q?laCnwe+cXuVdmSVyf77EgVI//oyAKX8NkY9dCKi5fi9wnsDXx99P0mfV7KCV?= =?iso-8859-1?q?Y+EEpHYha23rHpI6leHEv6tdHuZjT9lx2lFvz60UeTiOUb+Xhrjzi3iIXgyl?= =?iso-8859-1?q?l5CTdHifKf+gN1k+Y/7+jKbZrcisABpVVBqXA37UT9hFttVSi0U11G5uR2v+?= =?iso-8859-1?q?UEm1Xycee6x/4sznrYqDNKc9phCfSoTe6WKMGm1NKwwlMTjffVaLTu/4Y6Nw?= =?iso-8859-1?q?OJKDBEVh9BaJtofx67deh+3aQAogoVpRKUaVALI5k7ORwNl/rZhDfFGCgDWI?= =?iso-8859-1?q?P1fC83+ntVHfCkXbgBJeNyb/+yGje1xiWMaV33sTUYZkak3WQAg5jvZ6+zWJ?= =?iso-8859-1?q?Ex75jk12mIgyfGfuHVhy9ZBM9lsxR4tXTgn/9pOXfoEHRiYQpMa45lmm2KGJ?= =?iso-8859-1?q?4EPwMdh1n5QNfLBjUa+jHC8qJBsRpD1tc+Q3FU1OsVy2xXucWabMlsVyPCbI?= =?iso-8859-1?q?/WO2XDBAXptE4aaYefOxmkeAe9gfiFCigO9esbghMzeqBxYZBLR00JXvJcKJ?= =?iso-8859-1?q?fBG+aev7w252a0aUCjgXFm/sVnsNQTpOyguMn1zFPcvKotu92/mjgw9PaWja?= =?iso-8859-1?q?iNhBe+Plr5Hp6KEsiGrpuZ/Gbk42cbb3fpA6tymxkvvPjfgQXN/sKT/RAGKj?= =?iso-8859-1?q?lpYP7vd94NFDZW66Gu0eKTkvC9uI+7FoMImzuM0cL20yjxGxOcoVYm9iML6Z?= =?iso-8859-1?q?WGbl//UrQ28jn9xAeg+IpI18gmEOvCrf2iqFvmY8PplcHzrIxg7pFKXLlHrS?= =?iso-8859-1?q?BLPghNXW+wogJlhP9+Lcpt5xijd8yMlKQ6OAx7qkfXgBSNDm/2TC7jfz+d//?= =?iso-8859-1?q?UrohPWTvaPEPhWDlKXfD8mfVcAtJGoNSLpnPqow=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: 965d8c29-4c24-417b-efbe-08da679eb20b X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:54.6148 (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: j4csmMDRTZROCAlbNk1XbQJkIxQpCKDzklguREDcDVmIfzK2UOqLFvuCX66SAvnnbCRM/BxAegyXHVObk2E8kg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4504 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-GUID: exe3-WHjwjvkvCquhLOmDp-1uFeIRikD X-Proofpoint-ORIG-GUID: exe3-WHjwjvkvCquhLOmDp-1uFeIRikD ARC-Authentication-Results: i=2; imf10.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=Me8kOB6A; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=TjUZyODf; dmarc=pass (policy=none) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=none (imf10.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=1658031288; 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=gVKwu3mAF/BrzDydDYF3kwhOpwQY3z3J/rdlaKypkQE=; b=MpbWLOfNn5BrEMsVkw6lEyqYfE96UzR8sY/Pr3Zb5xewwkN4O8Ll7Xx11A9OqqA9bbLAYL TR4Dz/sFaHy+5lnzGWRYaw+dFzrDB/2cRFFhUf1nVrM+VU3bUXFNs10ZOmBXJa3NGobL7x Lp/vYThDuhJjfj3rf8rjTghx2wME1uk= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1658031288; a=rsa-sha256; cv=pass; b=todRO47RtwKz8epM41hH3uqMKCy1FRlbtTt8ZREB2HuVI2rg/H3e5unZpg++YGGhgzY+xa czvoBv3Nwego3zqzrcK7zjZ0PLLyRP0G3YIW9W8qoW3whhC3w2+i8fMCIWk0N/yHLiurpC CW+cmBPKb9XzcZRCnuChab3vsAbrd1o= X-Rspamd-Queue-Id: 791DBC003C X-Rspamd-Server: rspam04 Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=Me8kOB6A; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=TjUZyODf; dmarc=pass (policy=none) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=none (imf10.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-Rspam-User: X-Stat-Signature: dcdimkm7gzpxskfja6fb1fx8njbm888s X-HE-Tag: 1658031288-285973 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)" Remove the use of the linked list for eventual removal. Link: https://lkml.kernel.org/r/20220504011345.662299-38-Liam.Howlett@oracle.com Link: https://lkml.kernel.org/r/20220621204632.3370049-54-Liam.Howlett@oracle.com Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Liam R. Howlett Cc: Catalin Marinas Cc: David Howells Cc: SeongJae Park Cc: Vlastimil Babka Cc: Will Deacon Cc: Davidlohr Bueso Signed-off-by: Andrew Morton --- mm/ksm.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index 54f78c9eecae..4e3d794f6b09 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -981,11 +981,13 @@ static int unmerge_and_remove_all_rmap_items(void) struct mm_slot, mm_list); spin_unlock(&ksm_mmlist_lock); - for (mm_slot = ksm_scan.mm_slot; - mm_slot != &ksm_mm_head; mm_slot = ksm_scan.mm_slot) { + for (mm_slot = ksm_scan.mm_slot; mm_slot != &ksm_mm_head; + mm_slot = ksm_scan.mm_slot) { + VMA_ITERATOR(vmi, mm_slot->mm, 0); + mm = mm_slot->mm; mmap_read_lock(mm); - for (vma = mm->mmap; vma; vma = vma->vm_next) { + for_each_vma(vmi, vma) { if (ksm_test_exit(mm)) break; if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma) @@ -2232,6 +2234,7 @@ static struct rmap_item *scan_get_next_rmap_item(struct page **page) struct mm_slot *slot; struct vm_area_struct *vma; struct rmap_item *rmap_item; + struct vma_iterator vmi; int nid; if (list_empty(&ksm_mm_head.mm_list)) @@ -2290,13 +2293,13 @@ static struct rmap_item *scan_get_next_rmap_item(struct page **page) } mm = slot->mm; + vma_iter_init(&vmi, mm, ksm_scan.address); + mmap_read_lock(mm); if (ksm_test_exit(mm)) - vma = NULL; - else - vma = find_vma(mm, ksm_scan.address); + goto no_vmas; - for (; vma; vma = vma->vm_next) { + for_each_vma(vmi, vma) { if (!(vma->vm_flags & VM_MERGEABLE)) continue; if (ksm_scan.address < vma->vm_start) @@ -2334,6 +2337,7 @@ static struct rmap_item *scan_get_next_rmap_item(struct page **page) } if (ksm_test_exit(mm)) { +no_vmas: ksm_scan.address = 0; ksm_scan.rmap_list = &slot->rmap_list; }