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 37/70] xtensa: remove vma linked list walks
Thread-Topic: [PATCH v8 37/70] xtensa: remove vma linked list walks
Thread-Index: AQHYWX88qjOGbQsrTUOLxbmgJcApUQ==
Date:   Tue, 26 Apr 2022 15:06:41 +0000
Message-ID: <20220426150616.3937571-38-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?wH90MlxGVgKO1rZl2xYsG+JAxORpz6B38qArQICwAvkrh3VPm1XW00hyIk?=
 =?iso-8859-1?Q?LVflZ0fQX+niVGRJ7bY9ip1W3oJUFU6yyaOGx0zywLo3I9UDQE7A1tu7KK?=
 =?iso-8859-1?Q?1PTVL8ZW0piiDX4xiZRa974XocSaunl71ODOkUCOVRqi5RjGzK5p9/+aU3?=
 =?iso-8859-1?Q?YEbUksOMjP3/zW9dZ/cZaCsfTDvJgP8tVyUfpBZgm9ahHnWjpnfuwUESwW?=
 =?iso-8859-1?Q?QvDrC/7va1EKeMtF9gXVKioCGLi60TvHoKWHLWJ3x5uRF8aIBaX1ZDdi18?=
 =?iso-8859-1?Q?E8kJ9B4mHNqkHh2zKfU0cTPugUyy2Eq/RX/6EHvuW49QKkaU/k7JC7Ae7G?=
 =?iso-8859-1?Q?xaDY/teEjb8FO9NmH4/Zt4aXmTmlvegP/AYtlguNzKFV+ciB5E58eZUdDO?=
 =?iso-8859-1?Q?IRH+4ZvDLerm4EievyKqJpAz8POUw7vu37qwQQrq4wUzyemy8bGfWYNg9T?=
 =?iso-8859-1?Q?of6fn9pnRgQuWTpmyi4Xb+H6NQaFPO4zS/4yoSbo7egjeJQoLp0KRAc2ui?=
 =?iso-8859-1?Q?f39NSBE/fXpVmlaN3vzNOvzOio0gqBngvByZ+CuU96VFOfk+AnNptikBuw?=
 =?iso-8859-1?Q?J2NErXSHlRSGlO6BmofVbna8XrYuo6DB7M55LfAbUAX1KjHlHp9c/qaBTP?=
 =?iso-8859-1?Q?QOIyFEX3GihrxnCLYKIS/lh0D5APDzM0u2QjfqJne28tPBc1UKGQCLluZB?=
 =?iso-8859-1?Q?DaC57RYddv3oDIzZGEd4w6EWTbvMXzX0YW4BdOeIHeBlN9rmW0pPle2KnX?=
 =?iso-8859-1?Q?41IEeP8EyvuBSHyHHOGUdtk+dnWQFre0AiWX0lVjFBotoCom2msxp/ucP6?=
 =?iso-8859-1?Q?GsbB4Jx/yJO2JoZE1I+OosC4293KBotY8JtwP1fR+TxJ8jr1pi7Gm+SXUp?=
 =?iso-8859-1?Q?RLrx8q0fM445niimnbHNhqQJgqIREd/WiL4BAy7lmaPIU7fGtAWIghIR15?=
 =?iso-8859-1?Q?S6OiCRRsBdEy9gQ1e9iX0SoNCm+cdK3qOzdJX1InKbcXtVcTA0li/ugVTV?=
 =?iso-8859-1?Q?MLhWbLyZ0LfvWXaYB/slSjn43Dq0ydF2a89j0ymW6oaziDe/szl6ZBYqIe?=
 =?iso-8859-1?Q?CSKBX0LAjNDPN8/aLCWkcFJTW4MwDuobOsxMn+eO9Rf9Tuda37GieKZdvm?=
 =?iso-8859-1?Q?bAOMlzhtTIr8zsdOKy3rXjJB5geCxgsRHI5G7WQeF6r98mp9gwBE2jSkOO?=
 =?iso-8859-1?Q?ifIQ61+DJVY28kR4eHL6Mkf8y4GNxCvbPnVU6BbaHSKiUyCTiKt9xxKmmH?=
 =?iso-8859-1?Q?xSIbBHg7D6bAKbRkP2ZxLmVZyepSTcLB1fLc3ePzV9r1GDvQ2CmXmeMaaU?=
 =?iso-8859-1?Q?yI+kFZqmovO9iG6s8OBPKuN1VPW6m4UoWK8jPYSTWp39w7ufIReqL1vzF8?=
 =?iso-8859-1?Q?aKNMPDJlEx/asp2Pt4P86jvJYr6LJpUBuNC3PMojaQuseHfbNNd1G1PEbu?=
 =?iso-8859-1?Q?lF0zz+4zQ9xe5MjTpOGJoc6hY1uZvzrFlNiMxFjR8UsqFYqlIocNw9GXXV?=
 =?iso-8859-1?Q?3nscA84bKNQ4l0Qct1XuTRra5blsg/xmx+S+n0mU9DkLaSHf80CvPV3FXS?=
 =?iso-8859-1?Q?fa6AKwYcL0waFXBM2qEbzqfyba9rTaK/LXt5Jxt9GyHX98Hmy7IbDnIGYG?=
 =?iso-8859-1?Q?jao+eaNy/dzb0qcBKxhrbUnwnc1VRke7JS/k0a5mQbjJ52zS71ZQPaSkek?=
 =?iso-8859-1?Q?cfuXSgivVL4PYY+LgHux4iHuTaKo/A3aLjPkuyrzmkWCbFaOA2OXPPenZ5?=
 =?iso-8859-1?Q?s08xRvxZtFgofxOQGWwhBU15xRo9lMz6uBcUKciqW8iu8k8l229dkaqDyo?=
 =?iso-8859-1?Q?jyfHdu9PIJQCkTeqXCi1HGtB4RepbN0=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: 2d6e9813-dafa-483f-9d8c-08da27967333
