From patchwork Mon Dec 11 15:56:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13487435 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 89CC3C10F05 for ; Mon, 11 Dec 2023 15:57:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DF3A16B00FA; Mon, 11 Dec 2023 10:57:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DA5FD6B00FC; Mon, 11 Dec 2023 10:57:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B0C146B00FD; Mon, 11 Dec 2023 10:57:04 -0500 (EST) 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 A004C6B00FA for ; Mon, 11 Dec 2023 10:57:04 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 77F241C1009 for ; Mon, 11 Dec 2023 15:57:04 +0000 (UTC) X-FDA: 81554991168.05.0CF5F45 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf24.hostedemail.com (Postfix) with ESMTP id A303118001F for ; Mon, 11 Dec 2023 15:57:02 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=byyfSTke; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702310222; 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=W84BJOqs6odi3w10Q8+aDyiUulYqaQMW45jL1XIh9aE=; b=ADuqVOtLLejtmT1t/BMOFJaYCg8w/nCfcM2Y2Kya6Nz/8k3PAN7xTgWud1fcYnsd2ugFza /NS84iASP9JGcNVA9IrEwtmZgjc6pXLioQU6wODG2GrEP+WpaFUkwkJ2bmI+xLLvcyd9JO 0cxyiQGV/Boz+Hv5u0la9oHOUneU3wg= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=byyfSTke; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702310222; a=rsa-sha256; cv=none; b=DvTBnjbfjmkwTQD84Fu3hPdtY2rg3Y+cxdGywNtztSDxeYE8Kfnk5YSd//pLTblswB52z8 VPz79P4dLEV+iiMj/Yx+HlSmFg/7aDWKO13I5zbt8UqohcTS8m7xoYAvQMPbq5RkdJevTU /pgRJtREEE9xyUOIHYAk1aBah/47iG4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702310221; 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=W84BJOqs6odi3w10Q8+aDyiUulYqaQMW45jL1XIh9aE=; b=byyfSTkeoxVdqg+p1M4txTYuTU8w5mr21cUHYleyAdtdG51EdoyV65gPZQcbvSra1DXICy KMlDYFYZR0E+L/KcXIAIFm091fnfpFf1RjiTfIT/2p14FSY3qODlZczSnoGr1i8Pg/nhwf xEnhKMxjjc3YkmgeFkbsgiXqBUPV0Ck= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-518-De3rUVWSN9y0uphkMhN_QQ-1; Mon, 11 Dec 2023 10:56:59 -0500 X-MC-Unique: De3rUVWSN9y0uphkMhN_QQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9BC94870829; Mon, 11 Dec 2023 15:56:58 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 457E61121306; Mon, 11 Dec 2023 15:56:56 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , "Matthew Wilcox (Oracle)" , Hugh Dickins , Ryan Roberts , Yin Fengwei , Mike Kravetz , Muchun Song , Peter Xu , Muchun Song Subject: [PATCH v1 01/39] mm/rmap: rename hugepage_add* to hugetlb_add* Date: Mon, 11 Dec 2023 16:56:14 +0100 Message-ID: <20231211155652.131054-2-david@redhat.com> In-Reply-To: <20231211155652.131054-1-david@redhat.com> References: <20231211155652.131054-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Rspamd-Queue-Id: A303118001F X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: yokycz5mhxfefpmq1jpxudw6rhseb9mg X-HE-Tag: 1702310222-502271 X-HE-Meta: U2FsdGVkX1/xTLWLhUjD0DlCS4QfUhK8rYpEL9BmjN3OTGzeGlAOiLlQmrMGqsntQpWY2RxtjqGOKPoOUSwO06Vqebk2R9hMIlH7N0/yDkq6CuVbZNE2BDHmKnxIH4Z6yZJkx7H6Hm3zcE5n1IZQv92L2f+7rVkiiPwBzXsoye5ZztJXwvZqCpi/VAlY5+zJ1wyZzDEoZRiMCTXZ3UIO2VyA5kUPX3Ip8Q88QlxfIjucAx8U+WI1NudUz1c9Y0dDtPYJnIRLBAGgKwf/XzN+xp4fBdnpjkPiWX61xllHedPhnLJvLasHPM3eDZ6Smv9hexIq4K6C15MIl23QgP2JkePQTPC68BdESqQ8LlS51xNH7CbWkVM5dR3M5Uq/EjSODGZznWJuDFOBrCaBZi1N7757tlRfLxRznKd0gjx/vDuF2l7HH/DUAbceqg94fRVHWVdfvfkbXQVF59vVezKZFAwoPD9ZWLcVhWb9RDAkgye8ljEIPZnnCXWnfdFooOpvqbnFfF6L5MUe5alnYLEwfK1Y36qt0QIbyft+fOzADtgstKa6acJZ0/Z3BEds8JbhY2l47ouSx00ihquyvCSI+TU/L0SAL3votk21KhXEB5EDMq3wakUv1CsHUNopoMqkUt6bD55w0VJJ6aY7GD1l+5Z+aW28I012TjO2l+FUMFkOfpNjixFEgNTj1DXG2OfWO5Px3c3PpxKfpaelconeHtS9vjd+QTED7QAf2kz+ZUfC58/NT26xidxx9c/vI8eY2/f0ISezp+5/aCf7gs+MHkukKAP68rc36BkZqr6TbuzCfNy21M6izjsXl0gbqSntY59tuTVeW3/GW5sQUeudxq6/5gVGE7jWNqLgNN2YzO6pUbxvC5J8xBfw34ItIdjBcZW2g7I1yWrBbFmxn0+wLVDjrDQ5jZPmeXzWBo3r6g1dnRsv6uf5mI4xqO7/uwkSis8UG9fBGGYEqidbwsf Q8Dfq45j OUZIwLi+FhGeR3/0vnr6Dtf5cGccjCmIJyPgFN4v+68aPMJfy3s0GkH7uT3koq7vuhcslhuWjFxJzo+3g8WjkXShpZkjVr4i2chAfL0CypLzJM/NHJuIKNowd8SXC7OImA3zizFpyxyFTSLqnn7AhqxhYyZ7AbRnQj1OTKC/C1ZRr6JY38nZyDCEcBzTkrTNp5kddYvJLQcuyZHdSZB1lp+JQbhpDIJLTCfpDJjvrCkIl6OBwUN+09uh+WmKdqgszWxXnZTDz9ACa631ap3OO2j5qLw== 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: Let's just call it "hugetlb_". Yes, it's all already inconsistent and confusing because we have a lot of "hugepage_" functions for legacy reasons. But "hugetlb" cannot possibly be confused with transparent huge pages, and it matches "hugetlb.c" and "folio_test_hugetlb()". So let's minimize confusion in rmap code. Reviewed-by: Muchun Song Signed-off-by: David Hildenbrand Reviewed-by: Ryan Roberts Reviewed-by: Matthew Wilcox (Oracle) --- include/linux/rmap.h | 4 ++-- mm/hugetlb.c | 8 ++++---- mm/migrate.c | 4 ++-- mm/rmap.c | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index af6a32b6f3e7..0bfea866f39b 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -208,9 +208,9 @@ void folio_add_file_rmap_range(struct folio *, struct page *, unsigned int nr, void page_remove_rmap(struct page *, struct vm_area_struct *, bool compound); -void hugepage_add_anon_rmap(struct folio *, struct vm_area_struct *, +void hugetlb_add_anon_rmap(struct folio *, struct vm_area_struct *, unsigned long address, rmap_t flags); -void hugepage_add_new_anon_rmap(struct folio *, struct vm_area_struct *, +void hugetlb_add_new_anon_rmap(struct folio *, struct vm_area_struct *, unsigned long address); static inline void __page_dup_rmap(struct page *page, bool compound) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 6feb3e0630d1..305f3ca1dee6 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5285,7 +5285,7 @@ hugetlb_install_folio(struct vm_area_struct *vma, pte_t *ptep, unsigned long add pte_t newpte = make_huge_pte(vma, &new_folio->page, 1); __folio_mark_uptodate(new_folio); - hugepage_add_new_anon_rmap(new_folio, vma, addr); + hugetlb_add_new_anon_rmap(new_folio, vma, addr); if (userfaultfd_wp(vma) && huge_pte_uffd_wp(old)) newpte = huge_pte_mkuffd_wp(newpte); set_huge_pte_at(vma->vm_mm, addr, ptep, newpte, sz); @@ -5988,7 +5988,7 @@ static vm_fault_t hugetlb_wp(struct mm_struct *mm, struct vm_area_struct *vma, /* Break COW or unshare */ huge_ptep_clear_flush(vma, haddr, ptep); page_remove_rmap(&old_folio->page, vma, true); - hugepage_add_new_anon_rmap(new_folio, vma, haddr); + hugetlb_add_new_anon_rmap(new_folio, vma, haddr); if (huge_pte_uffd_wp(pte)) newpte = huge_pte_mkuffd_wp(newpte); set_huge_pte_at(mm, haddr, ptep, newpte, huge_page_size(h)); @@ -6277,7 +6277,7 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm, goto backout; if (anon_rmap) - hugepage_add_new_anon_rmap(folio, vma, haddr); + hugetlb_add_new_anon_rmap(folio, vma, haddr); else page_dup_file_rmap(&folio->page, true); new_pte = make_huge_pte(vma, &folio->page, ((vma->vm_flags & VM_WRITE) @@ -6732,7 +6732,7 @@ int hugetlb_mfill_atomic_pte(pte_t *dst_pte, if (folio_in_pagecache) page_dup_file_rmap(&folio->page, true); else - hugepage_add_new_anon_rmap(folio, dst_vma, dst_addr); + hugetlb_add_new_anon_rmap(folio, dst_vma, dst_addr); /* * For either: (1) CONTINUE on a non-shared VMA, or (2) UFFDIO_COPY diff --git a/mm/migrate.c b/mm/migrate.c index 35a88334bb3c..4cb849fa0dd2 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -249,8 +249,8 @@ static bool remove_migration_pte(struct folio *folio, pte = arch_make_huge_pte(pte, shift, vma->vm_flags); if (folio_test_anon(folio)) - hugepage_add_anon_rmap(folio, vma, pvmw.address, - rmap_flags); + hugetlb_add_anon_rmap(folio, vma, pvmw.address, + rmap_flags); else page_dup_file_rmap(new, true); set_huge_pte_at(vma->vm_mm, pvmw.address, pvmw.pte, pte, diff --git a/mm/rmap.c b/mm/rmap.c index 846fc79f3ca9..80d42c31281a 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -2625,8 +2625,8 @@ void rmap_walk_locked(struct folio *folio, struct rmap_walk_control *rwc) * * RMAP_COMPOUND is ignored. */ -void hugepage_add_anon_rmap(struct folio *folio, struct vm_area_struct *vma, - unsigned long address, rmap_t flags) +void hugetlb_add_anon_rmap(struct folio *folio, struct vm_area_struct *vma, + unsigned long address, rmap_t flags) { VM_WARN_ON_FOLIO(!folio_test_anon(folio), folio); @@ -2637,8 +2637,8 @@ void hugepage_add_anon_rmap(struct folio *folio, struct vm_area_struct *vma, PageAnonExclusive(&folio->page), folio); } -void hugepage_add_new_anon_rmap(struct folio *folio, - struct vm_area_struct *vma, unsigned long address) +void hugetlb_add_new_anon_rmap(struct folio *folio, + struct vm_area_struct *vma, unsigned long address) { BUG_ON(address < vma->vm_start || address >= vma->vm_end); /* increment count (starts at -1) */