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>,
        Yu Zhao <yuzhao@google.com>, Hugh Dickins <hughd@google.com>
Subject: [PATCH v11 21/69] mm/khugepaged: optimize collapse_pte_mapped_thp()
 by using vma_lookup()
Thread-Topic: [PATCH v11 21/69] mm/khugepaged: optimize
 collapse_pte_mapped_thp() by using vma_lookup()
Thread-Index: AQHYmYdyg8T8MJyMFEKE92zDC33Z3w==
Date:   Sun, 17 Jul 2022 02:46:43 +0000
Message-ID: <20220717024615.2106835-22-Liam.Howlett@oracle.com>
References: <20220717024615.2106835-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220717024615.2106835-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?F8evcD8u6vU1MOFRgz81z/7OH4GIRAPrfNY29gB7qVBzsrLeC+1Kb/UYkC?=
 =?iso-8859-1?Q?J1D8Gv2+69x3Z+k4BUMWXz/Zin+kLWkXuM6CR7DndP6c/muDd+NGRPdHSy?=
 =?iso-8859-1?Q?anGK9f/4cARkcVY1oenjKVFk+Vz2dQBA35VT/F2NCEDHpDJo/RbmIVEmeP?=
 =?iso-8859-1?Q?pKgoGp6bdHvaO62OTBG4u9DrKns0q8AOEporRCaukx0w7Des2VSc+7BrcQ?=
 =?iso-8859-1?Q?g2lkQNlaxPnVhTmbMS3w8TSrezB0m6jGKYOsoQxtwag6zlwV+d5uJroABf?=
 =?iso-8859-1?Q?jsGGctVWUwnPMu+wrWwClHn7LSBDWHC3ZNI2QL3M5pfxAKW6YlTD0N0qk9?=
 =?iso-8859-1?Q?RCCjg6MkcMgYMNU4g6oUcwHXEqX7o3ROmpwJttO+ZtPNuLs+VU4Ozp38h9?=
 =?iso-8859-1?Q?kLz50u/4CQrJK6mRa1pS8vfmA3d19t5/XDZiQdPIljTVqEzcyU1PXbXL1+?=
 =?iso-8859-1?Q?0mKcneYMIKqhYP7ffOAAZjb6UvOmMsm6/s6joQtUDh93k2s3ZJ13TDt9Ah?=
 =?iso-8859-1?Q?+NI3qR+YfkJwWaO1GGfuFOD6YWEdiTyvdh1S6kH6wRjaSUpIUOyqQXsqbc?=
 =?iso-8859-1?Q?ZnHWwlV+d0i0v0UeOTm9oSr6UeG0j9cp11sVg0tOAmV2I5Twg7Gn0kCpPe?=
 =?iso-8859-1?Q?fWiN0ViGzExqqvDOmJrhMmiyd5PraMF69ZKs57YYRuEb7FV+knu+ytcEhN?=
 =?iso-8859-1?Q?CCSU2MFmS8wxthA12bJWZNsIS3tjngkttUeyRXj4ItGlJ1Xe2QokfVg37r?=
 =?iso-8859-1?Q?6f2gk5Cj0l2oq4RB5ZMGa8CRDsd3iLrGm194iD6f7STgjidALn63Q8QdS8?=
 =?iso-8859-1?Q?eYFT6n8ynYBZ00yprdg2FTGbIS+PMUqwC4qJms5Tt6UsNwwV/8Ta/2heoV?=
 =?iso-8859-1?Q?QaGMv9D6e8a8DG4u9ybekSDIiatsHrAZnTlBep0S0b3wIPdKAKuCPVXHiO?=
 =?iso-8859-1?Q?fuwiFrA8XLjaIa6hDKuz63C42Pz4Y+67SL2SSFIjTM9x24+wEshuxU4y5a?=
 =?iso-8859-1?Q?NqX2XHWsQKPqecDlwzDmMtOtgSc8x9q9+Uc75HDw308rsEK7yl09iePMHo?=
 =?iso-8859-1?Q?rNxG0dWc9u0W6dSyNXovMVSNWCwTyKQEcQRa8REM0lq+y82QrZXYla8pMP?=
 =?iso-8859-1?Q?QzKJnVHz1Ei4/34sZxYAfP7rdHcyGAb1m+/AmS2y83aH2zju0bhxmsBxfU?=
 =?iso-8859-1?Q?ZmDl/jOdeunLNphId0+TPtcnf4vTG7Inieyo9JaWEGYK2qc6UOXRKUWly5?=
 =?iso-8859-1?Q?NX29HUXWlNMDqDgbnRIgDahYhQtZy229Ztz5RAdGDHW2KdWpqR5XYncM63?=
 =?iso-8859-1?Q?Mgl6XnWsPacK4TE9oPQvT32UBdpou8bwVo6bLprYsIEyrEbcxYXqKDyS54?=
 =?iso-8859-1?Q?EPBbGbrMoCHpYKDAJZ3/sT4XItkxNYa4GqYjfzYiTCxehX7UkfIT17g8Yg?=
 =?iso-8859-1?Q?X0fRDosxFveP4kCbKuv6i8cKJApYrsoG7y1dmTtm/qrdZPnC7KaX1ui+DV?=
 =?iso-8859-1?Q?KPSp/pYw6iKGo3Lngc4BxQ1+IhplLMUVGrzO9IEAvJe0skWQL1aRyAd+x+?=
 =?iso-8859-1?Q?HxkDffwiMotXfl4GF2o0i2K+z+mTQvCrPm3hlCkWfWPDMhsufLM3s3LI+r?=
 =?iso-8859-1?Q?65JS+u2ViRIq/lNroF0qGjF5vZN42I08YLm1v4NaiT4/FIihlKPl5Zuw?=
 =?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: bfa41552-5be5-47f2-128d-08da679e979e
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:43.6311
 (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: l7cRIrMd9qlpUAvS/Gvbi0XJkSCQBg3YYN7Hka2XwJP8IaDe3JQjB4bu93KSOG3k8NcuIIcnJBjMDgZI3IrlvA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB2908
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-17_01,2022-07-15_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 mlxlogscore=842
 suspectscore=0 phishscore=0 adultscore=0 spamscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207170010
X-Proofpoint-ORIG-GUID: LgR1PfQ_qgD0doIsbEUqnYSFvRNO4FyW
X-Proofpoint-GUID: LgR1PfQ_qgD0doIsbEUqnYSFvRNO4FyW
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