From patchwork Mon Apr 14 22:05:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nico Pache X-Patchwork-Id: 14051079 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 0788FC369B5 for ; Mon, 14 Apr 2025 22:07:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 882AF280097; Mon, 14 Apr 2025 18:07:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 82E35280080; Mon, 14 Apr 2025 18:07:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A946280097; Mon, 14 Apr 2025 18:07:00 -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 4D062280080 for ; Mon, 14 Apr 2025 18:07:00 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id AD5A080781 for ; Mon, 14 Apr 2025 22:07:00 +0000 (UTC) X-FDA: 83334035400.24.4762E1B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf13.hostedemail.com (Postfix) with ESMTP id E993A2000D for ; Mon, 14 Apr 2025 22:06:58 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=iCgBBzW6; spf=pass (imf13.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=1744668419; 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=GAVT6j5hAGYn/X341c6yb/hpheunO9BHiADgExQjXpc=; b=5ODLI2rNTs0dt8J+b7dzpn4DJSduNm4UxbA9SAi91Lx4bZ+PqRMBrORGSsPZ+rrr8hf8jE NbyuF6dkHAgE6GyfsyQUeciIToQcsNoRGQ5rZFR/LWJjTcOZ7MFrF4tBZC5vYVsNLmJolM T86/eeOj3iCzB/nDL08ysaont4ELctE= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=iCgBBzW6; spf=pass (imf13.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=1744668419; a=rsa-sha256; cv=none; b=8Blg9MmUNkXaQrUN77kOL1TPWftMHGgOsrHjnVbReebbhtWCgT3r9WF1ubH+NVgJiGGr7i w1CA5OBeNDKaD03Tnj3H5/+KRR5taOjjcNZ/LDYP2o8KvqKPI98kUJ0B2cxTbHZ9RGjKBX nVJiwDo0aVhlphmPaKEvR/Jm2G2zTM8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744668418; 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=GAVT6j5hAGYn/X341c6yb/hpheunO9BHiADgExQjXpc=; b=iCgBBzW6xSLlQ30P8Tb8HU/qeJHMbjpWnFnyYf4Q9V20bGqd7mLbvBpgZfa1Cr/fOn7WFh 2Tqy+dqEXSYhjqi7CKItxrzBPWM8Sd53Inpv+yPxrjf2K1Rr7cyp/Bg18GGQhAsR3zc7l5 A74GyNzwkqEVeI3FRh4ydWZeATO/fgA= Received: from mx-prod-mc-04.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-326-i6C8UoaiNj-XKLZahtrhuQ-1; Mon, 14 Apr 2025 18:06:56 -0400 X-MC-Unique: i6C8UoaiNj-XKLZahtrhuQ-1 X-Mimecast-MFC-AGG-ID: i6C8UoaiNj-XKLZahtrhuQ_1744668412 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B64351955DC6; Mon, 14 Apr 2025 22:06:50 +0000 (UTC) Received: from h1.redhat.com (unknown [10.22.64.91]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7973A1956094; Mon, 14 Apr 2025 22:06:42 +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: akpm@linux-foundation.org, corbet@lwn.net, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, david@redhat.com, baohua@kernel.org, baolin.wang@linux.alibaba.com, ryan.roberts@arm.com, willy@infradead.org, peterx@redhat.com, ziy@nvidia.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, dev.jain@arm.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 Subject: [PATCH v3 02/12] khugepaged: rename hpage_collapse_* to khugepaged_* Date: Mon, 14 Apr 2025 16:05:47 -0600 Message-ID: <20250414220557.35388-3-npache@redhat.com> In-Reply-To: <20250414220557.35388-1-npache@redhat.com> References: <20250414220557.35388-1-npache@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Rspamd-Queue-Id: E993A2000D X-Stat-Signature: 7zadbw4h7rqaohf4kyxs5xn1d79jjoza X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1744668418-384179 X-HE-Meta: U2FsdGVkX1/0jfTK6QKLRd05vG/5ozXLSnbbRhpflnq6YH1LwLQa7Q0HE/T1rHv4Q98uZrpQxninoSTbH1d88NNUR8KdAFNhTvKaR+3/kQ11y/RvTY7nH+wD8YfErDqBphUCSec1giDn/G0IqF4ERoxeLUA3VsvthaIr1wCSKV0bEBbW9/pIMOMbQazO2/I9KnQ64C1+vC0yUyGGLqMhNAj3z0WJk/VC6khgzMeZRJ0a/FrHPlGfq2nbsX3xMWwxKUeaGZnknv+GBSgKjC4XNeif4JA4glcI4PRbKbfDxXj0O+GV90oyGOmZi5BXr9X/nlUNgkHJS2M1R0oUUJCl7ROB4i9VluX8Hhn0eCClbRGzkpDmGdk8vFTMl+Z0LlracqKn+KBUI6HhBtDTBBQs9p4PvseR1BvJWNgw2E9pXHmMrqYKbK0/hK8HIVFCOB8fbSO+WHS2Ba6i/x2XwN5MG90vEBCo8aV2DgHUeD9RCiqdqk+AXxOQR0HaFdpcZQqiVujlLJiVX/E4dpPWU71GOWJLadi4qg1Q/QzNCClKLREhJ5tJh1SKF2VGwgiiro6i5oymxZn/lo8b56KDX7gwtbAk0dmzIQ1olB0HZRnc/CFcCY5siIRYdNG2Qv+fpHctiwnfFEXam4/BXAh6zmJ1IO7LptG5ZjwPGkYkkj/R50vKGO0mLFA6j9t6MbS7tpL3NUEbQDMZY+CVbeMuiMohrFmmLWeh8UJaYUhh8jtx3cbq5SgP1Fa6pskLqzBbwFuIgmmJ/drjzLXhP3VfG9EndBvpx/fEarcevB7/+UWkhFHFXAJ7/LV1fBkYeGeA1XMkDEavDvtp4k6Gg120vQfUaO4a+vE38dfbulasJKpaqycpg8ou1mDS4cWh+PB+7CXbJYC03+ntgfj4HZgv8uzEw3hiZUVY1RN/EeoYOQoNjcFCG7BHCAvpNcDjageQXdaR8XWnOSLwXXuClrOfbWF wLgz2lph ci9/b9ZOeXRB6seaRKouVd6XT3Lv/9/b2GHGTdk68bvkagtD6q69Dps41mxZDpTqoFGPfBWwgJ3WOILQwZwuT0by5RjJbgh+ZOfgC7B4G8NJAA20aOB6yaLr/gSovrbc79SJTjIv4CCcRtn+HFMBjS7mXfHrnbMzi8EKfcpo/sXeukMQsuhBZP8/nZhSBV3t4afK7UUkksLj/n9Jye1WSuMBPKDtryZAJkYxLmFWL7KfMvWuu25H2/rqconnBcArPdehQDScjKlFHJ233TcECStMvrYPue+FOFi9ZMhSFfRdXIX/IdcspEy4LAn2xvoGRpbRKVlt9TcpjnnKQQcTlhjxRdKbCku7EbskQsORX6VUZBau4c3vMQ7lN/CMGSFV//FBSaR2qrfVfN9EGGG+9mwCg3c5FUwTVB2Lt3vSyZhrxzM1aepC4qAl3IH58s/IqVMLXc9klc/tkR/c= 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. Signed-off-by: Nico Pache --- mm/khugepaged.c | 50 ++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index c23d80ed9c9c..9a1242368cba 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. @@ -851,7 +851,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; @@ -886,7 +886,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; @@ -905,7 +905,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; } @@ -925,7 +925,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); @@ -992,7 +992,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. @@ -1078,7 +1078,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); @@ -1264,7 +1264,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) @@ -1378,7 +1378,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; } @@ -1447,7 +1447,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); @@ -1742,7 +1742,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 @@ -2264,7 +2264,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) { @@ -2309,7 +2309,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; break; } @@ -2355,7 +2355,7 @@ static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, return result; } #else -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) { @@ -2383,19 +2383,19 @@ static int khugepaged_collapse_single_pmd(unsigned long addr, mmap_read_unlock(mm); *mmap_locked = false; - result = hpage_collapse_scan_file(mm, addr, file, pgoff, + result = khugepaged_scan_file(mm, addr, file, pgoff, cc); fput(file); if (result == SCAN_PTE_MAPPED_HUGEPAGE) { mmap_read_lock(mm); - if (hpage_collapse_test_exit_or_disable(mm)) + if (khugepaged_test_exit_or_disable(mm)) goto end; result = collapse_pte_mapped_thp(mm, addr, !cc->is_khugepaged); mmap_read_unlock(mm); } } else { - result = hpage_collapse_scan_pmd(mm, vma, addr, + result = khugepaged_scan_pmd(mm, vma, addr, mmap_locked, cc); } if (cc->is_khugepaged && result == SCAN_SUCCEED) @@ -2443,7 +2443,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); @@ -2451,7 +2451,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; } @@ -2473,7 +2473,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 || @@ -2509,7 +2509,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