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 21/69] mm/khugepaged: optimize collapse_pte_mapped_thp()
 by using vma_lookup()
Thread-Topic: [PATCH v12 21/69] mm/khugepaged: optimize
 collapse_pte_mapped_thp() by using vma_lookup()
Thread-Index: AQHYm97pZcMtud8hME+xQzxx/jT2zg==
Date:   Wed, 20 Jul 2022 02:17:50 +0000
Message-ID: <20220720021727.17018-22-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?NR+ZRCGVIyE4yQjlp1qBbqbINbN+ImUp3ly1EwwQO9FRK73vrvn1hEhRIJ?=
 =?iso-8859-1?Q?UUGnww47Ka50W8OsGxRq/rsUttMldwFOUDaUfEfUrRSYvy87y2Rgnb4sXh?=
 =?iso-8859-1?Q?4GpCH8bQnZ7I4Y1PlpIQst2f7C9WwgbiI+NrE/ZQT0fKr/oTgIelyCqRbB?=
 =?iso-8859-1?Q?VcBzDRV8zVtw9y9O+IRWAe4dGNHZ1Vr/TujiPO7hvjfZdHzfL/7ijUB2cb?=
 =?iso-8859-1?Q?udsib8pVazgd50HbtfWCSGgMhoznmAHTFqJsl48cfGPWype8U36/AjPQeg?=
 =?iso-8859-1?Q?CYIfeLG5uLpEbqJard/qPs8VPouBxe4397vHfupvsM7le6P3NFFbY0otKs?=
 =?iso-8859-1?Q?MxP4VZql37wpDzJG9YPOWMi9BpqwhIjcb9sLDvo1IpxMYQdArVFxUsuqpe?=
 =?iso-8859-1?Q?m2/KB/N/fx/+Ijk391YDuwmjgeeEUgUYw1sO6xO1EZ80a4UJS8djSnewqI?=
 =?iso-8859-1?Q?LKiaPva1f2zaB8Kz2H0LBFwqlATrgOIKLUxFqUzs7XsTMWR2PPG/5iv9wT?=
 =?iso-8859-1?Q?0DZwJseja4EC24hHCYu3ei1p259Dqpw/2AHtygaqXLJk5XDc1QHHKMB6Bx?=
 =?iso-8859-1?Q?nR4sTRr2HdlzY2C52kLaD8Qe85eB/sWbCqtjqyw5Y1jflNMm5FW0O9miIU?=
 =?iso-8859-1?Q?/J0emdTDhcqyfhN1ChS6CNVMOLlidMcgWhVfdakIZoiEM4aScKBVCvAfbV?=
 =?iso-8859-1?Q?jyp6hQwgLxSflHt1CL9FaZOC0o4Ye3BR6KSHVxYcvS9duDZ9uOlTp/VdKh?=
 =?iso-8859-1?Q?58EtWh1CX4r8vK7FFKlbgVw1QpMK+3o0O/jfoFz0OF2VFkXSAJOohKaVRF?=
 =?iso-8859-1?Q?XHDoDrLvavoTn63OikMfqPPllTQRBxNdsUDjyz4HwN4DYu3duCEcSyZT+J?=
 =?iso-8859-1?Q?XvwFQCzYfo96SbbSCWID4Ig+ZB0AjydmsGBTzm9ipTciF5KmrAClsxV05N?=
 =?iso-8859-1?Q?DcNIcu4u2uwy6QgQDSK8UfR7yOkr22sG/Ncarm/0e0Qkwm6vd1bUeu8nmR?=
 =?iso-8859-1?Q?G9fujzA6xgTyPgVFTWOVnECtYnmeS2LYcGcaxO5hX8SO21Yppu2d0Ga3JV?=
 =?iso-8859-1?Q?wO4g/4/3J2vCX3165bVw1ob/FKCnob9HynSJE+bmNRA8rv3tuJqT3TZybX?=
 =?iso-8859-1?Q?HFUfRMQUwhAdg6yMBb4bp9EtMx+0UxqPdA5j7wW5U93edR6nw/9lFfPjPy?=
 =?iso-8859-1?Q?DrhE6Zk/763Qu38MxlVyR6+6mRFywYvA6oXP9wzfiHSl7DueOhHAyFakBx?=
 =?iso-8859-1?Q?IVNLLkJOZpPFa9esxvelyhLDdaeZ70GBqlX1aFq0QwwR5kFOXCBd83asaG?=
 =?iso-8859-1?Q?UWRlnjajz2QfTS3dRoq5iOPndgkLEQ0dqoAE1FUjbfMdsQfYKpHTwIFzIA?=
 =?iso-8859-1?Q?LTYnUx3hqXzKvhejHaHJ+Oj3JlAwbQqIMu5kN45X04lC7WCzirswJ+gFIX?=
 =?iso-8859-1?Q?KgHl61wV9g+DDzzxIrA3Lu2zs5UR0WDYyaAl+jx3DYj0cIwNs8hx6D8a+v?=
 =?iso-8859-1?Q?xRcEH4MCeN/9SxIIL0wgOPPHO2sFeE8CGwPMISzkYIJxqq3v3vOnj7udyC?=
 =?iso-8859-1?Q?yLh91Mn1AIaGlnCi4ZC2yLLkzjZkEVtT4RcNUrQqSzsElUvutJ4qv9jRuc?=
 =?iso-8859-1?Q?Z860iHOerzG9LR9HUpzFvKUFQjTCqyF6GyHR3CEM6zc/2vTbt5+eU9FA?=
 =?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: 1110aafb-19cc-4418-547c-08da69f60e0a
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jul 2022 02:17:50.5092
 (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: 1Q3ZwyZvZVZmzR/+ZHEobK5txUBLZ26rTBcYJ04wBOpoR+3s763G9m+c7VSICraev/jaQ0VxcX2ETOdT2dpycg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6243
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=847 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: AAdhX5zYHaZdLgyZpyX3IqskyCvv-ZzH
X-Proofpoint-ORIG-GUID: AAdhX5zYHaZdLgyZpyX3IqskyCvv-ZzH
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: "Liam R. Howlett" <Liam.Howlett@Oracle.com>

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.

Link: https://lkml.kernel.org/r/20220504011345.662299-6-Liam.Howlett@oracle=
.com
Link: https://lkml.kernel.org/r/20220621204632.3370049-22-Liam.Howlett@orac=
le.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Howells <dhowells@redhat.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: SeongJae Park <sj@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
 mm/khugepaged.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 16be62d493cd..8dbd68c414d9 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -1426,7 +1426,7 @@ static void collapse_and_free_pmd(struct mm_struct *m=
m, struct vm_area_struct *v
 void collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr)
 {
 	unsigned long haddr =3D addr & HPAGE_PMD_MASK;
-	struct vm_area_struct *vma =3D find_vma(mm, haddr);
+	struct vm_area_struct *vma =3D vma_lookup(mm, haddr);
 	struct page *hpage;
 	pte_t *start_pte, *pte;
 	pmd_t *pmd;
--=20
2.35.1