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 42/70] exec: Use VMA iterator instead of linked list
Thread-Topic: [PATCH v5 42/70] exec: Use VMA iterator instead of linked list
Thread-Index: AQHYF959pHmqPmf0K0qfid6T0eFPXg==
Date:   Wed, 2 Feb 2022 02:42:15 +0000
Message-ID: <20220202024137.2516438-43-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?F4B7u/M1edvCvu7nxeCWoeMN46s9ZqF7yx/F+dp2xyemZYxlq3si0TIp9s?=
 =?iso-8859-1?Q?yxD6iLg8+p5wQEs0YcArNKY0qrYMaaVqnBUcAH/Gy/kcekTNR+mWnwhgOI?=
 =?iso-8859-1?Q?EAxykyNgD2EEhcPbMCfESZVZvAXH1ew4ZM6Z85Wyfj1crk71kidj4KFcB8?=
 =?iso-8859-1?Q?I2FmQtH46BYgO1qBFr09ags419Dwp1oPMzFCek9aS8EKXo902YtydzSOjT?=
 =?iso-8859-1?Q?zi24sxDLQZM3LdMvhLlOEDO0MY59oSTb2Se9VK4SiMKDT4BAk14dW45YtI?=
 =?iso-8859-1?Q?tHRsFKeF82pCbWwF/rVwPdXviK7ALdqrGszufEwiZ8+0TcOfnRlwfQ7BjI?=
 =?iso-8859-1?Q?VPeu8Wqgkzu9tZ7zQX8Hya1DEjPgBHBHAMtLSetMU+TpT+3OC5vTUB/D0V?=
 =?iso-8859-1?Q?ljJm2loOH/k5SRsVxVvXvFt+n9WUub8uIlRU4Avi4ir2BOigrTRTo2QHRD?=
 =?iso-8859-1?Q?T5lxLKrwRJy2R7YZDAhHhd1J+DkqEQYH8JScbhfswaV53SwHGiDV+xtxHi?=
 =?iso-8859-1?Q?mYupDRRTS7yeWz7/00hA8scT+hAE4486/ElJnYkMKF3U0ERJCTy2r3gCSF?=
 =?iso-8859-1?Q?tvb0R5eUO3RTAB/A5URUKyyCWwvhHzAWxBnXF0KXPicG+1NZ+20LefX+l8?=
 =?iso-8859-1?Q?hmDGG2eYC8sfSON85TrR8cPGpyNmsVogyZ4VCTzvU/gAVHdST24Y18+/Uw?=
 =?iso-8859-1?Q?2lTSY/HYbCGgDqftHh47+qcvwsmHlhoh5ZHkGsfTfLsl74NWyEHbE1GayF?=
 =?iso-8859-1?Q?ruX36Clg3jM+Ircb7XbYVn9b1tK7DyhVv4EgFzd41GuC4iVx7nncAIic1J?=
 =?iso-8859-1?Q?ci6Pj5TPxO6s7fi4ch30YsaLBMkovZC+A5ouDdo5MfUXv755kZWjphJd0I?=
 =?iso-8859-1?Q?V6uTsHDCkPO2nYqFJcXHc5/++LuoPdwBxo1cAjJbEcglrswEVqGPY0O9av?=
 =?iso-8859-1?Q?dIvQzMSdGXPw7RKGB+iIKPaMTQ+ldgrkj2LlVA91TwZ99CPOYp4U3Fey26?=
 =?iso-8859-1?Q?GuyvUbr6At6STC8k4DheFQeboudx/1WG3u243aAbUh2ZifRcs9oPAZ05Gi?=
 =?iso-8859-1?Q?I/JvRNV+5Of2BkRfcC4txg/OmCwLCRXYylmBExALffHrN8twLzi/zqdOHL?=
 =?iso-8859-1?Q?UofB2gNQFeY4FGKMnWi7hwXuj5vcqwPUZlpcaNIaOmbq4Pb3MiYo45v4Gj?=
 =?iso-8859-1?Q?+JGOfX0Eo9cKB/ctohi5SpAaGXXPVdR8rFudZJiWVQJPy+vDJeSGWdNK8h?=
 =?iso-8859-1?Q?Kd4Q/gfL29Ogl4wYbV7qZa6m3fG2s52Z3w5N+vIRHTkRod/WWQfDAgksax?=
 =?iso-8859-1?Q?8mDLXU5POVYuztD2gSXpZd1AnZYB1cL9FvBgGvxzWHCBguG9IXSxRDuoeM?=
 =?iso-8859-1?Q?e6btwRpX09pv0sENl1jbNrjVqj/stfo/MC1dftRuo9qeskZS54cOqi0cjq?=
 =?iso-8859-1?Q?f1u3Ot+VlZjqUpPDr2y78mJL+sY/oBWrUEkr9GP78e5GLfozHepCbF9XwD?=
 =?iso-8859-1?Q?ZZusOFHsXnRECx73Sy299Z9TGlvB7Nd+hShR/EH4ZJFdEVs8QCzdqiRbTO?=
 =?iso-8859-1?Q?ap0oX/dQmL5KWcfIpXoqeQeeX/93F5Jok2JSiFXuflJu/bOiWNv+3EXbun?=
 =?iso-8859-1?Q?CZkp2WtK9u5BtbTwkGaRWnqBk3kSraFSzK/aqAtxSr+xlCMdXl/m9hwNYd?=
 =?iso-8859-1?Q?7jSwgv9yX5CWPUNK8z0=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: 0f048537-a3c3-4051-844e-08d9e5f5b46c
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2022 02:42:15.8761
 (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: QuTCNDT1howhgqwN6py60w03uprZa3BdBmypGOZFxGBdRYvapvjmO98Qfnb36b+2ZxSIsmm9IdpxUrIlSreqww==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4801
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10245 signatures=673430
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxscore=0 spamscore=0
 bulkscore=0 adultscore=0 mlxlogscore=999 phishscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2202020010
X-Proofpoint-GUID: f0XHlIU7MS34IcD-1eegDiSswLQ1UohV
X-Proofpoint-ORIG-GUID: f0XHlIU7MS34IcD-1eegDiSswLQ1UohV
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>

Remove a use of the vm_next list by doing the initial lookup with the
VMA iterator and then using it to find the next entry.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---
 fs/exec.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fs/exec.c b/fs/exec.c
index 0c34b17932fb..e9fa3dd46a14 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -681,6 +681,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, =
unsigned long shift)
 	unsigned long length =3D old_end - old_start;
 	unsigned long new_start =3D old_start - shift;
 	unsigned long new_end =3D old_end - shift;
