Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
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>
Subject: [PATCH v8 66/70] nommu: remove uses of VMA linked list
Thread-Topic: [PATCH v8 66/70] nommu: remove uses of VMA linked list
Thread-Index: AQHYWX9CVyzty2Dd7U2RBRimBz8bUw==
Date:   Tue, 26 Apr 2022 15:06:52 +0000
Message-ID: <20220426150616.3937571-67-Liam.Howlett@oracle.com>
References: <20220426150616.3937571-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220426150616.3937571-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?TgpyIGGAvQ7pLOhAKMYR5Db8BFOOe+b2ITXF12mgzGd1Su29XeDKlmgTEo?=
 =?iso-8859-1?Q?O8xiuxsrq5Wi4xlnPlxBdVPzZIn/KRFd+G1ZkGY1buznZw8YAWz/I8hg1x?=
 =?iso-8859-1?Q?xz9RcYBIBFC/5RfuGRWAzrXEpsZnoTVbLRA4AX8ML9acSYKuV36KFU1MTJ?=
 =?iso-8859-1?Q?UoIIyvQKSUlGpEvH/ZKGEoxjtVCA0+dPZhZRINYxrCn+9joH1opxjbUb7S?=
 =?iso-8859-1?Q?8AgIGLDPzRBPAsnNOtMQpc8uwRDKjpIYMfRGOu1U54fcb0ilfumnjnUHNi?=
 =?iso-8859-1?Q?J4XYcZstC4FjYch0qqo1ZDKQ59Dl4xzBdk7Nhx3yl36t4v5LBV3QDNmlJP?=
 =?iso-8859-1?Q?ET2db8pDFUZuuGNNw/hosbI7XEmFZOXPBHDndMXGckk0/DLN/CsbDGZ1is?=
 =?iso-8859-1?Q?auhCEs1IXUtE6G1Uln321Rsy7+Ln/wrCv8I6WeIu29is63VHt2oyfk4Pjb?=
 =?iso-8859-1?Q?HSfGj094OWcwRk/JrZSWu9P/Avx5wc56hMZcuWxVohoERCGisjH2KFYMSd?=
 =?iso-8859-1?Q?4R7nEFOYdePsQJ7eEoERpRODwyNx6bqcZT8NkAYZ6U0vbxSDpm9kzhxYI6?=
 =?iso-8859-1?Q?NVLLisGFujZELRNN8M1J5tzANWzvTrpZK76hNpTY0IhvrOzvan8P1jx/1G?=
 =?iso-8859-1?Q?uLRyKggbfDMr+PdC1dgSx8XF8E6En6Z81hd2nd7b4fyttmX4hzRh4X7/cg?=
 =?iso-8859-1?Q?XF3mEJ0hMHE1oiTgSG9bkTdeDg4CqgmKpluN2xa0RATwmR5On0zPR41hhs?=
 =?iso-8859-1?Q?t7C49NGHLtEpbYZLGuGsEXgjt8UNR7d3CH/yxh/mUZIacBJrYGsYFDQ9qv?=
 =?iso-8859-1?Q?EtFYSecD0XGV6zDhd7WIQAetewT94G8L89e17efXF2L3/fX126edbKEJeX?=
 =?iso-8859-1?Q?EgqbNHc1oqGU4yHgzIDWh9F+YizalmPeyDV+zms0H0P+ZkZJ/2VB/F8Dau?=
 =?iso-8859-1?Q?rK9sJ858iI2p/P0PekOba8lMe6Q0DeCs5WLkvymyPAuE5q8fiuI7qvhwsJ?=
 =?iso-8859-1?Q?tAR6gXNsP2aERCgzLHrQC4Vzte/j886n2n3Jc+KbvImFzeTW3mbqpjdObs?=
 =?iso-8859-1?Q?TaxogiC3yc6+Mm+5A6+9lqoPCQvdl75NLY++aOCj6JdWXtdCm6wn6NGj2e?=
 =?iso-8859-1?Q?2In+tiCIe1RPx2+u31XkuOMCGLYF3GnC5F6JObf74RwTCD9tSzFQjGhx8s?=
 =?iso-8859-1?Q?wGG3Ubr7nxEYEpipt8WY3r2bUUqxGpFKCM4aOaAXMeEw0yCG+YnXT59Viy?=
 =?iso-8859-1?Q?tjP4iIO37Vykndsh8edqn+vJd7jbluU3N2c1R8nb5ZVk4C1hd7Sf2UHmhy?=
 =?iso-8859-1?Q?yagM/n1IsTqv/vl49dVmxKlVDuUbM5oj4lDo1Bje/+1TNQPs8L7ABZXjUg?=
 =?iso-8859-1?Q?9PJgVFDvmLZhTK9v/dxIdBsNExDuFg1xZ6Mwr30rJv49XBoG2YPp5ILmVS?=
 =?iso-8859-1?Q?yNqpPOnjDX9lFfzeunP9Du4+HK52HE4kMC+zyNlkekVjQLpJzsPJEGeNyN?=
 =?iso-8859-1?Q?gmJSNAvQWAEbpeXYpc+8iObMVy7bYjpcVRvy7IUwf2/Xjk9IBBAfOvCiB6?=
 =?iso-8859-1?Q?iJXQFklZr7r/4qxKM2MAJYNzx/nuQML0UTmw6gNJ/Rv5O1Lq4HEHYgK1yL?=
 =?iso-8859-1?Q?/aRSLIFbSL/nKFqMj/dc0s3NmLUSrj69FXWBkFruisspUgkrVPpCTiWVHx?=
 =?iso-8859-1?Q?kcAyF2gOI1cI+E9lYuHwnDDA7Z2H+xcPV8FjuutvI5uPl032ACd7mA21F8?=
 =?iso-8859-1?Q?UVeca65xv+4w46NPY9Zj6yiWZVP5L9oWPUg7FDWAK/jA2NFPylgJAf1RLB?=
 =?iso-8859-1?Q?pAuRj4Nl19chiXk2eBhXgyUpoeZ4sAA=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: 2f423d29-7f2e-4b97-d1a3-08da27969324
