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>,
        Hugh Dickins <hughd@google.com>
CC:     Yu Zhao <yuzhao@google.com>
Subject: [PATCH v12 36/69] xtensa: remove vma linked list walks
Thread-Topic: [PATCH v12 36/69] xtensa: remove vma linked list walks
Thread-Index: AQHYm97sMA9k1qbhxUOVQlVAtXzXaw==
Date:   Wed, 20 Jul 2022 02:17:55 +0000
Message-ID: <20220720021727.17018-37-Liam.Howlett@oracle.com>
References: <20220720021727.17018-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220720021727.17018-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?xJwXy5lqJYn+OpIclEc7fRTUircLa9CJAzd1+vNvZjwIM/74I4GP8DhTJS?=
 =?iso-8859-1?Q?0lpgEBui3oNxkz2E7dwRIt1FJrPscti5+VWu7Hp7thMLOytXMnUmNwW14/?=
 =?iso-8859-1?Q?rmxtwlXxHAh/Wa8+/9o0u+Ma8rIPfaim5OIjM53wzQiyPiHAQKq/K65qZO?=
 =?iso-8859-1?Q?xGxzZHXeq02JGvN1k/EN5DB3i0og8FIl6A6lmD1Kn6QhOVMDSPXflHU/KX?=
 =?iso-8859-1?Q?0p4/8inEdoxzbiFCFJQOy4w2WFl5macpshVC+3ridYsN7zchc4r/imYYOq?=
 =?iso-8859-1?Q?oZVAZNL0jtOQFLp4DusHOkxRtc/YA6wymQJkq4zSATCVIJj1jkrmpIa+RV?=
 =?iso-8859-1?Q?UciP9y619FOAWW6uybmfWKVwHhHPZBLFJiFbVeH3BS5G79o6ksjPURuH+s?=
 =?iso-8859-1?Q?4KFBCGvADK6ak4ssjtbYpu6JS3fCyNhxLBU7FX/WWz9cwljk51vdy/s9+V?=
 =?iso-8859-1?Q?HQWemzUlZDV/rvekq5cec/WgSGHQCa1x/DBdkZfqm4/cFabd6/OS5TYMam?=
 =?iso-8859-1?Q?p9kKE0TVYLzb/Ti4haZ/+t0GCS+GGVxzRQ3ow3H6jVXQlOiH7k1NjQauuo?=
 =?iso-8859-1?Q?fJ/uoz73VibKQ35OqERF05duuLZqdrK1YEycYVbeVUAsF7xzSmoQY0oopc?=
 =?iso-8859-1?Q?xcp8xXjslYOYnFXFES5DkZAGE3O58QP+AjcKQWHr79pbalEn2RYSd1GugB?=
 =?iso-8859-1?Q?gm48j5k+rZfnmC2I39dzgKRHKgkPKg6nMolKUtYYYBxVSb876nUwyt2IoS?=
 =?iso-8859-1?Q?MFBxFeizrUJ2Q86AWh/WALKlktSrumupYidOA3jYPGLzeSkd2kC75zGAPP?=
 =?iso-8859-1?Q?941klo+UlCMUP8V2Q54Gww6qjQYv60+tOr4Mw9as4tlveQR6amWapAbBDR?=
 =?iso-8859-1?Q?2CMa3lOinFdDk3L1Lxe0ABYQVCatX3aIMjiWZLGu6liZ1m8gGkGTzbqD2y?=
 =?iso-8859-1?Q?QSW5m/BzkjQOC87M8fP89LQ24kMpSL/45IEP+DGbtknDEGWFBN7VarAKP5?=
 =?iso-8859-1?Q?NAYYNq7bPiRLzFljU4VJbHXL1387dO/F6JYCI8pYhsC4GNA5PJhw205LH0?=
 =?iso-8859-1?Q?IbNZJyktoNxcFWBUuIxLfgC59J9G4EdyZv5001t78XM9LmCyUQF/6pIgRN?=
 =?iso-8859-1?Q?mA+lz6rWzQCjg8RrxpfRjOaOPK6raR6HvWjDHr1hZ0TTD6NauVoSr1XYyk?=
 =?iso-8859-1?Q?UFNsraMnaWUx/eT0Of5me7fuX/7AX2gxeizFGtER4cNSE/NeaxSum3AgCP?=
 =?iso-8859-1?Q?nbpE8Il57wBXnf0aBVDAUq1CbDIuInADz1ZmepipPZMY8wq+r+ddP2w8tq?=
 =?iso-8859-1?Q?Z5qbO/t1ABT0NvVCbPmPtFs5xIy3Re4ipK55idltTCqj6EF288CmtOd4rI?=
 =?iso-8859-1?Q?xxOmuq46ElwJk6kb0PWgdk1Ql9pneY0bZlD0q5LKw07AokRouotEWT/myu?=
 =?iso-8859-1?Q?Xv7ELSdcq+YzJNwAZ1BkySLtDGc07buyhzwa+vsP0v7sBbIo3D2Om3V/1f?=
 =?iso-8859-1?Q?p7FywsLBp4vrEaahOdz9jx45d45zJCWkcPzuVY64qsZGIZrKjCVv54dc0d?=
 =?iso-8859-1?Q?1BlTV0aDxMKwXngUuRasy4+S1YAGDgBg6f6/qe6lcyjP6OItlm4eDVBFNa?=
 =?iso-8859-1?Q?+crPaADMN0pMZY8j6CWduhyxDd8pxenIp93NRaE/DFkhu1dgAALgVuYA?=
 =?iso-8859-1?Q?=3D=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: f3a91a2b-a232-4bb8-50c9-08da69f6245a
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jul 2022 02:17:55.7743
 (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: Bwb3cri2FetMW1t7xs+LOl1zQWgXZRPqYyMw2IuHHkN9XRXSMPys5wM+v2QUiHatx258rU3WVGNEapMzRpX3jQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6316
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-07-19_10,2022-07-19_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 phishscore=0
 suspectscore=0 mlxlogscore=944 adultscore=0 spamscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207200008
X-Proofpoint-GUID: dY5_nI0rLuOkqE9qLib3oL0Jq7qfNPBr
X-Proofpoint-ORIG-GUID: dY5_nI0rLuOkqE9qLib3oL0Jq7qfNPBr
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        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.

Link: https://lkml.kernel.org/r/20220504011345.662299-21-Liam.Howlett@oracl=
e.com
Link: https://lkml.kernel.org/r/20220621204632.3370049-37-Liam.Howlett@orac=
le.com
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Howells <dhowells@redhat.com>
Cc: SeongJae Park <sj@kernel.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
 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