From patchwork Wed May 4 01:13:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 12840763 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B29ADC433F5 for ; Fri, 6 May 2022 08:36:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 460956B0073; Fri, 6 May 2022 04:36:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 40E066B0074; Fri, 6 May 2022 04:36:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 260E76B0075; Fri, 6 May 2022 04:36:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 1822D6B0073 for ; Fri, 6 May 2022 04:36:43 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id E443E120A6D for ; Fri, 6 May 2022 08:36:42 +0000 (UTC) X-FDA: 79434662244.18.F3D895E Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf09.hostedemail.com (Postfix) with ESMTP id DED2E14000D for ; Fri, 6 May 2022 08:36:35 +0000 (UTC) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 243NIL3I004092; Wed, 4 May 2022 01:13:55 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2021-07-09; bh=AsrOvEw+rNqDojiVyg1nxdaglDBANXREzfq5N79ptoc=; b=GoUi6YhAMWffD7jPmqcwujavKImUDOcW1reKRfsAkt2iIcNzBvgOsHzVCx4CgEFtGdwT wdSd1GegETP/ha1RA161fM/EHFwweC9iF1AKtxDPPlQsTmxz+U/0oSR9nuLWTK3K1t9/ 7X6rdteRmozo/Aixn7CTAUA+1TouP62XrAN4u5Jyyb9lGuOyxYFcoQlgZdtW18leO3vs 9oFKIFr1HlLW8xcoelkh4TpPRHXPlljXUgiCGk3ZHMioQZkhVxn/5Aj49GZga0sF1wZJ BVOKsqQDseZuqgO5ozs08RTBX10jUvsyl7Yh8mXWWMNRBZAr5X5JbLUlxKNUPMBh8vyI Gg== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3frw0apxyh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 04 May 2022 01:13:54 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 2441BRJU013094; Wed, 4 May 2022 01:13:53 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2105.outbound.protection.outlook.com [104.47.58.105]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3fsvbmv3ke-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 04 May 2022 01:13:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kqK3UOGbWboTQCe4yC+iGWH6Y1BE3xSMfUSbU/DpvJEEJIeczfOT55DupdKRhZr6mr58ULurgsgYsa8qxdOKnTgMInjQJIGa6TyhS6h35ACH6N7hA6LTBJ80ExqyvKMoLWNPLDu52WBxlCCLS7FstTuQufaotFzL4CGneYtdc2AGP6tisf0AtiyEQ2O78dob5GciNSweIVqUY6uxKxtsIC512ITpkFj4KLOYtwK5BB2Innjju+QagHdzBNOAjrSRGzzwpAbQkIDH3WQC0l2xTob+7sSg1+qgC41ybDO/wumjA5DKS8zLv6PVDbJCVizwfHM8+fQrV1g1qkAWGXrMKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=AsrOvEw+rNqDojiVyg1nxdaglDBANXREzfq5N79ptoc=; b=oRfV1tHbmteeTg7SssV/MRewedUMhTXwZQlfFuDxBMMQ/3VGG04b9WGHyluq1pqanmbYF9ATqCzlyhVftLD7nUAYxVItvqIxo447BDWjIm0VnPIH3NNPGIGPVJYo1X7PrYNhJ2qmpTXvPYnDj3kUVq6HQfI7dQKYWRpSEmzdpXCm5s0+aJZjACoWzM4fk6UOtNWVQX6VffzMyCeXoCEtZbJRLaz89+hFf22uDyPiqzOqOZZzosstrGEo80R6fGq+hPz1d3QZj+8ioy9K7GeV5aoYKmDgdRUtd6OfzbpkYYjJwNwuHBXlbUrBTq3v4eIK551qTTGqjL11Jh+DubuRsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AsrOvEw+rNqDojiVyg1nxdaglDBANXREzfq5N79ptoc=; b=gXAOLiXHan6E0CuOIVTZbPaQMud8RtCMC8IiRqYUm9ZI/atYC9oudSEThi2xQy1SV0mGmmxS4kyjfBLFQ2blP8VPFyumKseGjJphJULxUvkVXx1D7rkFQlUavEMHMcH/6T4X5pvtxqgImlwX6D8NYHfTObrcRNrfjIw3avCPgOs= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by PH7PR10MB5830.namprd10.prod.outlook.com (2603:10b6:510:127::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Wed, 4 May 2022 01:13:51 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::318c:d02:2280:c2c]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::318c:d02:2280:c2c%7]) with mapi id 15.20.5206.024; Wed, 4 May 2022 01:13:51 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton Subject: [PATCH v9 21/69] mm/khugepaged: optimize collapse_pte_mapped_thp() by using vma_lookup() Thread-Topic: [PATCH v9 21/69] mm/khugepaged: optimize collapse_pte_mapped_thp() by using vma_lookup() Thread-Index: AQHYX1Q37scr3TuLAUawfkN47cITRQ== Date: Wed, 4 May 2022 01:13:51 +0000 Message-ID: <20220504011345.662299-6-Liam.Howlett@oracle.com> References: <20220504002554.654642-1-Liam.Howlett@oracle.com> <20220504011345.662299-1-Liam.Howlett@oracle.com> In-Reply-To: <20220504011345.662299-1-Liam.Howlett@oracle.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.35.1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7950e136-9575-4cb7-2167-08da2d6b5998 x-ms-traffictypediagnostic: PH7PR10MB5830:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: RB3YNzNXr3azIQc87zY2WeQASiQOvMTmJI6Q+Sy+LMXHScUfI0NZK+AdwToWIujJ0Y6D4oDsVILWKggtjG5hESQWLiowY77xvrMNcCrlVNttzhimJGeBooWMrxPLtNlvIq3Fsdzo1KwSJHC3VhRtz5dIlXaFIW71GSHr5aWiShVky6b8NhWEB3lZaPifn2ucGpQ59tJHnIP5IVYsT7887qVnxnaVRCgRYKVew98wgThv0tR9/3w9Ez+ZfknOjDISUQoAoCdrkrbUfUftCwfsWKn/PrTGsqiDNvchGjWaEvMEbmp/nRctB201W8Agn+cgLAL85IEX4zUeiFTD43OiMkZsKv7Tul3TbcFl69+AbJf/3B9jtxEf+tfRT6Ej62kuPismRCKHxKyfuAVPtzUMezOn8B8BgLoQBt7FHFv9IDn7+6XEoF5BS3oY+hwl0A2OO8amh6VRCGshjC2CmKXgFn/WZ/oVMqbMz8ug4YXn3fQ5/0HB8yYpRg4oO8lZRfOadYJ0oUV1M0A7uJsoDipEE35y7wIREQPaherjrjuPGs+m8iwINO5LNzDm6Uzy9FAOfeIhG42V+1zDrJx28TNt4fAlSXXFq8YR6X6jLbb9SkKuade47lopqQ75Aik36n5WXSOdx1+5kvB+gv8R0liqUj6Gjv/EGPhBb0YYfesr5G16n92XPmvUI8BtCKoFP6ihq7SzkO2QBNB4CZaN2xSFDQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3022.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(86362001)(71200400001)(83380400001)(38100700002)(38070700005)(122000001)(316002)(110136005)(4744005)(44832011)(2906002)(8676002)(5660300002)(64756008)(66476007)(36756003)(8936002)(91956017)(66556008)(2616005)(66446008)(66946007)(76116006)(1076003)(186003)(6512007)(6486002)(508600001)(26005)(6506007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?cWphXOyi0TNuyCGfCljXJaq?= =?iso-8859-1?q?FnNn10rxWetZUgUcE5i4hJlzzjbF3wN6e0Sj6Mh1TmnP1oQllDE1ndoJFcjz?= =?iso-8859-1?q?F4bdGG9h6LdzejmX1ZQJIykWsFHKtooHzmB4LmZ/Ptm+cAs18DgiCIt53GBJ?= =?iso-8859-1?q?K9kmSoh2cn48Ek6Ej44oA+fudqj9SB5fhqaHa9z97Yee0aTbh6O3i9l4PbxO?= =?iso-8859-1?q?/YH1Jpyvc6EdfkxwUMZcCaH5Jlbh5aT57bAzfBifx2XwWHbKVGOKIRs808N5?= =?iso-8859-1?q?WRDFZ4220l74xE1RSf3GWrEZnROyTcp8ZRoM1jVMNcV7Q52SHFKbr06cNFzZ?= =?iso-8859-1?q?9IIotAOxcq1XiaTWaIwXTx1JS1E/j2j1SDhSdKMz1TpD+oHM8yxwCfeG6QSB?= =?iso-8859-1?q?PFer/34dkYv9WmupGg0PcFN+/zOpMFCC4giS2++LpApJgBKGuR2oeACaae7J?= =?iso-8859-1?q?D7HmTfVsKNXJ2uS+Lub3exSfpaBXb98EDp7HP7yPM8OHfqb3nuB8V3xzbweu?= =?iso-8859-1?q?+AECVc9V6hUTtBoKA7nSgOsB30Er6FKqBLZH2KOB8KZDsPM8GDUKuMxbm0OP?= =?iso-8859-1?q?2+cPEtLvmruQfzdzyvMzks9i7NSZRz2rO99XBLNkVRSKS22B9VXvDvHxAW3b?= =?iso-8859-1?q?yrjFgMKou3P2PkZ9P84rSbdXmGAOLcHcjfuLkUPNIu+aueoGu3IBvd65rybG?= =?iso-8859-1?q?uSCNyqng8HNLIbRmEE7ne8pdA2SIAFp9RNurVaIEjCMvGBhiBpBZIubwbupg?= =?iso-8859-1?q?YTTfDTEB7T23WE7paPaute1CNFdo9kbd+W6H/M0OyBUF5/zHlDPjfxQAyZA0?= =?iso-8859-1?q?SAU0+/l8Gzq5TINYlwVmez+OWNTW01exgCeH9mYjpa1Omcdyyd0HQl2ZaUOl?= =?iso-8859-1?q?PX6QkworzG/8qrrO+HAx+aS3Mtiw87pIeCkkS8ZYBREZJp4I8MhAJluZudXm?= =?iso-8859-1?q?kZIMdr6HeWte61rCuTl654Xwi7m+MN66x3jIhweOQybFjGzqa3Rxev+49KPH?= =?iso-8859-1?q?tKOD+Efx6XnyqSwriKs4sZhdNzOc8MXVZHyurPLz9+s04voC8GbjcKdqQcG5?= =?iso-8859-1?q?JRIEBiIU71Ysfb+PPb1+3H50gFcKkc5zJInfNnURKgfedpUCzxWKrZ2Ja6V6?= =?iso-8859-1?q?Cp9nGnpBegUkyvX0jJQyepaLs7dOYsY5MvjBQl2L3D13Reg7+ASvL4235/aU?= =?iso-8859-1?q?2KglpxVlUW3VsaIm4rKdyVoRntS4lj6QOiFMg7x44MGj4n57HGdC2kXVWVka?= =?iso-8859-1?q?zKf83dFGzYqQx4h7W8Ez0IiCp/ykKc7976Dx6Mm3MTq2SSJkSoHZS7xUWr7w?= =?iso-8859-1?q?+4WFGGXg5a8jeZegVb4r+YVkRRoaJqsH1W14CRk/RJcfZcdqeZriaEUM4A7q?= =?iso-8859-1?q?ClPFJWH6HngU1KzopXBmSXo+uR9Aj+oOLqfCWRq7g4eWghMTOKdLUjLun5Nj?= =?iso-8859-1?q?D3+NTqab281zKfOfJigM8d7sYvzyR/sqYtgCetzE+tC0VChOcPuo4Mpq4Qmr?= =?iso-8859-1?q?gW39kwD+9ksyKvBpH6YvyYCNUMg85aocU18pFTIArrDWqS+LH0EmiGtd6Xfj?= =?iso-8859-1?q?C4AYA7CMURJpIqbZ0QiS2VqPh3PKR7N7rZJNgIMgnmppD+jJjTdFFVAm/QRw?= =?iso-8859-1?q?36S37eK5wDIvn6EuQtZSobDoPcoO1hQn8z2Io8M0yQhByICjyzDxs5XZYPIM?= =?iso-8859-1?q?rzwuJW41nUClnC8qw3Ft1zAm9DPV1yGJfYig1nt1GbgVuOko9fvrrTwJx0uv?= =?iso-8859-1?q?D3AgTBYXPoUqzf1rl7p5bFgoBw4IE4vNYUxldZwP6t6jxFfUKYh+mRXRuOOa?= =?iso-8859-1?q?hjak/US8=3D?= 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: 7950e136-9575-4cb7-2167-08da2d6b5998 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 May 2022 01:13:51.2364 (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: 27fate5T9g4hfaWwV6XGBY2fr+DelmBkV/QpeQ6v6tZSbT2FTdcHNIMTuxoZXv+aHidzs42Vd9Wfjw5CEUmInQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB5830 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858 definitions=2022-05-03_10:2022-05-02,2022-05-03 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 spamscore=0 malwarescore=0 adultscore=0 suspectscore=0 mlxscore=0 mlxlogscore=865 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2205040006 X-Proofpoint-GUID: t4Tg2u5qXGycMDLgLu_nChMYO5L42VF6 X-Proofpoint-ORIG-GUID: t4Tg2u5qXGycMDLgLu_nChMYO5L42VF6 X-Stat-Signature: x7casgbe3ti4eno5susn846eftw37jhq X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: DED2E14000D X-Rspam-User: Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=GoUi6YhA; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=gXAOLiXH; dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf09.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.165.32) smtp.mailfrom=liam.howlett@oracle.com X-HE-Tag: 1651826195-655730 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: "Liam R. Howlett" vma_lookup() will walk the vma tree once and not continue to look for the next vma. Since the exact vma is checked below, this is a more optimal way of searching. Signed-off-by: Liam R. Howlett Reviewed-by: Vlastimil Babka --- mm/khugepaged.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index ac53ad2c9bb1..03fda93ade3e 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1435,7 +1435,7 @@ static void collapse_and_free_pmd(struct mm_struct *mm, struct vm_area_struct *v void collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr) { unsigned long haddr = addr & HPAGE_PMD_MASK; - struct vm_area_struct *vma = find_vma(mm, haddr); + struct vm_area_struct *vma = vma_lookup(mm, haddr); struct page *hpage; pte_t *start_pte, *pte; pmd_t *pmd;