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:     "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>,
        "linux-mm@kvack.org" <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH v5 54/70] mm/ksm: Use vma iterators instead of vma linked list
Thread-Topic: [PATCH v5 54/70] mm/ksm: Use vma iterators instead of vma linked
 list
Thread-Index: AQHYF96ArCBd1iL9Y0aRdhvK9S40Bg==
Date:   Wed, 2 Feb 2022 02:42:20 +0000
Message-ID: <20220202024137.2516438-55-Liam.Howlett@oracle.com>
References: <20220202024137.2516438-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220202024137.2516438-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?WyfSqoMhw3yKKHzLp90rY+rBYYdIdWuhsyJpve4JJd/HQ01WIY9XGpkHXj?=
 =?iso-8859-1?Q?pf+PB3eNPf/ZRjvio9hGqWNJ9h6pSmAATcuzf5uY7iklPYiJXvFZ9d1MvC?=
 =?iso-8859-1?Q?KNblAUUbFtbLkNQTP9cVmjdTPRGXNHafZTOe1AhaJlqax9g7o3huLiWaBf?=
 =?iso-8859-1?Q?TXlP3xWTZ6MTx9uEj8g2jGOCMz639CWqVty9VK287us0BLVFp4GhGehVK3?=
 =?iso-8859-1?Q?ztNj4dwLyptmDXFSjiU9PCh9186esQ7R0DOva26PDWNSOkyFGAw2cEpuNq?=
 =?iso-8859-1?Q?dYpx3vkDaDeL4tYRXGRstDQYNlJgg3L8DeYp+yZiYQ4Mg8Ijbv1YjXABMr?=
 =?iso-8859-1?Q?SEG8N4a2STFcKLT+ESCKtpMAuct+8JieduDH9oU83JjLVmOusC6MtdBVeg?=
 =?iso-8859-1?Q?Ir46KXOJJwwgRkMwyTiHviIiK+YfbKB/S0BiraMFIaq9oi9Xr3qa30GqKE?=
 =?iso-8859-1?Q?MeiinSoOLi/W5fA+DWH8CsnwGR+VGFWkHGRLtElts+SLtP5tW4Vnx5ZjUk?=
 =?iso-8859-1?Q?1K9k1MLbWZDlgs0f88vpv6/LODaJyyEQxk4K1oSX9/dmdfY201ekeBxgDy?=
 =?iso-8859-1?Q?6h9YqQKjIsdlm0EmqGkRwHkmQZ9Pu1L0wCoZKtKzdmNmd/4ayvX9zmdUrv?=
 =?iso-8859-1?Q?XNbGtuGqinQYjn0IN2SJlUPN21T/YE+HJb7URpgL0qACJk28IcT9gP+w+K?=
 =?iso-8859-1?Q?7OcOj3JqslRksIV6NMspvl4Qz7pIUYmV7jQaQ4UoGaroLNqBbPNLLmHS9m?=
 =?iso-8859-1?Q?kKlwp6AKgbDqGnMe2PDZic/uiJoLxyvxb5Oh0ySY1Tcb9//0wdD4gEULHt?=
 =?iso-8859-1?Q?SfbvenSR5rSI+C/qZRUG+J62rP0mgMnzkKLbgBG9Uuua1dSVoGne4RKWSN?=
 =?iso-8859-1?Q?QULfxqj+ZiNFrXIdhiDdptBy1cXwX8Fl2tDzBeQYo/GouyM4en6QhA4ZTN?=
 =?iso-8859-1?Q?qjWt7cdcal7PX1O/wVqhIyvkxDMLfsoKxR1EGGrQ8Hldb6iRNjwhczzo+s?=
 =?iso-8859-1?Q?r4HseFjca9yD4KO5iAqtBrxjUpt8sfJ1/SjlAdVVkW6wlvQWJ3Qu4InGrq?=
 =?iso-8859-1?Q?secnwOxLyMRIQghnzs4YkeCaVKnqFI1UQfgBKLdLNUeH6wxUAIazWlD+Ms?=
 =?iso-8859-1?Q?PmOi9NsXr8S9pY/YvDiC8fjqZXo/0/OVf8NtPnt3sBQJmn+P5IK0bg3cWi?=
 =?iso-8859-1?Q?ugCH5fR4acmMO6+oAuGsRQzJVyVCmj26NzDyaLDKYVFVk31tQpG/Tx2E2t?=
 =?iso-8859-1?Q?5O6dQIIFgcuEJ6Nn1Q0UoU1Nsx4N3e7cXFn9Txdi6u+HzuHJC6WSnI3/SJ?=
 =?iso-8859-1?Q?GWJ5U4EmImbo18IFJf0eaTcT89GSi706IbmaSO7gnMur4KA6hy7np3sdBw?=
 =?iso-8859-1?Q?dHpWAj8rIw8MT4hikqLXztv1xVgyW+I6AnxIzHvUsEzqj0tNcqc/MBelDU?=
 =?iso-8859-1?Q?/huMadGHPEjTA29beaUzDrIUjVfRh653xG0hNOevyoLjIhlgHotSBJIczP?=
 =?iso-8859-1?Q?qraHFjEzgXJs6o0OT599xFI4wrxa/r+0VWtvX9fc4dKwJSUWXeoYR6Vs0K?=
 =?iso-8859-1?Q?kbeVxi0YbQBFYUGPidgK9yUT/fUPeP6NAfl+Kf85phziMIDGmY/bTCd81P?=
 =?iso-8859-1?Q?IqPsBHv3UIW6BA0i2fAfSg0QJYkY7Vl/sSD1iSFm8StYECy5v+qnD7syae?=
 =?iso-8859-1?Q?2CakwH5RpZsmTqlme+8=3D?=
