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 C33FFC83013 for ; Wed, 2 Jul 2025 05:58:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 51F1A6B0096; Wed, 2 Jul 2025 01:58:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F6896B00B7; Wed, 2 Jul 2025 01:58:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 40C1A6B00B8; Wed, 2 Jul 2025 01:58:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2A8656B00B7 for ; Wed, 2 Jul 2025 01:58:53 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C43E814075B for ; Wed, 2 Jul 2025 05:58:52 +0000 (UTC) X-FDA: 83618270904.23.2FFB65C Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id F3249C0006 for ; Wed, 2 Jul 2025 05:58:50 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Px6CVDxz; spf=pass (imf10.hostedemail.com: domain of npache@redhat.com designates 170.10.133.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=1751435931; 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=GO5DwRuc6cmbE2FDiRpD1Jne2FCr3l2QRxq5I5fGCxI=; b=O+ih7lcwzak4I+ufIMiXoqU2K3Hz1vQmCnrXrLHfemnliIzux+g/ukyn7l8DQ1bXcPewGz 8bP8w4A6RjTINY/mJyu60tG6qH2SJA86qk4fqwsomqFgH/6mNbv8i44jG3mUhPo9EECmWL b3/jgfE/Bbsn3+CviLoAxkW+lavszGM= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Px6CVDxz; spf=pass (imf10.hostedemail.com: domain of npache@redhat.com designates 170.10.133.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=1751435931; a=rsa-sha256; cv=none; b=HrkypuCDsrzTZPb8pUIbcwJtVDJy9KfpRiZbK7q+ULGPiYyJQvlzddcLgl2N36hgVa4W+v nuSZ2/dlkAhvfpTxeVkSypglRCEaLXY4wRl1GXath7GV1TOZdzXD7g/fxoAB6fgJlorCJw IBsZn3rPCAzaYoF5/8J/BiTyPcZvu04= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751435930; 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=GO5DwRuc6cmbE2FDiRpD1Jne2FCr3l2QRxq5I5fGCxI=; b=Px6CVDxz5AuuUN12AJGAcMMO6mlzW5Hsuoeo0VxxoD7zqbjujmRzFm5gnoBmz4YWdZpwFO sE0qm70cyemYLoCxB56QCJpmHk0+EWaMj0mY+kVMtudcrlkAN83ettWmW8+chLMF9ciUsc X0U7clVBO6VqqyGdrnjl5EXbpZh3rCs= Received: from mx-prod-mc-05.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-94-v-99lafQPEC-IWqrYTNa8g-1; Wed, 02 Jul 2025 01:58:44 -0400 X-MC-Unique: v-99lafQPEC-IWqrYTNa8g-1 X-Mimecast-MFC-AGG-ID: v-99lafQPEC-IWqrYTNa8g_1751435920 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2C2BC1944AA9; Wed, 2 Jul 2025 05:58:39 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.88.112]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D420F1800285; Wed, 2 Jul 2025 05:58:21 +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 v8 01/15] khugepaged: rename hpage_collapse_* to khugepaged_* Date: Tue, 1 Jul 2025 23:57:28 -0600 Message-ID: <20250702055742.102808-2-npache@redhat.com> In-Reply-To: <20250702055742.102808-1-npache@redhat.com> References: <20250702055742.102808-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: 8w7r4x6gi6jbp3njgafs6nzk9e1ntj7m X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: F3249C0006 X-Rspam-User: X-HE-Tag: 1751435930-841618 X-HE-Meta: U2FsdGVkX1/itTbcp1qIPBAOlUcPakiy95tvDeDjY6LSBXsIlDVvDJ3gdRZOn0dccfQz0oaWffHEFHQD2iEtxVt7tj5LiIqcHYTxo8LK9H5QiOkrFsdt/LSvPxCb2l3/5X2Elo5qzos7NnPf/Li6NOFsLqI8/v58kMJa7qZ0szEkHPr9/r+ylBnz57oV6nLsTY4eCNpmdMTbqOpWk6IQaytao1IyjMtkRWvAe1uJ5ZwR8iX7NyH7y/zzxq/xCbv/7xovaNbYPSzmrSdiYz7f0fQlzz8MHMAsDpvbeaes9u9W7bwlPWO4oTYc2gypHj3G2YlPvjnPX5zrZOsyZUBcrlh789cSH5IjlMhDptcvQMyl/1pwFududBThwgHoarYJAFlvGZ6NxTVd81RwhmXg++IJHndh5MflUuUZlPxhzhtTTkVx9ntFMpmS20o4GyOkpb1vO2ZziZgkiv1IHoC6JA7Y+wK01yREgdmv7/2LxFkxHeHQx+HnZ9eVvGknV2A7EUX56tabMGx5csCJ9RaB6Qm2AwkK342JNKwayAKp1wqqAsTETEw5c0CvkCTusnMMGmSbCBiVluD94X54p7NNM9TjXnPJsD/1jlCLm32fNm9AB81BZdnPvvp6uuO/AMZW/uGFmhLmeA3z7xRRdt4C4JoVOZ1UIWjbhra+F5x0ywSX4NdtSzI9qTD31iQyFDjLSNjQLA2PehEBoowg+6WOcqzXi1Sq7JVzTfu0iVTl61tEg+ygYERmAxFGnPzmAq392+JI2FlNS71fpAxZbZEy7hnua6hxzCeDHdrm26iKDBwIPDnM60R2GWf0P3oI+r0VdWX8cmmWMCWxqv6S8Lq4aNtK1AHUFpJBKr2qLydI/N+jXjU9yz0+uyBagwY2ofOS7cbKiPyOhAczNCbDMyHedIv9L3mJCDw+BunVD8uRgkAW2gZYTDdUpErVaRXyZY8c7CJ1LA2WtU89FqCAdE+ xDAbQFt9 +8EgtDpBd74oFXDq6gmSdx00p25XNfdPAfFK0UD4C/XGYbrgyyzoMI70zN8KyMCBdwDRJ2zrAi4s4gi6yDAsITis+/VVh50nyKcVMr9RKlr1gxzA2zvFUX+mvPEGlaxD0vjhEpGNlEsjeSnDKNsU6dcGwipR9/vLQYWaBGb4nqC0w8Q5FM7c1jD9QQ5swwIg4YH971T8EF7PXyJddslvOdhxVy2ClzPnGjowzLo/ZMlGd9zhnyhSmb9JXpkJo2+y/sLG0affATF9LvBxXK07leBT3TcArUHtKld9EM3t6Xc7fvj5WLm5x9LI82mq8KeXfoh4hjI8WfI66PN1XQkbzx02ZGBj/HPDobxhp8hXOFifgK//3kTqAQmOEah3hAwYRYSQqfUfZTgZZuvG3QMI9qMfEa7IisNZcMpeaAgiQbklsmb1Ci5LadcxAl/Rd957T/KiwXzHPD0jqE+T56YM0MH+66NqNvA1Q4ghAZjhS5gv+tMtYY+uDcLYKrg== 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: functions in khugepaged.c use a mix of hpage_collapse and khugepaged as the function prefix. rename all of them to khugepaged to keep things consistent and slightly shorten the function names. Reviewed-by: Zi Yan Reviewed-by: Baolin Wang Signed-off-by: Nico Pache --- mm/khugepaged.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 1aa7ca67c756..f27fe7ca9b86 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -402,14 +402,14 @@ void __init khugepaged_destroy(void) kmem_cache_destroy(mm_slot_cache); } -static inline int hpage_collapse_test_exit(struct mm_struct *mm) +static inline int khugepaged_test_exit(struct mm_struct *mm) { return atomic_read(&mm->mm_users) == 0; } -static inline int hpage_collapse_test_exit_or_disable(struct mm_struct *mm) +static inline int khugepaged_test_exit_or_disable(struct mm_struct *mm) { - return hpage_collapse_test_exit(mm) || + return khugepaged_test_exit(mm) || test_bit(MMF_DISABLE_THP, &mm->flags); } @@ -444,7 +444,7 @@ void __khugepaged_enter(struct mm_struct *mm) int wakeup; /* __khugepaged_exit() must not run from under us */ - VM_BUG_ON_MM(hpage_collapse_test_exit(mm), mm); + VM_BUG_ON_MM(khugepaged_test_exit(mm), mm); if (unlikely(test_and_set_bit(MMF_VM_HUGEPAGE, &mm->flags))) return; @@ -503,7 +503,7 @@ void __khugepaged_exit(struct mm_struct *mm) } else if (mm_slot) { /* * This is required to serialize against - * hpage_collapse_test_exit() (which is guaranteed to run + * khugepaged_test_exit() (which is guaranteed to run * under mmap sem read mode). Stop here (after we return all * pagetables will be destroyed) until khugepaged has finished * working on the pagetables under the mmap_lock. @@ -838,7 +838,7 @@ struct collapse_control khugepaged_collapse_control = { .is_khugepaged = true, }; -static bool hpage_collapse_scan_abort(int nid, struct collapse_control *cc) +static bool khugepaged_scan_abort(int nid, struct collapse_control *cc) { int i; @@ -873,7 +873,7 @@ static inline gfp_t alloc_hugepage_khugepaged_gfpmask(void) } #ifdef CONFIG_NUMA -static int hpage_collapse_find_target_node(struct collapse_control *cc) +static int khugepaged_find_target_node(struct collapse_control *cc) { int nid, target_node = 0, max_value = 0; @@ -892,7 +892,7 @@ static int hpage_collapse_find_target_node(struct collapse_control *cc) return target_node; } #else -static int hpage_collapse_find_target_node(struct collapse_control *cc) +static int khugepaged_find_target_node(struct collapse_control *cc) { return 0; } @@ -912,7 +912,7 @@ static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address, struct vm_area_struct *vma; unsigned long tva_flags = cc->is_khugepaged ? TVA_ENFORCE_SYSFS : 0; - if (unlikely(hpage_collapse_test_exit_or_disable(mm))) + if (unlikely(khugepaged_test_exit_or_disable(mm))) return SCAN_ANY_PROCESS; *vmap = vma = find_vma(mm, address); @@ -977,7 +977,7 @@ static int check_pmd_still_valid(struct mm_struct *mm, /* * Bring missing pages in from swap, to complete THP collapse. - * Only done if hpage_collapse_scan_pmd believes it is worthwhile. + * Only done if khugepaged_scan_pmd believes it is worthwhile. * * Called and returns without pte mapped or spinlocks held. * Returns result: if not SCAN_SUCCEED, mmap_lock has been released. @@ -1063,7 +1063,7 @@ static int alloc_charge_folio(struct folio **foliop, struct mm_struct *mm, { gfp_t gfp = (cc->is_khugepaged ? alloc_hugepage_khugepaged_gfpmask() : GFP_TRANSHUGE); - int node = hpage_collapse_find_target_node(cc); + int node = khugepaged_find_target_node(cc); struct folio *folio; folio = __folio_alloc(gfp, HPAGE_PMD_ORDER, node, &cc->alloc_nmask); @@ -1249,7 +1249,7 @@ static int collapse_huge_page(struct mm_struct *mm, unsigned long address, return result; } -static int hpage_collapse_scan_pmd(struct mm_struct *mm, +static int khugepaged_scan_pmd(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, bool *mmap_locked, struct collapse_control *cc) @@ -1363,7 +1363,7 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm, * hit record. */ node = folio_nid(folio); - if (hpage_collapse_scan_abort(node, cc)) { + if (khugepaged_scan_abort(node, cc)) { result = SCAN_SCAN_ABORT; goto out_unmap; } @@ -1432,7 +1432,7 @@ static void collect_mm_slot(struct khugepaged_mm_slot *mm_slot) lockdep_assert_held(&khugepaged_mm_lock); - if (hpage_collapse_test_exit(mm)) { + if (khugepaged_test_exit(mm)) { /* free mm_slot */ hash_del(&slot->hash); list_del(&slot->mm_node); @@ -1725,7 +1725,7 @@ static void retract_page_tables(struct address_space *mapping, pgoff_t pgoff) if (find_pmd_or_thp_or_none(mm, addr, &pmd) != SCAN_SUCCEED) continue; - if (hpage_collapse_test_exit(mm)) + if (khugepaged_test_exit(mm)) continue; /* * When a vma is registered with uffd-wp, we cannot recycle @@ -2247,7 +2247,7 @@ static int collapse_file(struct mm_struct *mm, unsigned long addr, return result; } -static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, +static int khugepaged_scan_file(struct mm_struct *mm, unsigned long addr, struct file *file, pgoff_t start, struct collapse_control *cc) { @@ -2304,7 +2304,7 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, } node = folio_nid(folio); - if (hpage_collapse_scan_abort(node, cc)) { + if (khugepaged_scan_abort(node, cc)) { result = SCAN_SCAN_ABORT; folio_put(folio); break; @@ -2392,7 +2392,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, goto breakouterloop_mmap_lock; progress++; - if (unlikely(hpage_collapse_test_exit_or_disable(mm))) + if (unlikely(khugepaged_test_exit_or_disable(mm))) goto breakouterloop; vma_iter_init(&vmi, mm, khugepaged_scan.address); @@ -2400,7 +2400,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, unsigned long hstart, hend; cond_resched(); - if (unlikely(hpage_collapse_test_exit_or_disable(mm))) { + if (unlikely(khugepaged_test_exit_or_disable(mm))) { progress++; break; } @@ -2422,7 +2422,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, bool mmap_locked = true; cond_resched(); - if (unlikely(hpage_collapse_test_exit_or_disable(mm))) + if (unlikely(khugepaged_test_exit_or_disable(mm))) goto breakouterloop; VM_BUG_ON(khugepaged_scan.address < hstart || @@ -2482,7 +2482,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, * Release the current mm_slot if this mm is about to die, or * if we scanned all vmas of this mm. */ - if (hpage_collapse_test_exit(mm) || !vma) { + if (khugepaged_test_exit(mm) || !vma) { /* * Make sure that if mm_users is reaching zero while * khugepaged runs here, khugepaged_exit will find -- 2.49.0