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>,
        Vlastimil Babka <vbabka@suse.cz>
Subject: [PATCH v13 16/70] proc: remove VMA rbtree use from nommu
Thread-Topic: [PATCH v13 16/70] proc: remove VMA rbtree use from nommu
Thread-Index: AQHYtjhQQfZ9WCIhVk+ZZUOgMir0aQ==
Date:   Mon, 22 Aug 2022 15:03:19 +0000
Message-ID: <20220822150128.1562046-17-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?mtlsDsKKrVFduzP0GQ6Vko0a0gtKYRxvkBnX3GUqLgYDyQ190qO3cVFkal?=
 =?iso-8859-1?Q?4+mKYkVe/aCCWbuZAeSUPFAS2INbDcq9B+GL0AKyGrSCwbgpUOkTgIuWA6?=
 =?iso-8859-1?Q?lYuK9vmNSSHGMc1rC6cp5NBSP/Rufv9lIjAGUmI3r73keaTOzBVkapb46L?=
 =?iso-8859-1?Q?9j1bAGufCWpYmDsW9WlUrJsKN8tHix/r6zerYyWZLFbZ9bj3s809qQIyJm?=
 =?iso-8859-1?Q?tIlccAXo1fthz5HNYN0rX0DXCSjMhOn1MrROBo1SE1OT3O++6ouCdylsp5?=
 =?iso-8859-1?Q?gAPxx0M3fgXAOmBUkWkOvgxD02sOQu53CH2f1SorsBWIk7V+VvywSOOpvK?=
 =?iso-8859-1?Q?Tt8tKfSZUt6NKa+mfWgoU9oMrOp8wCb+Qt8ExvOKiBUZ19vtxuOw0C74Hu?=
 =?iso-8859-1?Q?ZNJDd3x5i0rdxCj6S1AB0ENxSiOwngG+56rzPJIGxM7CaFq7vTxiFGAOsq?=
 =?iso-8859-1?Q?HxgEJpMa1Jcil6lBwolryzB4nsVoh9XVhesmZ3XCn2CXHkLOBU8EhFnAEM?=
 =?iso-8859-1?Q?5pS9GFRkGH49SRWuB4yMUN3+IuRq9W6pmiFFSM/wB4l65nsKl1IQa4uTXu?=
 =?iso-8859-1?Q?K1kjk2Er57AxD3ZBe6rG5RQgWkeRSwzRX76xQDSStQAP8V68UgFkkhxCN1?=
 =?iso-8859-1?Q?FAHox1jHDJWd29/4uATF6dDzaaR09WLg0Co9dQuFp4vQrKFjIEyjFtlZSj?=
 =?iso-8859-1?Q?n1RlqKqX/Eh9Hf+OqSODBmHd6qEQCfUNTqtYAmcYnNivly2ni18gr9GAd1?=
 =?iso-8859-1?Q?Eqt0IQf/rF6lb6X2iCmjFqLP9QC85VqwRWKeRIbY1PRmDIoLA8TiddZCgt?=
 =?iso-8859-1?Q?X/pv8agtk9xx9LGR60zv5hKhXaa9lsZHM0PnF0MLnR1WCqAhIuxnp63c8Y?=
 =?iso-8859-1?Q?qQbqLjHZ5mznfuwa2oGTYmuJzGOgH/6v8Jh3iF97uJ3WGZO9xKTFo+WfRr?=
 =?iso-8859-1?Q?P8GuYf5ET4wN31akCko3wf46StRdjS6op/PO6nKa8qUb3MKFvRyjppCV4I?=
 =?iso-8859-1?Q?/2fsfX+hi3BsJbA7HhEZucQjdTSFjdZFv/XFtrFZwPT4ObGcTbD+osFYH9?=
 =?iso-8859-1?Q?BcS1tN0kM3aGaIc9eyYt73laRlcdRz26NHVsUvpBr8aRupAHz1/iKqAAS/?=
 =?iso-8859-1?Q?cpMTLQ7vHdj4Q2G3S93E8uiKqrGK8a06rEx3kk0zoGnB6GZthCJwXSq827?=
 =?iso-8859-1?Q?/vartSnz6OTh/UnNS7ipudEbveskZBLAgt/RSlW3fLhvbQjsSOx0xP/l7Y?=
 =?iso-8859-1?Q?gdnJXfxWIyeDCfeEyPnCXJ9a2Ijfz2dw4pokcwfZ+15U4dr7AMx2KR89e2?=
 =?iso-8859-1?Q?CGYB3nYkMM5NQX0BAHoPiDa7ihACC6w1W4R0UM4w2RM53FIkTy3pq+EVo2?=
 =?iso-8859-1?Q?oI4ox7Q44k3qVEwxpTMjwb+xLGJn25UIZI4QVerrYHAKozGcm16a2mUt2t?=
 =?iso-8859-1?Q?7GWFVVRsgclB2NhiCMg2+Goj0uOe62sPTkTnd9lNJBXIch/MhTM8iscons?=
 =?iso-8859-1?Q?f0bcKh7rnrC/RNzvna3TvHIfldAvumd6Bgiimb9AnLsiobuYNXuxx3cmX5?=
 =?iso-8859-1?Q?cSECN5WrTvQ1m5v0GPXzx4KIVxx9J3S5ElEPhgqfclAT2KXcjXGbFQpH03?=
 =?iso-8859-1?Q?LWlIsUMFUUqBxxGQqrn/VZGQXb/belb8rcHKAvp6wasBVpaIn/p8hOPw?=
 =?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: a5283af3-79ab-4c1e-8b28-08da844f738e
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Aug 2022 15:03:19.2976
 (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: GDfogoQML9AAJuk2X/g2Loy91FU3iJznEK1g/QFkXSFNtzk9+g43VrqWCSdTIrG1YrICEKa6ToPgVy1RxZ72pg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR10MB3506
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 adultscore=0 bulkscore=0
 mlxlogscore=999 spamscore=0 phishscore=0 suspectscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000
 definitions=main-2208220064
X-Proofpoint-ORIG-GUID: wlE_GumuVgUTXAFZNzaawZVwmMMq4mun
X-Proofpoint-GUID: wlE_GumuVgUTXAFZNzaawZVwmMMq4mun
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>

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

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>
---
 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