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 58/70] mm/mlock: Use vma iterator and instead of vma linked
 list
Thread-Topic: [PATCH v5 58/70] mm/mlock: Use vma iterator and instead of vma
 linked list
Thread-Index: AQHYF96AQnzr5LY3D0KiA/5/4RSbVg==
Date:   Wed, 2 Feb 2022 02:42:22 +0000
Message-ID: <20220202024137.2516438-59-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?s4g3HJE3RMIkuh+v/MNhlLb7Nsbdha2O98wTlJqtNwX/Wo2+/Ip8TGgJ4o?=
 =?iso-8859-1?Q?ebr1LnUdwHHL+CYQtPH8MynSby8jdRgTsTVt7MGn2CMbw96iCo3Q8swnds?=
 =?iso-8859-1?Q?ENr8bzAmVKrqJviCDQE1mjBM4WoROtsZbP4ZbNp4Y6NnjWbWtLw7zxG06N?=
 =?iso-8859-1?Q?ybXYJiQi/bCuSC9RMGJW2jjSFkcVwFDEfBYpYoPdq0CtyKgKyywpa+IZRc?=
 =?iso-8859-1?Q?XXVH1Pop3MiW0qRlvQzT/0chTc5tjd281C43G6+D9pwPCoVb0Q1Arm8o+1?=
 =?iso-8859-1?Q?KMX9WnFGF81rhco+V1aZqCrZ2GHIv/u1MttnFFljHH/X5MNqwuaWxZ5nDu?=
 =?iso-8859-1?Q?kfPeRj1Nr8axomJfoXKzHFJR3LOL74O2HZvIyumFV1IQZE5roJFnsD9Xm2?=
 =?iso-8859-1?Q?upcZ7QjGl+EOYkAZIkQGhk4IjVdV6D8l7yoQsHVhb5/J3THk8ASmnaQPTi?=
 =?iso-8859-1?Q?84xaETO1MW9hzZDStAFOY2dOvSPJ1C7CStZ1+Gv6/rRqMJak5GLHy2OxFN?=
 =?iso-8859-1?Q?ZfanBNp5xCnL4sKiYDa4rm8q7MAT8gLpC1SBhZI7dfppNtrScIJXQLn/vF?=
 =?iso-8859-1?Q?7GX0YhMJ0uuhqsKrqqASWBN6yQvxOrkAdcyGcRF+7V5UdFGr3WzuMpZCVl?=
 =?iso-8859-1?Q?huUbdiO+Ado4Mr60h/FfmhnhjNg5JsG3MdZlvRqS2TrlFXSv5/O486y7st?=
 =?iso-8859-1?Q?JBbl3oBoUI9kh9WK8Lr7Az4iuMZTawrrKdKonqSoAhnZtUl9QRqf3IKaXL?=
 =?iso-8859-1?Q?aNn43famlHncVcerl1WpENBk5/fq7Q9T+NhJJ13iMpIkvlPZ1Rgm9iS1el?=
 =?iso-8859-1?Q?n9d0N0S2DOKWmtqgm7VnRCygZSNLRhvbpr9fjSCsL7tCERTlVcK/8OAhNk?=
 =?iso-8859-1?Q?8nXtYexgRRoIyJxwkvl0ROGRbXc0jx4bJfpe+BhvI7a3qpFEBWLT+Nx2OG?=
 =?iso-8859-1?Q?hNB0WCPz+Xturo1h6TSSxZT9K4S3nEdlUE1IM4yOsFpX+0UaquwC+lxJVY?=
 =?iso-8859-1?Q?NQgwSN28tKDh96jLiRY3WP2mB5rKNB/qH60zw+2VWBMcILdBchH0mAw732?=
 =?iso-8859-1?Q?93UgiIZH2omVc2D8+N4h7e79N3EALzHp6xzHJsqOQcfvXhJzAHq7ZQXKGd?=
 =?iso-8859-1?Q?7qQZACfs+YzdHQuucjOg5UeJKcjzhujt+gvseFjJ9M3SEYkHBPyOWvdoWd?=
 =?iso-8859-1?Q?eeN53b6a0MH1gAwiFl9nt+K6G4ZLmjVyY7+tc+E92mFsDLE8yFIAhjz8vc?=
 =?iso-8859-1?Q?b4p8WaXH+cmMnxcpq0vm5vrFh+4RSNzCFr26bZUHgSH3y+DRz/u1EoBi3N?=
 =?iso-8859-1?Q?1HkBWLz8SRsFP8r6Ny4HvADtsgqwoZaLaAcS98J/pM04nIlQtwetF0FV4H?=
 =?iso-8859-1?Q?ZZ4tUMjlZs+Lnkss7UH9ySlTqVIdOJ/ihRdfbMUrXAq5PcfpIlanLyWa1i?=
 =?iso-8859-1?Q?q+VvFi1GwZt+mYCJEKIus6Oj3Z5mWPQ9B8epw2gBFbPnPxsV3tpLquWWBj?=
 =?iso-8859-1?Q?3uPPfyAYV+MK02ghVUzgBSFLb/aJBym5VyCrhvT7IQ/457E5SEpUkbyPGk?=
 =?iso-8859-1?Q?xr5iQKMRGVBZE2ZjLMoI5yAVrkKKc9yyolU8k2WSZ5Md7RvxMIBwKTTCaD?=
 =?iso-8859-1?Q?LC1Sc/9PnM8UuDEW4pW2DnXeFgL2egbv65vWAfH/iZB8gZtbt1cRdgP47u?=
 =?iso-8859-1?Q?OUcIsXAfgXt3yEiX2ew=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: 501fd0b7-e5a4-42a6-f191-08d9e5f5b89a
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2022 02:42:22.1257
 (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: yhSet0R4z8EHFvAKW82pPR/lT+dBwMMtqnyVDWSu1+QYHYMogFkP7AUa+bVkZ9zXYxsx1X3o30at0nJKvonmZQ==
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 spamscore=0 malwarescore=0 phishscore=0
 mlxscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2202020010
X-Proofpoint-ORIG-GUID: RGOg-WCz_EGUA3CvTNp-NSgEhAmAXoOX
X-Proofpoint-GUID: RGOg-WCz_EGUA3CvTNp-NSgEhAmAXoOX
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>

Handle overflow checking in count_mm_mlocked_page_nr() differently.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---
 mm/mlock.c | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/mm/mlock.c b/mm/mlock.c
index 8f584eddd305..8d54f355080f 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -563,6 +563,7 @@ static int apply_vma_lock_flags(unsigned long start, si=
ze_t len,
 	unsigned long nstart, end, tmp;
 	struct vm_area_struct *vma, *prev;
 	int error;
+	MA_STATE(mas, &current->mm->mm_mt, start, start);
=20
 	VM_BUG_ON(offset_in_page(start));
 	VM_BUG_ON(len !=3D PAGE_ALIGN(len));
@@ -571,13 +572,14 @@ static int apply_vma_lock_flags(unsigned long start, =
size_t len,
 		return -EINVAL;
 	if (end =3D=3D start)
 		return 0;
-	vma =3D find_vma(current->mm, start);
-	if (!vma || vma->vm_start > start)
+	vma =3D mas_walk(&mas);
+	if (!vma)
 		return -ENOMEM;
=20
-	prev =3D vma->vm_prev;
 	if (start > vma->vm_start)
 		prev =3D vma;
+	else
+		prev =3D mas_prev(&mas, 0);
=20
 	for (nstart =3D start ; ; ) {
 		vm_flags_t newflags =3D vma->vm_flags & VM_LOCKED_CLEAR_MASK;
@@ -597,7 +599,7 @@ static int apply_vma_lock_flags(unsigned long start, si=
ze_t len,
 		if (nstart >=3D end)
 			break;
=20
-		vma =3D prev->vm_next;
+		vma =3D find_vma(prev->vm_mm, prev->vm_end);
 		if (!vma || vma->vm_start !=3D nstart) {
 			error =3D -ENOMEM;
 			break;
@@ -618,24 +620,23 @@ static unsigned long count_mm_mlocked_page_nr(struct =
mm_struct *mm,
 {
 	struct vm_area_struct *vma;
 	unsigned long count =3D 0;
+	unsigned long end;
+	VMA_ITERATOR(vmi, mm, start);
=20
 	if (mm =3D=3D NULL)
 		mm =3D current->mm;
=20
-	vma =3D find_vma(mm, start);
-	if (vma =3D=3D NULL)
-		return 0;
-
-	for (; vma ; vma =3D vma->vm_next) {
-		if (start >=3D vma->vm_end)
-			continue;
-		if (start + len <=3D  vma->vm_start)
-			break;
+	/* Don't overflow past ULONG_MAX */
+	if (unlikely(ULONG_MAX - len < start))
+		end =3D ULONG_MAX;
+	else
+		end =3D start + len;
+	for_each_vma_range(vmi, vma, end) {
 		if (vma->vm_flags & VM_LOCKED) {
 			if (start > vma->vm_start)
 				count -=3D (start - vma->vm_start);
-			if (start + len < vma->vm_end) {
-				count +=3D start + len - vma->vm_start;
+			if (end < vma->vm_end) {
+				count +=3D end - vma->vm_start;
 				break;
 			}
 			count +=3D vma->vm_end - vma->vm_start;
@@ -739,6 +740,7 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, =
len)
  */
 static int apply_mlockall_flags(int flags)
 {
+	VMA_ITERATOR(vmi, current->mm, 0);
 	struct vm_area_struct *vma, *prev =3D NULL;
 	vm_flags_t to_add =3D 0;
=20
@@ -759,7 +761,7 @@ static int apply_mlockall_flags(int flags)
 			to_add |=3D VM_LOCKONFAULT;
 	}
=20
-	for (vma =3D current->mm->mmap; vma ; vma =3D prev->vm_next) {
+	for_each_vma(vmi, vma) {
 		vm_flags_t newflags;
=20
 		newflags =3D vma->vm_flags & VM_LOCKED_CLEAR_MASK;
--=20
2.34.1