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 43/69] fs/proc/task_mmu: stop using linked list and
 highest_vm_end
Thread-Topic: [PATCH v11 43/69] fs/proc/task_mmu: stop using linked list and
 highest_vm_end
Thread-Index: AQHYmYd3h0EDzudcRUy3IJ4a3i3XNg==
Date:   Sun, 17 Jul 2022 02:46:51 +0000
Message-ID: <20220717024615.2106835-44-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?OoJpjwVhrdmcLOOeKcccf9ZrlbZugMnc3kmpIExD6o3g+NwH8MwYvyt1bB?=
 =?iso-8859-1?Q?gPglRcIp3Y9/6fuKXWpLkDkY8/eud/cGv7ttYSW8gsRnntNXRX7Kh3nfNB?=
 =?iso-8859-1?Q?t24PKnzZJj0bziKpeV1Dq3I/33D0yJMQvAFV3TFvIaaTj7Inh1fvvILrnM?=
 =?iso-8859-1?Q?AeMfb0xcfmEc5CH2EwwT5s/IX/VeK7Nny1QGAbGp5ALyYPUiCXsye93tmt?=
 =?iso-8859-1?Q?E8fSeArzT9zEpDquDoO63UPbZHXTl/o5o30lNhx2pEo2U8rgBuVyzxQRg5?=
 =?iso-8859-1?Q?F6ljUpFsn1y7QGMshE64eBK6UDCfI+jSkEeun3zdmsYJULPexkm3RByAFE?=
 =?iso-8859-1?Q?rZnVwjEuESxcXQXKUv5Zn+lP6wEDTDMSFYT6RFj7HBuNFKluMI16hYrzJ4?=
 =?iso-8859-1?Q?/JUd1G1bVjSjJqz8+WRp0W2obGPAOjqi6AKQfWaYz7zRlp07y473p+5QxS?=
 =?iso-8859-1?Q?dGFjw9q4IBLuCy2gFeIQYYDd4xS1YEKEoMmDGuLBUouc9CU6tZVyMA+llD?=
 =?iso-8859-1?Q?/GGaEeuBSmXb4M2zKQkCH7VCkYvfyCAxLDQ3/ijb78BljlhQQmT144YEkR?=
 =?iso-8859-1?Q?NaTW20eTiBhXJt1EVUqxM94L7wJMphsmSIc4SxFkhZ0eEFx0Yo5auAynQL?=
 =?iso-8859-1?Q?Rv43CsiHY1DWS/dBvB+7CyBAYuEJpYTubWUJEVEqpJSCJd3kpJ6lawJYSX?=
 =?iso-8859-1?Q?b5LwYtfqxNR9WrIc0pCzi/GC6yaZHgsltgURM1xxQyXqrpaJlp/yHKea7O?=
 =?iso-8859-1?Q?yUMeJWh/ePSijwtf1B2aH499YNvRYbCfipByGz/F1vh6njTlODESKV9L43?=
 =?iso-8859-1?Q?wy73/zYI/8ZBYgVkmD9q18Z80eckKkHD4xtG0OpfaAsvzZczFVhlsXVXvh?=
 =?iso-8859-1?Q?+clWgxsin1VZqIIsIQG+r4dbcHH4Tvpkrsw45Pea0fMSTs3L3SLVd2XDxK?=
 =?iso-8859-1?Q?OG9Mba2tgSrR/vone7IeTOWxl4xZ4zZnbnCA4MgvRgMCEDr59W0kpdJaDx?=
 =?iso-8859-1?Q?BbWRNP5FLH8sePJnAuUNyHvFjO0Ingv2NNPoTNXXkNDA7R+AcEM/zZl5eT?=
 =?iso-8859-1?Q?nVk9tBF3eC5iJ2CsxsaLRrhJe6JBFX9scjNjQDBbINPmWGIS/7TkIxgP3V?=
 =?iso-8859-1?Q?5N7Ls38iahh+PMHR2zHZi49aFreLve0Gznlhffbo/vtvR0mtIgsD8Q45xQ?=
 =?iso-8859-1?Q?zhZO2B/FFPU9I/K8bglo8tCwEZ5WbA/bScAVrDcXmo+8PLxz2nOBW0I7HY?=
 =?iso-8859-1?Q?5BR2BwZ5fprBTV7GI1F+NvJBN/tlLMuhVEuU2xOhcSXZ6KSYsE71+GAhhO?=
 =?iso-8859-1?Q?qjmLXMl/illXtijn+UxgRrNsYtq/kj9tItq2U6yULcX1y976d6pTV2JSob?=
 =?iso-8859-1?Q?qjAPN7kMvbHi2089TYkGtWeGbORFLbfycsmbXCqzYREN3pok66Xdepw8wD?=
 =?iso-8859-1?Q?Ex1S7r/lqzwjRWEh0moXwEwpBsUpIxWwU6g+H3rl5uX+Xhfbsedy3iMmNA?=
 =?iso-8859-1?Q?tU+/29aUqeuwSHkxwpI2wcc0Ww3jvett0aCvmON8fNfN1MPbc+HDqYVTg2?=
 =?iso-8859-1?Q?fNUd9r0iDIlUnIbg3WLHppf8nqiaY94ex2dllFBev+w+JmhWKyMrVvjnza?=
 =?iso-8859-1?Q?k17NJhBIa2rFfJ8oiMofIT5vhEJ+w8aFfGTIJFGOnX3PnSBo0TgVc+Yg?=
 =?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: cb201a41-662a-4ce6-0f28-08da679eb01c
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:51.5993
 (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: FZI6Rktlr8/2cgEcE8nOHBHH+iPh23qdXr7g4eeVgvbA+kMPK7t5zuseuReA1sAIExYrUduBeLSM+LeVpk/GLw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR10MB2799
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=954
 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-ORIG-GUID: mauKPUfhnuf76tiy9hxPjNFRa8Zx9wGR
X-Proofpoint-GUID: mauKPUfhnuf76tiy9hxPjNFRa8Zx9wGR
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 references to mm_struct linked list and highest_vm_end for when
they are removed

Link: https://lkml.kernel.org/r/20220504011345.662299-28-Liam.Howlett@oracl=
e.com
Link: https://lkml.kernel.org/r/20220621204632.3370049-44-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>
---
 fs/proc/internal.h |  2 +-
 fs/proc/task_mmu.c | 73 ++++++++++++++++++++++++++--------------------
 2 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 06a80f78433d..f03000764ce5 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -285,7 +285,7 @@ struct proc_maps_private {
 	struct task_struct *task;
 	struct mm_struct *mm;
 #ifdef CONFIG_MMU
-	struct vm_area_struct *tail_vma;
+	struct vma_iterator iter;
 #endif
 #ifdef CONFIG_NUMA
 	struct mempolicy *task_mempolicy;
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 616913bb1fa7..f9c9abb50bb7 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -123,12 +123,26 @@ static void release_task_mempolicy(struct proc_maps_p=
rivate *priv)
 }
 #endif
=20
+static struct vm_area_struct *proc_get_vma(struct proc_maps_private *priv,
+						loff_t *ppos)
+{
+	struct vm_area_struct *vma =3D vma_next(&priv->iter);
+
+	if (vma) {
+		*ppos =3D vma->vm_start;
+	} else {
+		*ppos =3D -2UL;
+		vma =3D get_gate_vma(priv->mm);
+	}
+
+	return vma;
+}
+
 static void *m_start(struct seq_file *m, loff_t *ppos)
 {
 	struct proc_maps_private *priv =3D m->private;
 	unsigned long last_addr =3D *ppos;
 	struct mm_struct *mm;
-	struct vm_area_struct *vma;
=20
 	/* See m_next(). Zero at the start or after lseek. */
 	if (last_addr =3D=3D -1UL)
@@ -152,31 +166,21 @@ static void *m_start(struct seq_file *m, loff_t *ppos=
)
 		return ERR_PTR(-EINTR);
 	}
=20
+	vma_iter_init(&priv->iter, mm, last_addr);
 	hold_task_mempolicy(priv);
-	priv->tail_vma =3D get_gate_vma(mm);
-
-	vma =3D find_vma(mm, last_addr);
-	if (vma)
-		return vma;
+	if (last_addr =3D=3D -2UL)
+		return get_gate_vma(mm);
=20
-	return priv->tail_vma;
+	return proc_get_vma(priv, ppos);
 }