Content-Type: text/plain; charset="iso-8859-1"
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: 84388233-bc63-4b75-9cdd-08d9e5f5b7bf
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2022 02:42:20.7039
 (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: 8l7zNFkTqYdIHCR3dSJ9YpJ8x0ip8BTT6FhnOH4zlPUU+zjqmW9qkxeQmRKN5QzP/ePyiG4Uayjx0/n76iz/iA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB5865
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10245 signatures=673430
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 phishscore=0
 mlxscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2202020010
X-Proofpoint-ORIG-GUID: 0zXVJxONmdiABx_0PgfZH8AZyAlPP8tV
X-Proofpoint-GUID: 0zXVJxONmdiABx_0PgfZH8AZyAlPP8tV
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>

Remove the use of the linked list for eventual removal.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---
 mm/ksm.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/mm/ksm.c b/mm/ksm.c
index c20bd4d9a0d9..487e62532459 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -974,11 +974,13 @@ static int unmerge_and_remove_all_rmap_items(void)
 						struct mm_slot, mm_list);
 	spin_unlock(&ksm_mmlist_lock);
=20
-	for (mm_slot =3D ksm_scan.mm_slot;
-			mm_slot !=3D &ksm_mm_head; mm_slot =3D ksm_scan.mm_slot) {
+	for (mm_slot =3D ksm_scan.mm_slot; mm_slot !=3D &ksm_mm_head;
+	     mm_slot =3D ksm_scan.mm_slot) {
+		VMA_ITERATOR(vmi, mm_slot->mm, 0);
+
 		mm =3D mm_slot->mm;
 		mmap_read_lock(mm);
-		for (vma =3D mm->mmap; vma; vma =3D vma->vm_next) {
+		for_each_vma(vmi, vma) {
 			if (ksm_test_exit(mm))
 				break;
 			if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
@@ -2226,6 +2228,7 @@ static struct rmap_item *scan_get_next_rmap_item(stru=
ct page **page)
 	struct mm_slot *slot;
 	struct vm_area_struct *vma;
 	struct rmap_item *rmap_item;
+	struct vma_iterator vmi;
 	int nid;
=20
 	if (list_empty(&ksm_mm_head.mm_list))
@@ -2284,13 +2287,13 @@ static struct rmap_item *scan_get_next_rmap_item(st=
ruct page **page)
 	}
=20
 	mm =3D slot->mm;
+	vma_iter_init(&vmi, mm, ksm_scan.address);
+
 	mmap_read_lock(mm);
 	if (ksm_test_exit(mm))
-		vma =3D NULL;
-	else
-		vma =3D find_vma(mm, ksm_scan.address);
+		goto no_vmas;
=20
-	for (; vma; vma =3D vma->vm_next) {
+	for_each_vma(vmi, vma) {
 		if (!(vma->vm_flags & VM_MERGEABLE))
 			continue;
 		if (ksm_scan.address < vma->vm_start)
@@ -2328,6 +2331,7 @@ static struct rmap_item *scan_get_next_rmap_item(stru=
ct page **page)
 	}
=20
 	if (ksm_test_exit(mm)) {
+no_vmas:
 		ksm_scan.address =3D 0;
 		ksm_scan.rmap_list =3D &slot->rmap_list;
 	}
--=20
2.34.1