From mboxrd@z Thu Jan 1 00:00:00 1970 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 A378AC3ABC9 for ; Thu, 15 May 2025 03:23:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 171726B00C5; Wed, 14 May 2025 23:23:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 121146B0103; Wed, 14 May 2025 23:23:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB3E36B0105; Wed, 14 May 2025 23:23:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id CA7E86B0103 for ; Wed, 14 May 2025 23:23:45 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A8946C12D6 for ; Thu, 15 May 2025 03:23:46 +0000 (UTC) X-FDA: 83443697652.11.7E8B236 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf04.hostedemail.com (Postfix) with ESMTP id F1F2940003 for ; Thu, 15 May 2025 03:23:44 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=J1dSBdvx; spf=pass (imf04.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747279425; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=sLSLCMgmD0JtUoAZB37yCP1nKRRtERZXJ8BQuJogw2w=; b=Cv6YSxuErmGqgydzHxEvNkWMS7JITqmMFyPC1FnJFajPgiS5lxBF1pApYM0yc6ju1tJB3G 1RL1qGWdcKIcYJC5LbEAeE8eWJtknfmSYqdxh6rFLa67b19jsyKtleWo1I4QN+crCCrW/X wA+DSv7KOeNYQ2qOTI2cBUoEjPrq27U= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=J1dSBdvx; spf=pass (imf04.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747279425; a=rsa-sha256; cv=none; b=T5WFXJkuiop/rJfm+6sbN/uImjT8y3AYD9BbcwVx9rQ0p8HCrqNa3mWwMVi4Ara62VhbE1 8cqCgybuZuv/V0z1XwE/2hkH0ZgZBtMZgoyIV8E+mizPhaQEe1hrZk2YlSBObzlSXZfLyS qY3CpMuaO+fryYmpyvCQkZr3j8TY3lg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747279424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sLSLCMgmD0JtUoAZB37yCP1nKRRtERZXJ8BQuJogw2w=; b=J1dSBdvxSkipMdNVL0IyiflkjFwFWiBZmA+OsAp9Q3F8GjsddkCLYhXtZrSvep3Y4n9PKd 5XrTWm9Fl3gvMAIV9CbIC4DFvf2wgCU0zrAAAiMeogJR5eDx5V0hoBtsAZe2fTk0lAHi+v tyOUdi+I+/CCQPJixB+J4f/ewlasIl4= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-623-9Qrn0DppMXCvSdZwux1D2A-1; Wed, 14 May 2025 23:23:40 -0400 X-MC-Unique: 9Qrn0DppMXCvSdZwux1D2A-1 X-Mimecast-MFC-AGG-ID: 9Qrn0DppMXCvSdZwux1D2A_1747279416 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E766A19560AF; Thu, 15 May 2025 03:23:35 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.116]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0293C18008F0; Thu, 15 May 2025 03:23:20 +0000 (UTC) From: Nico Pache To: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: david@redhat.com, ziy@nvidia.com, baolin.wang@linux.alibaba.com, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, ryan.roberts@arm.com, dev.jain@arm.com, corbet@lwn.net, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, akpm@linux-foundation.org, baohua@kernel.org, willy@infradead.org, peterx@redhat.com, wangkefeng.wang@huawei.com, usamaarif642@gmail.com, sunnanyong@huawei.com, vishal.moola@gmail.com, thomas.hellstrom@linux.intel.com, yang@os.amperecomputing.com, kirill.shutemov@linux.intel.com, aarcange@redhat.com, raquini@redhat.com, anshuman.khandual@arm.com, catalin.marinas@arm.com, tiwai@suse.de, will@kernel.org, dave.hansen@linux.intel.com, jack@suse.cz, cl@gentwo.org, jglisse@google.com, surenb@google.com, zokeefe@google.com, hannes@cmpxchg.org, rientjes@google.com, mhocko@suse.com, rdunlap@infradead.org Subject: [PATCH v7 03/12] khugepaged: generalize hugepage_vma_revalidate for mTHP support Date: Wed, 14 May 2025 21:22:17 -0600 Message-ID: <20250515032226.128900-4-npache@redhat.com> In-Reply-To: <20250515032226.128900-1-npache@redhat.com> References: <20250515032226.128900-1-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Stat-Signature: e8ubrr4qng5xk8am3cd4gcib38x4kb9n X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: F1F2940003 X-HE-Tag: 1747279424-680169 X-HE-Meta: U2FsdGVkX18vNxPEWrpC4B1x4PwUUHvu5ymyG3bB83loo4ETysQB7me01WlI95QOrul9VfmUfyW0GX8HXkyKEoVCd4x1p96JlGxEet4aAr/gp15EmfCNsQvV9zw6t0c7SJCIcgwcf9HST6YitQp2RuMT2tBIRj7w6ZgJjuC9csVLDbX2eAY4LhMjThgi5qIChMLN5AzGihWVuppt5oYob15ZcqLJupQXlCVvVswSPBusyQWg6EVBuaPsWOtjcWPETpjhGrpJZtUIqCRHzyLb6mN4WreXtFbjtjeQAkj0n2pBVrzx7t+0OdV0kKMocBlj2OU32XVlgpMzClEr36PKcjZFs7HpRFEiBLVXOA8PY10o9y2fsExJJdNMrGrSRysMiaAvHK9zSSZrB6ipI860o9Hbv9AVaw/6VZSuszaXadzA6SBSi6EQwJZRywIBEP5CTiN8ot3iwkX2iPoSJpa/DH0zmXGIDz0NcdXVIg8jQcMq46ozKftmGSAbxdldfakm6BNVy53obtsvNG9k7JYL9gJr9r6cMhxQZYU2YS5VBNuC6rueJPN29e1S8hzD1ZeaQzjRQnIZQmi8HSiGs2pj2ErtS8iChyaUMq+0zwtxBb37yOjz+Qu/vtFwwoSycSgPM+wXPASftNnlJ1ADRQP6BQAht/g2wF8Xg7HMQ08R2HFNxDYjBisVM+Gr7L00WjgOUE7wLiZiosM9Tg6n8lu+beKxjsCllLAdhv1XW2zYSSwJe4ZfhwtyXvZyA5e/zhdnqGBRZ3JiK7+DOc1UOrIyaV85y2DymP5NZwPMtnSH5b2Mjfo1QkVMSpozGb15SE5Naazvz/7nuKhHHZnHjoKlLj94cMHe+ffrcqqrkWwKALXN8FldFZDrHfIpe7ENAj0FsC3LagAju4pANQxJFzXuwuPOPJb5nQLIQFxwmylG6AuVJNiDterAJy+oopbNRzSNSNWrKx16XTFwC93lIhs GkPd2NWY lCY1kVUZ7f0j6HTVGU0O13Ct41msF6y/B3SA6JEJzAK9ZQe1WgnShPcw6pSK3bYHkDVQaDMXdykbNh1MzddSOPITyXlS7QWFrRo5WzhXKyp/nhqngYHTs1OZFbLnPXXPZWZ+6LnNn9aWklhd4SDFkApfXHmfkykyFIHdYPyuXvwVQSHjHbSAW4ZyLY1EpuM4x9cvK2X3UE3sCkirPH03y/ojsoi3w/WAk5zqHba++b38w7mtMbCTPjTmogr42mjXT4MRrv5Bzu/j3sRjoNl5+Qa2l1+HHo0l15oW7UPLmTVID/1Kk01OEU78dmBQrTads6prpREKT7wYer+j8i0SDrvR+sEg5eL9/T7vEc05WgVABuwSfEEVlI8q0PlDW0/46k8d0kgWAXXVdMADUbEIeX8ffVainkcShrwOhsHpkn/qft2lRZjbN3i18CO78iUVhHZv3wTuCjPMi6OgmT7G5WH/qrZeMucJjRGi6XodSTHnuN57W5Kg1PoO6w3Ugfk3EisIfB4fWV1pNfwQ7kOsN/u2wyQ== 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: List-Subscribe: List-Unsubscribe: For khugepaged to support different mTHP orders, we must generalize this to check if the PMD is not shared by another VMA and the order is enabled. No functional change in this patch. Reviewed-by: Baolin Wang Co-developed-by: Dev Jain Signed-off-by: Dev Jain Signed-off-by: Nico Pache --- mm/khugepaged.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 5457571d505a..0c4d6a02d59c 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -920,7 +920,7 @@ static int khugepaged_find_target_node(struct collapse_control *cc) static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address, bool expect_anon, struct vm_area_struct **vmap, - struct collapse_control *cc) + struct collapse_control *cc, int order) { struct vm_area_struct *vma; unsigned long tva_flags = cc->is_khugepaged ? TVA_ENFORCE_SYSFS : 0; @@ -934,7 +934,7 @@ static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address, if (!thp_vma_suitable_order(vma, address, PMD_ORDER)) return SCAN_ADDRESS_RANGE; - if (!thp_vma_allowable_order(vma, vma->vm_flags, tva_flags, PMD_ORDER)) + if (!thp_vma_allowable_order(vma, vma->vm_flags, tva_flags, order)) return SCAN_VMA_CHECK; /* * Anon VMA expected, the address may be unmapped then @@ -1130,7 +1130,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, goto out_nolock; mmap_read_lock(mm); - result = hugepage_vma_revalidate(mm, address, true, &vma, cc); + result = hugepage_vma_revalidate(mm, address, true, &vma, cc, HPAGE_PMD_ORDER); if (result != SCAN_SUCCEED) { mmap_read_unlock(mm); goto out_nolock; @@ -1164,7 +1164,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, * mmap_lock. */ mmap_write_lock(mm); - result = hugepage_vma_revalidate(mm, address, true, &vma, cc); + result = hugepage_vma_revalidate(mm, address, true, &vma, cc, HPAGE_PMD_ORDER); if (result != SCAN_SUCCEED) goto out_up_write; /* check if the pmd is still valid */ @@ -2782,7 +2782,7 @@ int madvise_collapse(struct vm_area_struct *vma, struct vm_area_struct **prev, mmap_read_lock(mm); mmap_locked = true; result = hugepage_vma_revalidate(mm, addr, false, &vma, - cc); + cc, HPAGE_PMD_ORDER); if (result != SCAN_SUCCEED) { last_fail = result; goto out_nolock; -- 2.49.0