X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Apr 2022 15:06:41.5834
 (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: 95clm5xs+xxDSPYpAFWjVTMgmu8mf1D/DeKO/wMvvNRZxJ17Sj3CtgTL2DsDFZpXUI/jo4dZdW7VmNrqO4F//g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR10MB2929
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: 2d63exJd2nfp3sDqvqnNkHIrEq_StWvu
X-Proofpoint-GUID: 2d63exJd2nfp3sDqvqnNkHIrEq_StWvu
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 VMA iterator instead.  Since VMA can no longer be NULL in the
loop, then deal with out-of-memory outside the loop.  This means a
slightly longer run time in the failure case (-ENOMEM) - it will run to
the end of the VMAs before erroring instead of in the middle of the loop.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---
 arch/xtensa/kernel/syscall.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/arch/xtensa/kernel/syscall.c b/arch/xtensa/kernel/syscall.c
index 201356faa7e6..b3c2450d6f23 100644
--- a/arch/xtensa/kernel/syscall.c
+++ b/arch/xtensa/kernel/syscall.c
@@ -58,6 +58,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, u=
nsigned long addr,
 		unsigned long len, unsigned long pgoff, unsigned long flags)
 {
 	struct vm_area_struct *vmm;
+	struct vma_iterator vmi;
=20
 	if (flags & MAP_FIXED) {
 		/* We do not accept a shared mapping if it would violate
@@ -79,15 +80,20 @@ unsigned long arch_get_unmapped_area(struct file *filp,=
 unsigned long addr,
 	else
 		addr =3D PAGE_ALIGN(addr);
=20
-	for (vmm =3D find_vma(current->mm, addr); ; vmm =3D vmm->vm_next) {
-		/* At this point:  (!vmm || addr < vmm->vm_end). */
-		if (TASK_SIZE - len < addr)
-			return -ENOMEM;
-		if (!vmm || addr + len <=3D vm_start_gap(vmm))
-			return addr;
+	vma_iter_init(&vmi, current->mm, addr);
+	for_each_vma(vmi, vmm) {
+		/* At this point:  (addr < vmm->vm_end). */
+		if (addr + len <=3D vm_start_gap(vmm))
+			break;
+
 		addr =3D vmm->vm_end;
 		if (flags & MAP_SHARED)
 			addr =3D COLOUR_ALIGN(addr, pgoff);
 	}
+
+	if (TASK_SIZE - len < addr)
+		return -ENOMEM;
+
+	return addr;
 }
 #endif
--=20
2.35.1