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>
CC:     "Matthew Wilcox (Oracle)" <willy@infradead.org>,
        Liam Howlett <liam.howlett@oracle.com>
Subject: [PATCH v13 53/70] mm/ksm: use vma iterators instead of vma linked
 list
Thread-Topic: [PATCH v13 53/70] mm/ksm: use vma iterators instead of vma
 linked list
Thread-Index: AQHYtjjBpoadXE9nQ0e5H0KbayLp9A==
Date:   Mon, 22 Aug 2022 15:06:29 +0000
Message-ID: <20220822150128.1562046-54-Liam.Howlett@oracle.com>
References: <20220822150128.1562046-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220822150128.1562046-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?ZMbwGVGJZA5JwPdLszdO29hdf8Qb0NGqhPJn3UFQoY83vzwoJElD8OwrY3?=
 =?iso-8859-1?Q?4es30VrSNISvkDAyVARJyyOe1QEfPm7kQFe2mlTnmdUTZGm4ezQDlsPIxJ?=
 =?iso-8859-1?Q?QsLLZ2K3d73TVsGfTWQroucty+ZAocN4ncQQI1RXTustLVmegetWkvw2nB?=
 =?iso-8859-1?Q?F5u55WU6R8osn0FP9sKnnfiKSG6BxfK8r/is6hqfCOT1oTGmZLCAU0qpyp?=
 =?iso-8859-1?Q?CUrMwMebfTLK4dz8NjrHT4u2XSw+UTQ9LHI+wjcvv4HJNiLVwKZxy5kl2g?=
 =?iso-8859-1?Q?mG5qqpLJmSLSX1lyOs14j74tN6fWBoH5LoHoIuY7UoBiIMyxsxYKwztkfC?=
 =?iso-8859-1?Q?kz9XPfdWoIPSPx7duhnOAYo/uhPTEro6mKFbNKXUf/y87PjwTKnR1SujTo?=
 =?iso-8859-1?Q?Ml1i682S+XF43dzDlMPCWw4jMqrfxFmGTsHvdepXwa53q9PGhVHthBVAsq?=
 =?iso-8859-1?Q?VI5JClwSuAfe01h60RP1T+H3GLCkT72RDYDy4dGcB6//m5biYfG4GRANL4?=
 =?iso-8859-1?Q?h1xOqGBRVqcN9eSgOiF9XS8d7M8+nxyReeHqCALaj+Gqd2IIXS0TbU/EjN?=
 =?iso-8859-1?Q?y8nN1yDbdPSG1CNTpan8EIh3GD9/LB1+NRVKDEcIQwTgmz4qXMRie9y3ZJ?=
 =?iso-8859-1?Q?zBNnwA8zNwV7gLJ5rbGwnfkLG6JylwnNoKhPozXmYM9XlaLruKJgTlTZZ6?=
 =?iso-8859-1?Q?n0LRYELe8gsoGcWczpAvRcoeNJ7+y8NbK8O8rkE3dr9r5Ci27/eO6YfC3l?=
 =?iso-8859-1?Q?B8zrb9/dUBARoMWs4CfC1UIzQL9XuGxcPE7rwvE9YXMT2RhRnNfJjjlYk8?=
 =?iso-8859-1?Q?ORsrMnAC9cHcjgmTspXb0UYA5+SlS12hjY1XkihrRGMd1UdLrq7xzzH1no?=
 =?iso-8859-1?Q?1PgzJKNDHLnlSZx60IyGi6afo59ccc5LDA6MLrKZRD1rcmfODryWu5iBp7?=
 =?iso-8859-1?Q?/BHsmyQXuxHzyoNnCHvd0yY84ECndqefFcjXFGHvAki8zHLhTWuwk1/Mww?=
 =?iso-8859-1?Q?wIwvGJbXPKjDc/gRHeoNRaAxpMQxrxTLEvjx5bBvfkXtLw0ronId9x+bNc?=
 =?iso-8859-1?Q?oocjNc6MU85PyKEKtCbRmyXoWas2PoVOFAVTR8nl9uJrusnELtPZO9l+Ku?=
 =?iso-8859-1?Q?QQO4Y1Yd21sCYQq+0heYjtLutaXxBjggGnsrcw8JCfbsEUsebYX+PwXSeh?=
 =?iso-8859-1?Q?FW5z8DeMQhqYrDWNnT1R8ZXVTMdqA/iat8U7cuOloa786+kZ747vjKLBuw?=
 =?iso-8859-1?Q?zSOeDuZ6qFMaAO+AH1hTpHcHGwnEcCK0SScbSzYWPb5t+J+aoodLrL4/si?=
 =?iso-8859-1?Q?1vhgAolvZFSH0pHq0BkGtADhRxFJnG36E68JYrZseE4eseoi/AqxrFehJ7?=
 =?iso-8859-1?Q?dCD8iJu4BfGQqfU/P8ncJaVrejeDHQIeTxfiXSVQa93DJfQeuLTYKig+n9?=
 =?iso-8859-1?Q?UE1dj6pjXVTDl8JbzqoILrXOJCKe+y31YIWFq3KpUEERUhVL9vhhD0GSkP?=
 =?iso-8859-1?Q?uQIKccB+EU7nM/DtUlaEiA5HEP1ZtgUxSHFUUOJBB4T7OXotbs8KrgKDdz?=
 =?iso-8859-1?Q?2CZId6h8V5WMGdoeuUiFYIjEosPOywJHzgVZyjGpkJlcw588pHxEu+6bO+?=
 =?iso-8859-1?Q?XEY9eC5IADQAQxPNERWZeWc2ZFfVj6sw+DwbEwugdMJt+XXFIbvcaz+g?=
 =?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: ecef3125-9218-4297-5f64-08da844fe609
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Aug 2022 15:06:29.0974
 (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: UeOjDSU2KKX165WbQK4/muxzSTA0IxxNq8Qw47CAKxPH650C6RfMNuDKqobDHMMJX03aCbXSWJuc2vk72AA1DA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR10MB1433
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-22_09,2022-08-22_02,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 mlxlogscore=999 adultscore=0
 spamscore=0 phishscore=0 malwarescore=0 bulkscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000
 definitions=main-2208220065
X-Proofpoint-ORIG-GUID: OwWOG9-ANdoKPqifqSDnN_jHtdLLBZtM
X-Proofpoint-GUID: OwWOG9-ANdoKPqifqSDnN_jHtdLLBZtM
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,T_SCC_BODY_TEXT_LINE
        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.

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 2f315c69fa2c..a98bc3beb874 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)
@@ -2242,6 +2244,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))
@@ -2300,13 +2303,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)
@@ -2344,6 +2347,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