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>,
        Yu Zhao <yuzhao@google.com>, Hugh Dickins <hughd@google.com>
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-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?iowQmyGzuCYtBesz1ctA9WBEqesh/wsUvAh+mn6IxBtDRKZ6wM0lxHIVt2?=
 =?iso-8859-1?Q?pevOeD+Vdk5HDfvmI3NmgKrzS4c5zfdAH1gU8vyTXEUljfKcgKVcO9W4l6?=
 =?iso-8859-1?Q?0x54S/YTNueawCrDJBkT5Sh5/O3UXzWG0MzQ5b4H4JNQGv+sagfdan7YSM?=
 =?iso-8859-1?Q?+CYbZpYoiHDYBH5KPJd+lwswf6rzmNckrAL4IkWDryyqv2sWGs7O84mLjB?=
 =?iso-8859-1?Q?2GbJqONuwxSlYrlmSLYmv3ZbaHA13ktOtKL/L9PbSHm0/b4LKM6+h31SJv?=
 =?iso-8859-1?Q?FXbsycuh3I/Aj9fMcsCzJLaIdnHscpj6jOYnM6DlAB1AGkwUBAH2I769Hv?=
 =?iso-8859-1?Q?D7CLXtdoBbBJ5DYjzM8EMciMxArMUvOHv+8W+vH73axYwqCOe9WveMjhUn?=
 =?iso-8859-1?Q?h7LjA4F40+aNMQt3rW4XMVdl9hIJ7jSulsdVxtYqDeDSSkWxllffzL9Brf?=
 =?iso-8859-1?Q?zm+EcoSzc5hPtoLOQLOwwN4KuEvhLxOgCbkm2opNLjqlCfnNK+M3vfck6F?=
 =?iso-8859-1?Q?kjg8BtDWi/zXPSilYV6x4TYdSCIDUikN2bIJLqAd+RLVD/jpiaN1Xihn9p?=
 =?iso-8859-1?Q?ZmXOeo62DLWsosu5bxF7hYTeczddpy4VNCbr0F5xe1JJZI+R2i2H/aTZLt?=
 =?iso-8859-1?Q?b1tcrnesmT1hWPtl5GgnuA2/F/MxOKoEzh0uzSUY/Nmy/Sqw9GcKbULjP3?=
 =?iso-8859-1?Q?EBsK5IxdJs9VMyKGCHG90jjIWADBr//vSf0o6LI3etaLx7LlaCnwe+cXuV?=
 =?iso-8859-1?Q?dmSVyf77EgVI//oyAKX8NkY9dCKi5fi9wnsDXx99P0mfV7KCVY+EEpHYha?=
 =?iso-8859-1?Q?23rHpI6leHEv6tdHuZjT9lx2lFvz60UeTiOUb+Xhrjzi3iIXgyll5CTdHi?=
 =?iso-8859-1?Q?fKf+gN1k+Y/7+jKbZrcisABpVVBqXA37UT9hFttVSi0U11G5uR2v+UEm1X?=
 =?iso-8859-1?Q?ycee6x/4sznrYqDNKc9phCfSoTe6WKMGm1NKwwlMTjffVaLTu/4Y6NwOJK?=
 =?iso-8859-1?Q?DBEVh9BaJtofx67deh+3aQAogoVpRKUaVALI5k7ORwNl/rZhDfFGCgDWIP?=
 =?iso-8859-1?Q?1fC83+ntVHfCkXbgBJeNyb/+yGje1xiWMaV33sTUYZkak3WQAg5jvZ6+zW?=
 =?iso-8859-1?Q?JEx75jk12mIgyfGfuHVhy9ZBM9lsxR4tXTgn/9pOXfoEHRiYQpMa45lmm2?=
 =?iso-8859-1?Q?KGJ4EPwMdh1n5QNfLBjUa+jHC8qJBsRpD1tc+Q3FU1OsVy2xXucWabMlsV?=
 =?iso-8859-1?Q?yPCbI/WO2XDBAXptE4aaYefOxmkeAe9gfiFCigO9esbghMzeqBxYZBLR00?=
 =?iso-8859-1?Q?JXvJcKJfBG+aev7w252a0aUCjgXFm/sVnsNQTpOyguMn1zFPcvKotu92/m?=
 =?iso-8859-1?Q?jgw9PaWjaiNhBe+Plr5Hp6KEsiGrpuZ/Gbk42cbb3fpA6tymxkvvPjfgQX?=
 =?iso-8859-1?Q?N/sKT/RAGKjlpYP7vd94NFDZW66Gu0eKTkvC9uI+7FoMImzuM0cL20yjxG?=
 =?iso-8859-1?Q?xOcoVYm9iML6ZWGbl//UrQ28jn9xAeg+IpI18gmEOvCrf2iqFvmY8PplcH?=
 =?iso-8859-1?Q?zrIxg7pFKXLlHrSBLPghNXW+wogJlhP9+Lcpt5xijd8yMlKQ6OAx7qkfXg?=
 =?iso-8859-1?Q?BSNDm/2TC7jfz+d//UrohPWTvaPEPhWDlKXfD8mfVcAtJGoNSLpnPqow?=
 =?iso-8859-1?Q?=3D=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: 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
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: "Matthew Wilcox (Oracle)" <willy@infradead.org>

Remove the use of the linked list for eventual removal.

Link: https://lkml.kernel.org/r/20220504011345.662299-38-Liam.Howlett@oracl=
e.com
Link: https://lkml.kernel.org/r/20220621204632.3370049-54-Liam.Howlett@orac=
le.com
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Howells <dhowells@redhat.com>
Cc: SeongJae Park <sj@kernel.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
 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);
=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)
@@ -2232,6 +2234,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))
@@ -2290,13 +2293,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)
@@ -2334,6 +2337,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.35.1