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>
Subject: [PATCH v5 66/70] nommu: Remove uses of VMA linked list
Thread-Topic: [PATCH v5 66/70] nommu: Remove uses of VMA linked list
Thread-Index: AQHYF96CTPC89n80G0WNMnFUJKcKDQ==
Date:   Wed, 2 Feb 2022 02:42:25 +0000
Message-ID: <20220202024137.2516438-67-Liam.Howlett@oracle.com>
References: <20220202024137.2516438-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220202024137.2516438-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?k9ceabE1NsYjnJNNVtHjGy+nLzg7DNDkIn8i7Jx0xIoTLLmqZX0JpC463p?=
 =?iso-8859-1?Q?q7JF9UYRBloBg+F7jjrcr6v4Zr9PpHI/w5YTPGY7XFNOAbRHwzlWlwxgzZ?=
 =?iso-8859-1?Q?3tk0tbZEMQTv1gfI0j7GN5INCLeEfw+eI27lBJiK+drm4rKlOUm0eXDv5O?=
 =?iso-8859-1?Q?ZpdGwoP03nF03bv6rjDb++YEuT+h0rMt9N6iPdMPwOIsxr9T1cOSOp9bMg?=
 =?iso-8859-1?Q?7nmzD+yOCp6YkXbTnR6c8xVss9xJZYzoyLdPvKeaxDWcmHb0vD5oP5f5C7?=
 =?iso-8859-1?Q?96qS+sFFkXkmsEK18O4rc5CSAajPVJiYZq1lT9UEeT85e9v9+o2NFKGGgu?=
 =?iso-8859-1?Q?WpNVJtFG1QoqkAOG7KyoTp89Vna8KCYbhw06M7SghLoZ13XEsTQQHEz5As?=
 =?iso-8859-1?Q?oaC/tO6aCCB6e4iaGEBduF0CA/FyCfJxSI0zf36iNebXqOa11itU1UudFI?=
 =?iso-8859-1?Q?ID9n915l9mov/2Tb3Xq2Dxl/K1GcjH3LDhVdkMHnmbaOWsuLp0hQpiKzjE?=
 =?iso-8859-1?Q?Rh5elH2l615WgcVSS8Lh0lLmMSigHA0xOxn9dRsNEnw4sWLHKAf/bOdwwF?=
 =?iso-8859-1?Q?K1u+LioZtHFIRDCd/3jcvZfAebSp1R/GhzvQGACvPRbnPH8CwAAMTfiHkH?=
 =?iso-8859-1?Q?Ynyu5gXUY+zwwc+nMpvik9kCt1wYey9CyhPr7Aph3mQ4zaDy7sN5RuyGw3?=
 =?iso-8859-1?Q?88Qq6cWPdLEY2bDRJEctYf/W/D946pPnv9YH5MqpzmlozLgM5X3rAMLywW?=
 =?iso-8859-1?Q?9D3ZZjbNpKS61LJy5weuDhTCLMtOpB0t+8WEJy0gGa1n2nA3xnXsN5PI9u?=
 =?iso-8859-1?Q?NNTPBApPrF/xWYwGpOCbgkeieBDT3vaZoTDE70pWiyBzPJ5fsviSQ3Pobu?=
 =?iso-8859-1?Q?Wj6zxy8lzaoietqsZxi6YsUG1etODs0zE490sEntT4/Ae1Kv0OGuUXyuHs?=
 =?iso-8859-1?Q?9aksXUxE65Czhrhb9grHipb0eAmRxXkuA71ae3NA+8exvprXZ5CjJqPU8Z?=
 =?iso-8859-1?Q?Bk8GX9TkNBabv6XM1LFtkmNx2bv920o9EGyfJ31OzqngD9NUi14I7OU8i2?=
 =?iso-8859-1?Q?l+oO7nWPy6Kl3hqhI+HJLTUfNaSuyGhBr+mltDGNRjwKP3Z7uaHTZS/Slh?=
 =?iso-8859-1?Q?mUeVOwpkYVRDOG9we1VG0Z6/rm8gATXI1CKoPYaugELnFk4upy6iniYTSE?=
 =?iso-8859-1?Q?cRhMAktdJsxbolkiCAdbfgRFKCsHn4KrearP2g16M6XETi2z2o9h5Y9awI?=
 =?iso-8859-1?Q?pxLYR6jufNLR+LUK/25eADT4gk8y5jzJHFk311a9JK6c2Dfu0WPZ67ULwA?=
 =?iso-8859-1?Q?UFjDbM2nBgC7UGNYHmrezv/BNGLPNSjw6F8oHXXlgngFKBeuwKv+0MEy8b?=
 =?iso-8859-1?Q?PjPnzj1RZo7WD+Kak3JTU4XWXKD3uNYVJlWIXVfTOQHxzlwLxRQ4tCRxUs?=
 =?iso-8859-1?Q?R+Dnf47+fh4kZnvRZSCMtkpxazf4aHGw3d1byHHf/jO4uSbG7TdU77oBIB?=
 =?iso-8859-1?Q?oF9DJvklJHfEhjft4t6eqveu7RyUBARJWFf4yKfDs5+hY1baIowo6cUVxB?=
 =?iso-8859-1?Q?7eOOVK2rEJ7y6+XxQr6+SZR8bkBozn4VT2SZjDGjMwyGbChShABRRVKtUk?=
 =?iso-8859-1?Q?dVt7Cpysb2e9RbncokiOABygtbvvnKwPD4Ky7L3qWCFNtYPouOS3ex5a6W?=
 =?iso-8859-1?Q?q+3qz0m9vjK1u9VvCOg=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: 412453ca-c189-4a64-194f-08d9e5f5cbfc
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2022 02:42:25.2505
 (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: RA74gUsKErNzsDM215qr09DO8/WLZFO0UwNbIAAcaY95bYVJmkRTY2I6lw1ioQEtNfs0qSW2Slxf4oI7eTQI9A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB5865
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10245 signatures=673430
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0
 suspectscore=0 malwarescore=0 bulkscore=0 mlxscore=0 spamscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2201110000 definitions=main-2202020010
X-Proofpoint-GUID: gdr0bDCHy6YO35cK-8tiuCHRHU2hxkoi
X-Proofpoint-ORIG-GUID: gdr0bDCHy6YO35cK-8tiuCHRHU2hxkoi
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 f500c57a59f3..13028f93dfd9 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1370,6 +1370,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;
@@ -1381,7 +1382,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) {
@@ -1400,7 +1401,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 {
@@ -1449,6 +1450,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)
@@ -1456,12 +1458,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.34.1