=20
 static void *m_next(struct seq_file *m, void *v, loff_t *ppos)
 {
-	struct proc_maps_private *priv =3D m->private;
-	struct vm_area_struct *next, *vma =3D v;
-
-	if (vma =3D=3D priv->tail_vma)
-		next =3D NULL;
-	else if (vma->vm_next)
-		next =3D vma->vm_next;
-	else
-		next =3D priv->tail_vma;
-
-	*ppos =3D next ? next->vm_start : -1UL;
-
-	return next;
+	if (*ppos =3D=3D -2UL) {
+		*ppos =3D -1UL;
+		return NULL;
+	}
+	return proc_get_vma(m->private, ppos);
 }
=20
 static void m_stop(struct seq_file *m, void *v)
@@ -872,16 +876,16 @@ static int show_smaps_rollup(struct seq_file *m, void=
 *v)
 {
 	struct proc_maps_private *priv =3D m->private;
 	struct mem_size_stats mss;
-	struct mm_struct *mm;
+	struct mm_struct *mm =3D priv->mm;
 	struct vm_area_struct *vma;
-	unsigned long last_vma_end =3D 0;
+	unsigned long vma_start =3D 0, last_vma_end =3D 0;
 	int ret =3D 0;
+	MA_STATE(mas, &mm->mm_mt, 0, 0);
=20
 	priv->task =3D get_proc_task(priv->inode);
 	if (!priv->task)
 		return -ESRCH;
=20
-	mm =3D priv->mm;
 	if (!mm || !mmget_not_zero(mm)) {
 		ret =3D -ESRCH;
 		goto out_put_task;
@@ -894,8 +898,13 @@ static int show_smaps_rollup(struct seq_file *m, void =
*v)
 		goto out_put_mm;
=20
 	hold_task_mempolicy(priv);
+	vma =3D mas_find(&mas, 0);
+
+	if (unlikely(!vma))
+		goto empty_set;
=20
-	for (vma =3D priv->mm->mmap; vma;) {
+	vma_start =3D vma->vm_start;
+	do {
 		smap_gather_stats(vma, &mss, 0);
 		last_vma_end =3D vma->vm_end;
=20
@@ -904,6 +913,7 @@ static int show_smaps_rollup(struct seq_file *m, void *=
v)
 		 * access it for write request.
 		 */
 		if (mmap_lock_is_contended(mm)) {
+			mas_pause(&mas);
 			mmap_read_unlock(mm);
 			ret =3D mmap_read_lock_killable(mm);
 			if (ret) {
@@ -947,7 +957,7 @@ static int show_smaps_rollup(struct seq_file *m, void *=
v)
 			 *    contains last_vma_end.
 			 *    Iterate VMA' from last_vma_end.
 			 */
-			vma =3D find_vma(mm, last_vma_end - 1);
+			vma =3D mas_find(&mas, ULONG_MAX);
 			/* Case 3 above */
 			if (!vma)
 				break;
@@ -961,11 +971,10 @@ static int show_smaps_rollup(struct seq_file *m, void=
 *v)
 				smap_gather_stats(vma, &mss, last_vma_end);
 		}
 		/* Case 2 above */
-		vma =3D vma->vm_next;
-	}
+	} while ((vma =3D mas_find(&mas, ULONG_MAX)) !=3D NULL);
=20
-	show_vma_header_prefix(m, priv->mm->mmap->vm_start,
-			       last_vma_end, 0, 0, 0, 0);
+empty_set:
+	show_vma_header_prefix(m, vma_start, last_vma_end, 0, 0, 0, 0);
 	seq_pad(m, ' ');
 	seq_puts(m, "[rollup]\n");
=20
@@ -1258,6 +1267,7 @@ static ssize_t clear_refs_write(struct file *file, co=
nst char __user *buf,
 		return -ESRCH;
 	mm =3D get_task_mm(task);
 	if (mm) {
+		MA_STATE(mas, &mm->mm_mt, 0, 0);
 		struct mmu_notifier_range range;
 		struct clear_refs_private cp =3D {
 			.type =3D type,
@@ -1277,7 +1287,7 @@ static ssize_t clear_refs_write(struct file *file, co=
nst char __user *buf,
 		}
=20
 		if (type =3D=3D CLEAR_REFS_SOFT_DIRTY) {
-			for (vma =3D mm->mmap; vma; vma =3D vma->vm_next) {
+			mas_for_each(&mas, vma, ULONG_MAX) {
 				if (!(vma->vm_flags & VM_SOFTDIRTY))
 					continue;
 				vma->vm_flags &=3D ~VM_SOFTDIRTY;
@@ -1289,8 +1299,7 @@ static ssize_t clear_refs_write(struct file *file, co=
nst char __user *buf,
 						0, NULL, mm, 0, -1UL);
 			mmu_notifier_invalidate_range_start(&range);
 		}
-		walk_page_range(mm, 0, mm->highest_vm_end, &clear_refs_walk_ops,
-				&cp);
+		walk_page_range(mm, 0, -1, &clear_refs_walk_ops, &cp);
 		if (type =3D=3D CLEAR_REFS_SOFT_DIRTY) {
 			mmu_notifier_invalidate_range_end(&range);
 			flush_tlb_mm(mm);
--=20
2.35.1