X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Apr 2022 15:06:52.5202
 (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: BHSQHq/y0LanZNN5x42sacfS4zxABbgjv8OsN+zdyNNC7b7HVAu/NO7fj0IwFIZWI7DdxDuDa9mfx2iBoLpIUQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB4925
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858
 definitions=2022-04-26_04:2022-04-26,2022-04-26 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 spamscore=0 adultscore=0
 mlxscore=0 bulkscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2204260096
X-Proofpoint-ORIG-GUID: jvUaCH9I3Xd_2aX-Cgc_PWW7NX3GTgTt
X-Proofpoint-GUID: jvUaCH9I3Xd_2aX-Cgc_PWW7NX3GTgTt
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE autolearn=no
	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>

Use the maple tree or VMA iterator instead.  This is faster and will allow
us to shrink the VMA.

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>
---
 mm/nommu.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/mm/nommu.c b/mm/nommu.c
index 26a9056e508f..645d11d3a8ab 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1381,6 +1381,7 @@ static int shrink_vma(struct mm_struct *mm,
  */
 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len, struc=
t list_head *uf)
 {
+	MA_STATE(mas, &mm->mm_mt, start, start);
 	struct vm_area_struct *vma;
 	unsigned long end;
 	int ret;
@@ -1392,7 +1393,7 @@ int do_munmap(struct mm_struct *mm, unsigned long sta=
rt, size_t len, struct list
 	end =3D start + len;
=20
 	/* find the first potentially overlapping VMA */
-	vma =3D find_vma(mm, start);
+	vma =3D mas_find(&mas, end - 1);
 	if (!vma) {
 		static int limit;
 		if (limit < 5) {
@@ -1411,7 +1412,7 @@ int do_munmap(struct mm_struct *mm, unsigned long sta=
rt, size_t len, struct list
 				return -EINVAL;
 			if (end =3D=3D vma->vm_end)
 				goto erase_whole_vma;
-			vma =3D vma->vm_next;
+			vma =3D mas_next(&mas, end - 1);
 		} while (vma);
 		return -EINVAL;
 	} else {
@@ -1460,6 +1461,7 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, =
len)
  */
 void exit_mmap(struct mm_struct *mm)
 {
+	VMA_ITERATOR(vmi, mm, 0);
 	struct vm_area_struct *vma;
=20
 	if (!mm)
@@ -1467,12 +1469,17 @@ void exit_mmap(struct mm_struct *mm)
=20
 	mm->total_vm =3D 0;
=20
-	while ((vma =3D mm->mmap)) {
-		mm->mmap =3D vma->vm_next;
+	/*
+	 * Lock the mm to avoid assert complaining even though this is the only
+	 * user of the mm
+	 */
+	mmap_write_lock(mm);
+	for_each_vma(vmi, vma) {
 		delete_vma_from_mm(vma);
 		delete_vma(mm, vma);
 		cond_resched();
 	}
+	mmap_write_unlock(mm);
 	__mt_destroy(&mm->mm_mt);
 }
=20
--=20
2.35.1