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 3DB40C83F17 for ; Mon, 14 Jul 2025 00:33:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A20546B009A; Sun, 13 Jul 2025 20:33:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9F7FB6B009B; Sun, 13 Jul 2025 20:33:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 90DC76B009C; Sun, 13 Jul 2025 20:33:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 800D16B009A for ; Sun, 13 Jul 2025 20:33:16 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id EFBBF14045B for ; Mon, 14 Jul 2025 00:33:15 +0000 (UTC) X-FDA: 83660995950.20.C222DE2 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf27.hostedemail.com (Postfix) with ESMTP id 3C5784000B for ; Mon, 14 Jul 2025 00:33:14 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YzZt7Zda; spf=pass (imf27.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=1752453194; 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=EEUx7vMzl3XkfLlDz3SXMfiq0BEVHaSfy+TMgLUqN2Q=; b=mj0LS69jwEO69kp1oMZ9ohdj9b1gnZk4/tDNdqszo1ZAdyRm/PFY0T5FT4SfwBT873MuA1 cVzepnfWVvKqqSmGJgiylXfdA1jVVXCL1hOWEMBy0lgEgcJMCBgv+h4nnMaUGetSPWQ3Ni IWYQIfrTPXIjwBriDfBbYkazgPYk6wo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752453194; a=rsa-sha256; cv=none; b=KtZik8ehmkQhod6zhsluTarjRJ0zCT4JwgbzJ8b28hjuAwCET65Ar7Bb6EoSIvnbk5o+2K x+V+TTZpprpP37yDYi6PJd9dOEe8mzgch/dch/VK8R/Z+WlN1savXI8wAHpHnea2ln/kxg S8/CsynvjCOc4bEoCR66Ofewa/pblBA= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YzZt7Zda; spf=pass (imf27.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752453193; 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=EEUx7vMzl3XkfLlDz3SXMfiq0BEVHaSfy+TMgLUqN2Q=; b=YzZt7Zda5DTVxPw5UfZ4J1phJ6X3MfYIBbqRRBv8wym9eRWCVihr9HjhpPRsjeUD+78/JV 13/E24EOT0tvzm4I4EBKuP/iAS5qJPJU7so+rsmDPYC9kTlmmuTGQMjQbsZDfYqHaZgx4r Q0qk02Kfdn2G7k1NoboPUxD6H6Q+VOo= Received: from mx-prod-mc-01.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-486-cN33CzxAMEWzbBBiwv92Kw-1; Sun, 13 Jul 2025 20:33:00 -0400 X-MC-Unique: cN33CzxAMEWzbBBiwv92Kw-1 X-Mimecast-MFC-AGG-ID: cN33CzxAMEWzbBBiwv92Kw_1752453176 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2C988195608B; Mon, 14 Jul 2025 00:32:55 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.64.9]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 91C4E30001BC; Mon, 14 Jul 2025 00:32:40 +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, hughd@google.com Subject: [PATCH v9 01/14] khugepaged: rename hpage_collapse_* to collapse_* Date: Sun, 13 Jul 2025 18:31:54 -0600 Message-ID: <20250714003207.113275-2-npache@redhat.com> In-Reply-To: <20250714003207.113275-1-npache@redhat.com> References: <20250714003207.113275-1-npache@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 3C5784000B X-Stat-Signature: e3xx58nifwtu7p169jgaxjngiodkbmi9 X-Rspam-User: X-HE-Tag: 1752453194-897525 X-HE-Meta: U2FsdGVkX18PQm0T/4q/n1GfbQLcXFnfaH6xyafoqG+EwS5Y68tOMnctDFAhP7opj1LI/eoNlVoSW+Ws/9xj5rqd2834fBux0tcVh52pUu4S5Ri11rPGHty4egagGx8D89ZKhOzj/4vDvMC4wwiOx1hVDasFxhVjzMze3UGkd3ReAqVYlf2yVdsWthM0higJfzo8x6I7p5En1zIaFf1TOFzIhJrkS1UVO6mnAVfG4tiggwnghtR70wyu8DpUf4H7nTcP5zqyGtyNg3NJSHo5ulO6vKBBqZMG+u1EIZ0WE4rX79xaMlrDxtkmAwcCqHIci16iqxrFT5yiaiXlNfJo4tmO7yP/CFGJsEXPVTkTvlt9zZ9oTeCGBcKli8DzkbU7/3saXQzI9npx2odZ0jKMPwqX5XI/GbCLP06znmjUB92aDGioGMvLkFeiyTvryqtIgBVFxGMEwr9Nh/75xtXOk9vNo85QOEN8cQPHJ0uYKeayjCAWPaq+vFOjJgdw2GCkAS82/15VS3lYfoXDkBuWP/F0lyHc2EyoCSPN4OiIvc++yCW0+vf0ztrdDOW8Sfg+1AocgWDNNUZlwfYlQRwooc/Hs6s5tTrKYHh1pmcjvdlihiNaqVPruRseuUQh1ygLlRYPxksSWQ86L8Gvj5GcT7UaD0XXLEzprOhiIK2k3iKH2yRlWgTmQotjar3KOxESw5MHZXCEpEwf7MceWWy7jwT2hfSK+KKHcm4i7POC6AShbs2U18z8VfEmlYsDI9LDPH+nQEEa/JAKxkqOPycaOM6/6eZd7SFBGSzJvoR1hRIG+gFD0RprIMYwZWJuhfKiKFMn6mKqsFqfH7BoOpHxRNikNWWUtJyVOoCbMRN2//ZjwEWmkWDzGAkQpkDYOMSQ4f3kQLmMilNk5QeQVa58ZE1Can5tO7RScIsT+4v9EuP71SgsDKIMpb2UVsbq6+ZlF/D2Oqre9MRCMN6rUY2 HZkLA97+ JNAv8Ff6xdGM+ldiDARSOhoVUsOQNCweaqGZraGblpwHNm7CnerB1QUMclyiD1jw9kuWSTMGW/P2gzwhQqPOfE5VZrj7HeUnnXlYYO2blx3uO5y8k/3ond94qGsDHK/tsR7hhMnOngGiUkTNNA7PB/ZA6+EKMCr1/mRvnWqMFTwk4GAWW6+h3svLBI6r1HSiR7kmq/vxp0NFsCy0JuX1yaRge1ftVcLNbItlQ/c+XLG+c+4BXnaFB4kyWjCKHHKwxZNYrsR0WkWbreIP1jgx36yv8Vn5RBh/NJtt9lwQi9Llk6HP5WOGhxm8kOausBq+z5WTdCuErryX5fnr6O2IaxTT+qzoyk9jwxrAuJClvwqBELxnT9V1yChRQFcnNiX84eW7S1TAZG3GKNcnd19gdscPpA2a8AHqxodoC8KiecS7KkF/OCJf628GzfQr18aeOgihx2EwVWwx9WoxCYoCj5SuIpjdWrelKgdF4hXHzoDLMRde0R/KryDIOTg== 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: The hpage_collapse functions describe functions used by madvise_collapse and khugepaged. remove the unnecessary hpage prefix to shorten the function name. Reviewed-by: Zi Yan Reviewed-by: Baolin Wang Signed-off-by: Nico Pache --- mm/khugepaged.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index a55fb1dcd224..eb0babb51868 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 collapse_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 collapse_test_exit_or_disable(struct mm_struct *mm) { - return hpage_collapse_test_exit(mm) || + return collapse_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(collapse_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 + * collapse_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 collapse_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 collapse_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 collapse_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(collapse_test_exit_or_disable(mm))) return SCAN_ANY_PROCESS; *vmap = vma = find_vma(mm, address); @@ -985,7 +985,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. @@ -1071,7 +1071,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 = collapse_find_target_node(cc); struct folio *folio; folio = __folio_alloc(gfp, HPAGE_PMD_ORDER, node, &cc->alloc_nmask); @@ -1257,7 +1257,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 collapse_scan_pmd(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, bool *mmap_locked, struct collapse_control *cc) @@ -1371,7 +1371,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 (collapse_scan_abort(node, cc)) { result = SCAN_SCAN_ABORT; goto out_unmap; } @@ -1440,7 +1440,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 (collapse_test_exit(mm)) { /* free mm_slot */ hash_del(&slot->hash); list_del(&slot->mm_node); @@ -1733,7 +1733,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 (collapse_test_exit(mm)) continue; /* * When a vma is registered with uffd-wp, we cannot recycle @@ -2255,7 +2255,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 collapse_scan_file(struct mm_struct *mm, unsigned long addr, struct file *file, pgoff_t start, struct collapse_control *cc) { @@ -2312,7 +2312,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 (collapse_scan_abort(node, cc)) { result = SCAN_SCAN_ABORT; folio_put(folio); break; @@ -2362,7 +2362,7 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, return result; } -static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, +static unsigned int collapse_scan_mm_slot(unsigned int pages, int *result, struct collapse_control *cc) __releases(&khugepaged_mm_lock) __acquires(&khugepaged_mm_lock) @@ -2400,7 +2400,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(collapse_test_exit_or_disable(mm))) goto breakouterloop; vma_iter_init(&vmi, mm, khugepaged_scan.address); @@ -2408,7 +2408,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(collapse_test_exit_or_disable(mm))) { progress++; break; } @@ -2430,7 +2430,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(collapse_test_exit_or_disable(mm))) goto breakouterloop; VM_BUG_ON(khugepaged_scan.address < hstart || @@ -2490,7 +2490,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 (collapse_test_exit(mm) || !vma) { /* * Make sure that if mm_users is reaching zero while * khugepaged runs here, khugepaged_exit will find @@ -2544,7 +2544,7 @@ static void khugepaged_do_scan(struct collapse_control *cc) pass_through_head++; if (khugepaged_has_work() && pass_through_head < 2) - progress += khugepaged_scan_mm_slot(pages - progress, + progress += collapse_scan_mm_slot(pages - progress, &result, cc); else progress = pages; -- 2.50.0