+	VMA_ITERATOR(vmi, mm, new_start);
+	struct vm_area_struct *next;
 	struct mmu_gather tlb;
=20
 	BUG_ON(new_start > new_end);
@@ -689,7 +691,7 @@ static int shift_arg_pages(struct vm_area_struct *vma, =
unsigned long shift)
 	 * ensure there are no vmas between where we want to go
 	 * and where we are
 	 */
-	if (vma !=3D find_vma(mm, new_start))
+	if (vma !=3D vma_next(&vmi))
 		return -EFAULT;
=20
 	/*
@@ -708,12 +710,13 @@ static int shift_arg_pages(struct vm_area_struct *vma=
, unsigned long shift)
=20
 	lru_add_drain();
 	tlb_gather_mmu(&tlb, mm);
+	next =3D vma_next(&vmi);
 	if (new_end > old_start) {
 		/*
 		 * when the old and new regions overlap clear from new_end.
 		 */
 		free_pgd_range(&tlb, new_end, old_end, new_end,
-			vma->vm_next ? vma->vm_next->vm_start : USER_PGTABLES_CEILING);
+			next ? next->vm_start : USER_PGTABLES_CEILING);
 	} else {
 		/*
 		 * otherwise, clean from old_start; this is done to not touch
@@ -722,7 +725,7 @@ static int shift_arg_pages(struct vm_area_struct *vma, =
unsigned long shift)
 		 * for the others its just a little faster.
 		 */
 		free_pgd_range(&tlb, old_start, old_end, new_end,
-			vma->vm_next ? vma->vm_next->vm_start : USER_PGTABLES_CEILING);
+			next ? next->vm_start : USER_PGTABLES_CEILING);
 	}
 	tlb_finish_mmu(&tlb);
=20
--=20
2.34.1