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 16/69] proc: remove VMA rbtree use from nommu
Thread-Topic: [PATCH v11 16/69] proc: remove VMA rbtree use from nommu
Thread-Index: AQHYmYdxUpNeS4XFt0qZx6cjdA4eOw==
Date:   Sun, 17 Jul 2022 02:46:41 +0000
Message-ID: <20220717024615.2106835-17-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?yD6lloMe+FwGdLNC5upEjjk7uV+QmUeqe5jgqRk3IJ3gWD02GfXRAukcK2?=
 =?iso-8859-1?Q?gPrPyoUMkkaWdu6aP1uB7XFhL53IahcmcFotNHQBU/AFSOTfTIbJgp7zs1?=
 =?iso-8859-1?Q?H7tqK/tboMOuGFqx2L4p41DD8aZyBHo2kIQsWsFBYdl0ZkEH26vH7s42nA?=
 =?iso-8859-1?Q?j5WQlW9lF/duL7uqe+qy1jBbMLQNxPc0LqPh0oivVmltfUckxgBd6Ny7oC?=
 =?iso-8859-1?Q?zfqrGNoueZxacXCEigXeGHT7uHtVKOGd3Zym0norYXBhSXRAmG0Uuqm3H1?=
 =?iso-8859-1?Q?l2/fdrUtOeuzw95ae4yTm/h3g0IstYmxpOqOQ29bbN8hpOhwzOuGhcJhSd?=
 =?iso-8859-1?Q?ctEScOPK8B35cVsaIcON1T2JXnX/4Q+zsA/InqS58HzfgHIwCsbKGOAYZH?=
 =?iso-8859-1?Q?yz0vVpoaELFu3eOsKypx7cS/40mJuOW7lslLv2kDusPm4Hxc8WNoS/IdcB?=
 =?iso-8859-1?Q?zMMUBZx23AHVWKiSAuZpdxWQxsR0/48nWcw+nLLqkZo+j/0+sRac0z1j4V?=
 =?iso-8859-1?Q?RbC6+xsRG2ire458mvFSi6A63Y6Ox/lVzHpVbUixYSWG2EJOcslbcFi4f2?=
 =?iso-8859-1?Q?0AELUFxxTTQU9tFTIbGZUOegIJO0TeUMVo/RjsKDmFAtt/J198TyJcYard?=
 =?iso-8859-1?Q?CHFBQzqwIiXyKE173vWp/Okbt2XF13/wmBdzrOOGw1UiFF0QKEox4uDZgh?=
 =?iso-8859-1?Q?YDj78vJbB2qTQ382KuZHsOk03ckc5hgbYnqSkewCA6/aLnYasPPUtFhEMe?=
 =?iso-8859-1?Q?3oP51u/fjgu0C+rfgUafkTcjd+8PyZv9SpThnPsmWQbd1uYuVrAmBYe0we?=
 =?iso-8859-1?Q?Kjs3G58rnqOAexDRq2+jp+gvhn4F5HNVljjW2DmT6qbHXxC06UIRKP2dr6?=
 =?iso-8859-1?Q?m5axR9MqRT63u5UwzC24i9YTabHK4rHZrMuCD+C5ojZEb0+6T6oP8UAIZc?=
 =?iso-8859-1?Q?ip8TJnLAicVfGHQBdU9uwzT+civK9WgIfj8dAPYzYbiC2luxqFXL9JUXg4?=
 =?iso-8859-1?Q?m29IoyMa+o8u29HDNU6xIrFkt6G9K6XPEuamBz4pf3Cc8t3Q3PFvKrGxSM?=
 =?iso-8859-1?Q?YFYCmUe3fAaT+Cd9O4JkgXn7luTsLvbQSLSJ9YsYu2/CZjSs3CemQJY/wK?=
 =?iso-8859-1?Q?CID16Len7EA3bazTAPkuEUGSy4WFKQ1UK2/gFzzft0xe0mDQ3+PsS6G/FC?=
 =?iso-8859-1?Q?nHxKV9Lr3u8kUReQT3P/9lSytd/s1x+iM5JZ+BTcite91U6TaLgOhIz2lQ?=
 =?iso-8859-1?Q?/+pwsehYE/Qy3CCmB5Y3zpr8O3aO0PIJBQjgfR6YbwHyTSCEEakY6V9Olt?=
 =?iso-8859-1?Q?aB9+vABXyiimxNFZPPxjSSvdz2yvNucVpnf2WhM8+LJROwkKbW1Ho65+VI?=
 =?iso-8859-1?Q?L5uS+n8u3bcNjHWO2+NXoncMluvrY0hed3SPqAE4gFZyen2Yh/6+wt0Dx4?=
 =?iso-8859-1?Q?ScsKQL7GI6kq0hjvB5LEUxSggeIGvJwsDYlX9fLN6vgfEmMi9uzuMZIuXk?=
 =?iso-8859-1?Q?hRwTAxzLNJsVAzij6/FQzxVCT+ZkCqXhPwCrXseOY48Z0z1FPm+wlWFz7c?=
 =?iso-8859-1?Q?EPLdTWhE9Wld5BJ4rsWNLmuav9KUU/tcMU5XuPjoeA7nJtIzUFTKTzUmk1?=
 =?iso-8859-1?Q?aCFlAOTdxrlfGMvmOofs92dJroMdaRRL9ETTngchJ/R6rTtH14gFwAiw?=
 =?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: 0e1e1e7c-fb09-4aa3-b570-08da679e9614
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:42.0062
 (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: tnRk7Cxke/wFVr2HQmAWDb/mTzoEdKDBC6Z+JixzNP4uxT4PPwVuoV5K3yNqvKGPhOsSOYW/5Mp+ECVkF/zhtg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB2908
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: lOPuddVkzpVzQ_5MZMZVSqgoOq4QnR18
X-Proofpoint-ORIG-GUID: lOPuddVkzpVzQ_5MZMZVSqgoOq4QnR18
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>

These users of the rbtree should probably have been walks of the linked
list, but convert them to use walks of the maple tree.

Link: https://lkml.kernel.org/r/20220504011345.662299-1-Liam.Howlett@oracle=
.com
Link: https://lkml.kernel.org/r/20220621204632.3370049-17-Liam.Howlett@orac=
le.com
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Howells <dhowells@redhat.com>
Cc: SeongJae Park <sj@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
 fs/proc/task_nommu.c | 45 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
index a6d21fc0033c..2fd06f52b6a4 100644
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -20,15 +20,13 @@
  */
 void task_mem(struct seq_file *m, struct mm_struct *mm)
 {
+	VMA_ITERATOR(vmi, mm, 0);
 	struct vm_area_struct *vma;
 	struct vm_region *region;
-	struct rb_node *p;
 	unsigned long bytes =3D 0, sbytes =3D 0, slack =3D 0, size;
-       =20
-	mmap_read_lock(mm);
-	for (p =3D rb_first(&mm->mm_rb); p; p =3D rb_next(p)) {
-		vma =3D rb_entry(p, struct vm_area_struct, vm_rb);
=20
+	mmap_read_lock(mm);
+	for_each_vma(vmi, vma) {
 		bytes +=3D kobjsize(vma);
=20
 		region =3D vma->vm_region;
@@ -82,15 +80,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
=20
 unsigned long task_vsize(struct mm_struct *mm)
 {
+	VMA_ITERATOR(vmi, mm, 0);
 	struct vm_area_struct *vma;
-	struct rb_node *p;
 	unsigned long vsize =3D 0;
=20
 	mmap_read_lock(mm);
-	for (p =3D rb_first(&mm->mm_rb); p; p =3D rb_next(p)) {
-		vma =3D rb_entry(p, struct vm_area_struct, vm_rb);
+	for_each_vma(vmi, vma)
 		vsize +=3D vma->vm_end - vma->vm_start;
-	}
 	mmap_read_unlock(mm);
 	return vsize;
 }
@@ -99,14 +95,13 @@ unsigned long task_statm(struct mm_struct *mm,
 			 unsigned long *shared, unsigned long *text,
 			 unsigned long *data, unsigned long *resident)
 {
+	VMA_ITERATOR(vmi, mm, 0);
 	struct vm_area_struct *vma;
 	struct vm_region *region;
-	struct rb_node *p;
 	unsigned long size =3D kobjsize(mm);
=20
 	mmap_read_lock(mm);
-	for (p =3D rb_first(&mm->mm_rb); p; p =3D rb_next(p)) {
-		vma =3D rb_entry(p, struct vm_area_struct, vm_rb);
+	for_each_vma(vmi, vma) {
 		size +=3D kobjsize(vma);
 		region =3D vma->vm_region;
 		if (region) {
@@ -190,17 +185,19 @@ static int nommu_vma_show(struct seq_file *m, struct =
vm_area_struct *vma)
  */
 static int show_map(struct seq_file *m, void *_p)
 {
-	struct rb_node *p =3D _p;
-
-	return nommu_vma_show(m, rb_entry(p, struct vm_area_struct, vm_rb));
+	return nommu_vma_show(m, _p);
 }
=20
 static void *m_start(struct seq_file *m, loff_t *pos)
 {
 	struct proc_maps_private *priv =3D m->private;
 	struct mm_struct *mm;
-	struct rb_node *p;
-	loff_t n =3D *pos;
+	struct vm_area_struct *vma;
+	unsigned long addr =3D *pos;
+
+	/* See m_next(). Zero at the start or after lseek. */
+	if (addr =3D=3D -1UL)
+		return NULL;
=20
 	/* pin the task and mm whilst we play with them */
 	priv->task =3D get_proc_task(priv->inode);
@@ -216,10 +213,10 @@ static void *m_start(struct seq_file *m, loff_t *pos)
 		return ERR_PTR(-EINTR);
 	}
=20
-	/* start from the Nth VMA */
-	for (p =3D rb_first(&mm->mm_rb); p; p =3D rb_next(p))
-		if (n-- =3D=3D 0)
-			return p;
+	/* start the next element from addr */
+	vma =3D find_vma(mm, addr);
+	if (vma)
+		return vma;
=20
 	mmap_read_unlock(mm);
 	mmput(mm);
@@ -242,10 +239,10 @@ static void m_stop(struct seq_file *m, void *_vml)
=20
 static void *m_next(struct seq_file *m, void *_p, loff_t *pos)
 {
-	struct rb_node *p =3D _p;
+	struct vm_area_struct *vma =3D _p;
=20
-	(*pos)++;
-	return p ? rb_next(p) : NULL;
+	*pos =3D vma->vm_end;
+	return find_vma(vma->vm_mm, vma->vm_end);
 }
=20
 static const struct seq_operations proc_pid_maps_ops =3D {
--=20
2.35.1