From patchwork Wed Apr 9 00:49:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fan Ni X-Patchwork-Id: 14043905 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 041A6C369A4 for ; Wed, 9 Apr 2025 00:49:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 62816280038; Tue, 8 Apr 2025 20:49:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5FF7E280037; Tue, 8 Apr 2025 20:49:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4C514280038; Tue, 8 Apr 2025 20:49:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 2D365280037 for ; Tue, 8 Apr 2025 20:49:57 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B1E71B760A for ; Wed, 9 Apr 2025 00:49:57 +0000 (UTC) X-FDA: 83312673234.30.73EFB20 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by imf12.hostedemail.com (Postfix) with ESMTP id E91314000A for ; Wed, 9 Apr 2025 00:49:55 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=RrnGXNAu; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf12.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744159796; 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:references:dkim-signature; bh=7G/nL+E0ra61lI3tdF3zYfv1YB2yV4HL4zwUyVPiH7k=; b=txhrHMhW8OzjBP1snfk5muCkZi3WNS/kI8L6g1QnmemynPAEQmYElP3p09b3M5yRG16VVB dp+YcFdl4R7sLy61CqFjpbkwEyEtXEOBzMNRtuLMFI2dv2vursZVlzzgYTGFv8CpJ0sSSp c6UL7b+BXwe49IHcmRp+KFu8+cGmFFA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744159796; a=rsa-sha256; cv=none; b=S606XVFGDQsr2tgGZD5ULxV2OpzFFLPVF+qqrFK3lDXOH6Cjbf3w5yvhhoion0lrzZGNM7 +KYrMje2Q1QlDNUO49zPRJKlSnQjddwv27GAB9vnZVmS42TQpOzllnZR45VB7PFZ9Js3mK 2IkyVWBf5/QN7BDZ1thxnGzKa2wzU1A= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=RrnGXNAu; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf12.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.210.172 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-736ab1c43c4so6025332b3a.1 for ; Tue, 08 Apr 2025 17:49:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744159795; x=1744764595; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7G/nL+E0ra61lI3tdF3zYfv1YB2yV4HL4zwUyVPiH7k=; b=RrnGXNAu3eoZ6xb47WWAgrsLLuQ9OmIBkwCF1DFqyT+jVEA5chXQTgFfat9immVXpf QIjaTP+kLNaX3eP1TLWfs+tVgSCVttBgLbLci17ZRpytjdIFELHU3jYdhaybeEFPbFjw NMIlApWiMPSQl3109tLj8xAbkLRwUkUbYR2Fnj3YSSsraOI+hbYg4HLThVB5vZs/CWXE 9ZqXSQx0E0RT8+VoEH0c23Codo+aCFuTM9z+ytbAFJGl+XQoVlyPb31PHrzh24ANm77Q c1h8g4gyFKR/JWaw/aBvR68YJozgTRaojtsDaAg6xr3jlGiQ5+ceEAfRakqgrmF/KcB9 HSTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744159795; x=1744764595; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7G/nL+E0ra61lI3tdF3zYfv1YB2yV4HL4zwUyVPiH7k=; b=Jpyrfum5gm1mQ6TZkR2kpcQ3PShAj5wQSgB41yk7bThqb0axdNQssfdk/2+RwY7LeV eozGwPUXXPAvFJS5E0ToVfSRT/96SEggpY8jWucZwXFWFh06W8qxlotCdgS5xU0U40l4 UUV8wQDIa28MTsEIVHYHILDsizSYES9eq9awo5KoytRl3YGc4QoJy8cxL/rE+Oc6Lnxm BGJ7WlTigYXxGnCkmubM9VU37IBKuPEXk/vNTD1WDsVWByOuZf8o0hi6E8jhsdFJNAFs BOtszUZ7aypKhO4cJywkMLTRTVXw340/3EST9D0vJMykp0UZUKjjpJHkfyO2/NvAhuzt vJ3Q== X-Forwarded-Encrypted: i=1; AJvYcCVVjgV1OgH7vDiA03Y4bT5zU59qWyk3XS6kXikpHufvPKwmHRDOmpLxKQOjPoP8ZWI1AVrbXC6qDg==@kvack.org X-Gm-Message-State: AOJu0YznCBKERo5lqiaiDw5ejUQq+fKxNIVwdf/Oc/9yVl7v0EzTjp4k wUaH81tt6fxasoJlT/p4eX//hlZqUAbtqh/49n2Xy9XD48exUIZt X-Gm-Gg: ASbGncvZpix2l3ru9FB956COLd508SLPAnLgEBaHPnedHw5JHrypV1Vmx94rOqNwF96 3xXLhQ0iPkNFvbTd0uliIGg0XmJp1VC+fuBl1e7U/AgUAYEBpPWd5ijDCZKz8+bUVeFNAQTgUl5 p66SbGIKUSPtV+jOmrt2sfcTSiQMjv5YN5iroHgkvtXsMYmoARSusm3meYlhbmfZ3KjksmKA/qF 3PLWMkYCxnPeWxbOPFtKzyPUs9M9n7AKr623yJwMhpzQqNTpu7u2VaBMucET90NwFOVm4lX2eBB RqA+XNX5FuCk/DAQ6Ymotiy92nDtgDFNDBHVXBsko2/p6M/AdQP8gBVbd05Bu2MOUyLAdES7 X-Google-Smtp-Source: AGHT+IGEdIyateeJKK+cEnxnAwcvYJz3jJvpDqxNVsJ+6JMRmcHpvaE/vSgiRnahObph/rC+eZugLQ== X-Received: by 2002:a05:6a00:80d:b0:736:ab1d:7ed5 with SMTP id d2e1a72fcca58-73bafa2fdaamr566858b3a.0.1744159794573; Tue, 08 Apr 2025 17:49:54 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8f03:9fee:5e33:e006:dcd5:852d]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73bb1d2ae5fsm9565b3a.20.2025.04.08.17.49.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 17:49:54 -0700 (PDT) From: nifan.cxl@gmail.com To: muchun.song@linux.dev, willy@infradead.org Cc: mcgrof@kernel.org, a.manzanares@samsung.com, dave@stgolabs.net, akpm@linux-foundation.org, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Fan Ni Subject: [PATCH] mm/hugetlb: Convert &folio->page to folio_page(folio, 0) Date: Tue, 8 Apr 2025 17:49:10 -0700 Message-ID: <20250409004937.634713-1-nifan.cxl@gmail.com> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E91314000A X-Stat-Signature: 875w53axx9tgojj79d88ujphm7h7if1m X-Rspam-User: X-HE-Tag: 1744159795-437174 X-HE-Meta: U2FsdGVkX19tOM1BlezH6OHmGFHVLF+T5R8oMR4Ii90YSgHu7ZX8JvGuNuBNZopiYhrjmASqpT1Xwjo5GTIBdHXFharCwHP2c4mAKgDv2/OzKsjgPTIt4Y0+so1YlRfpJsXnsrk31/1Km2WnIICueJ8Xg8wiyA+Alf3rqjxWj5Cb0xAkdUrQtZP2714osKVE1DB9a1RXOD2TxRr24d0HwfLtR6yI1Xwpsx680XD4veFJYVS3nlkuBAxOYNzUAuMTG4uYAgm/4s7vtZOsidUPGBLVRP0Az5TBsR2wpJaliu0zC3YydbWf2eNBj+WXzm1RfdJ48R2P59ogB23EXcd4pajYVclEiWJoBwqJHphq73Ye0IykF2qKAl/FhwqGa0oXbq5AKdy7ApPPpJgyBKf1KZtQEF0sP2eYlNuZbcjgU4UylhP+mnk8Z8x4aBXCJ10L6Y+8Cj3wyrjUZ5mlF8L0NQ2IUxRSivW1IXHgcLu7EnPisOF88w+9ZimyQLOXpI5YGSoAdlG9VKm0WaeUauEPxqBINy/2DW+5k8si2IAPL07DiQgZWKfZ9D4oAnRubT5cF+9UM5+KoEzFoJ4WaQZMZefHXDVGollWBX6bhdOxBC4V4mBly646FauHmNBvj9rnPa11TJhavThvBAdTBxIuCK6MUr8K8YS2PifIj8Dn2kzzGOOL9/sXTe3wrsjKkzAAcdrdhbydnB7QswHKAuquoz6BhOmsqZrCXvCuHC0raL8ItzfHnjnX38QmOKwkdc2qIKxuOvrzIRUlII0J/4xwN/Fuspqmgckl4hZiUhsGI4xqXm61cuI/UK4L5DGBUo/7SBAqcYfp+VnXdHTavdRRAMQvx/cDoa+R5qPNTU74nYh0TFM7a1vulR/eni6ZTTvpGpSRMKTGdd+pLWKjeAymheKJLPjaOKKsztdj2Tk3g/etb1fgJwISi03WvkCyu1sav4WDCDdbmkIsp4oMyRm GF5gLM3s 7XqUDU1roHUDeMM2beRztE9mCze24vT9A4diUS2sIDj3RfdyTrKz42XlvQ2U69arZ1+mK2AvDkhaGQc5buyGQ1s/6v8SDgY7IMFfi/2Jae1IukDKvY+VfiDL3FlbE54cckkMO3Axx6v7/mm5Us8iAKmgIl59eqwNWjdOy97GrTOFxALXYEVz5CbIcAE4Z2ljpsBcBcgdeqvU13vZA8nVao0ANxxpMo3qUWXLkureSf9wn3zbbkTmISIQyck6Hovwo0OYNbHLDjDq6xhZkYcXFeuXJP8KQh+af4fOOqzUVKsZZt9Lmm6wFulCQNSSXM9zMk2BnuEZYHNQy1AXGOyMEMaWTdXHpOHE9VxoRC5Gj9OW1nAgDS6tCePCKh25B1I9X0IQohveiR2hp2eNlKffEOa81HHrWd/ZKe981AdXCY/8vxc7RgGnoa40qA7tC+aQL+05PN8V6M3yAF0TTbHBeNqxLMApcLfsuy2Bt964+mf3UvTAgQ+0WftkWyg== 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: From: Fan Ni Convert the use of &folio->page to folio_page(folio, 0) where struct filio fits in. This is part of the efforts to move some fields out of struct page to reduce its size. Signed-off-by: Fan Ni --- mm/huge_memory.c | 30 +++++++++++++++++------------- mm/hugetlb.c | 20 +++++++++++--------- mm/hugetlb_vmemmap.c | 12 ++++++------ mm/khugepaged.c | 17 ++++++++++------- 4 files changed, 44 insertions(+), 35 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 28c87e0e036f..4c91fc594b6c 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1492,7 +1492,7 @@ vm_fault_t vmf_insert_folio_pmd(struct vm_fault *vmf, struct folio *folio, ptl = pmd_lock(mm, vmf->pmd); if (pmd_none(*vmf->pmd)) { folio_get(folio); - folio_add_file_rmap_pmd(folio, &folio->page, vma); + folio_add_file_rmap_pmd(folio, folio_page(folio, 0), vma); add_mm_counter(mm, mm_counter_file(folio), HPAGE_PMD_NR); } error = insert_pfn_pmd(vma, addr, vmf->pmd, @@ -1620,7 +1620,7 @@ vm_fault_t vmf_insert_folio_pud(struct vm_fault *vmf, struct folio *folio, */ if (pud_none(*vmf->pud)) { folio_get(folio); - folio_add_file_rmap_pud(folio, &folio->page, vma); + folio_add_file_rmap_pud(folio, folio_page(folio, 0), vma); add_mm_counter(mm, mm_counter_file(folio), HPAGE_PUD_NR); } insert_pfn_pud(vma, addr, vmf->pud, pfn_to_pfn_t(folio_pfn(folio)), @@ -2262,8 +2262,10 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, } spin_unlock(ptl); - if (flush_needed) - tlb_remove_page_size(tlb, &folio->page, HPAGE_PMD_SIZE); + if (flush_needed) { + tlb_remove_page_size(tlb, folio_page(folio, 0), + HPAGE_PMD_SIZE); + } } return 1; } @@ -2630,7 +2632,7 @@ int move_pages_huge_pmd(struct mm_struct *mm, pmd_t *dst_pmd, pmd_t *src_pmd, pm } if (src_folio) { if (folio_maybe_dma_pinned(src_folio) || - !PageAnonExclusive(&src_folio->page)) { + !PageAnonExclusive(folio_page(src_folio, 0))) { err = -EBUSY; goto unlock_ptls; } @@ -3316,7 +3318,7 @@ static void __split_folio_to_order(struct folio *folio, int old_order, * the flags from the original folio. */ for (i = new_nr_pages; i < nr_pages; i += new_nr_pages) { - struct page *new_head = &folio->page + i; + struct page *new_head = folio_page(folio, i); /* * Careful: new_folio is not a "real" folio before we cleared PageTail. @@ -3403,7 +3405,7 @@ static void __split_folio_to_order(struct folio *folio, int old_order, if (new_order) folio_set_order(folio, new_order); else - ClearPageCompound(&folio->page); + ClearPageCompound(folio_page(folio, 0)); } /* @@ -3528,7 +3530,7 @@ static int __split_unmapped_folio(struct folio *folio, int new_order, } folio_split_memcg_refs(folio, old_order, split_order); - split_page_owner(&folio->page, old_order, split_order); + split_page_owner(folio_page(folio, 0), old_order, split_order); pgalloc_tag_split(folio, old_order, split_order); __split_folio_to_order(folio, old_order, split_order); @@ -3640,7 +3642,7 @@ static int __split_unmapped_folio(struct folio *folio, int new_order, * requires taking the lru_lock so we do the put_page * of the tail pages after the split is complete. */ - free_page_and_swap_cache(&new_folio->page); + free_page_and_swap_cache(folio_page(new_folio, 0)); } return ret; } @@ -3971,7 +3973,8 @@ int split_huge_page_to_list_to_order(struct page *page, struct list_head *list, { struct folio *folio = page_folio(page); - return __folio_split(folio, new_order, &folio->page, page, list, true); + return __folio_split(folio, new_order, folio_page(folio, 0), page, + list, true); } /* @@ -3999,8 +4002,8 @@ int split_huge_page_to_list_to_order(struct page *page, struct list_head *list, int folio_split(struct folio *folio, unsigned int new_order, struct page *split_at, struct list_head *list) { - return __folio_split(folio, new_order, split_at, &folio->page, list, - false); + return __folio_split(folio, new_order, split_at, folio_page(folio, 0), + list, false); } int min_order_for_split(struct folio *folio) @@ -4024,7 +4027,8 @@ int split_folio_to_list(struct folio *folio, struct list_head *list) if (ret < 0) return ret; - return split_huge_page_to_list_to_order(&folio->page, list, ret); + return split_huge_page_to_list_to_order(folio_page(folio, 0), list, + ret); } /* diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 73417bea33f5..efbf5013986e 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1306,7 +1306,7 @@ static struct folio *dequeue_hugetlb_folio_node_exact(struct hstate *h, if (folio_test_hwpoison(folio)) continue; - if (is_migrate_isolate_page(&folio->page)) + if (is_migrate_isolate_page(folio_page(folio, 0))) continue; list_move(&folio->lru, &h->hugepage_activelist); @@ -1840,7 +1840,7 @@ void free_huge_folio(struct folio *folio) hugetlb_set_folio_subpool(folio, NULL); if (folio_test_anon(folio)) - __ClearPageAnonExclusive(&folio->page); + __ClearPageAnonExclusive(folio_page(folio, 0)); folio->mapping = NULL; restore_reserve = folio_test_hugetlb_restore_reserve(folio); folio_clear_hugetlb_restore_reserve(folio); @@ -4050,7 +4050,8 @@ static long demote_free_hugetlb_folios(struct hstate *src, struct hstate *dst, list_del(&folio->lru); - split_page_owner(&folio->page, huge_page_order(src), huge_page_order(dst)); + split_page_owner(folio_page(folio, 0), huge_page_order(src), + huge_page_order(dst)); pgalloc_tag_split(folio, huge_page_order(src), huge_page_order(dst)); for (i = 0; i < pages_per_huge_page(src); i += pages_per_huge_page(dst)) { @@ -6185,9 +6186,9 @@ static vm_fault_t hugetlb_wp(struct folio *pagecache_folio, * be leaks between processes, for example, with FOLL_GET users. */ if (folio_mapcount(old_folio) == 1 && folio_test_anon(old_folio)) { - if (!PageAnonExclusive(&old_folio->page)) { + if (!PageAnonExclusive(folio_page(old_folio, 0))) { folio_move_anon_rmap(old_folio, vma); - SetPageAnonExclusive(&old_folio->page); + SetPageAnonExclusive(folio_page(old_folio, 0)); } if (likely(!unshare)) set_huge_ptep_maybe_writable(vma, vmf->address, @@ -6197,7 +6198,8 @@ static vm_fault_t hugetlb_wp(struct folio *pagecache_folio, return 0; } VM_BUG_ON_PAGE(folio_test_anon(old_folio) && - PageAnonExclusive(&old_folio->page), &old_folio->page); + PageAnonExclusive(folio_page(old_folio, 0)), + folio_page(old_folio, 0)); /* * If the process that created a MAP_PRIVATE mapping is about to @@ -6249,8 +6251,8 @@ static vm_fault_t hugetlb_wp(struct folio *pagecache_folio, hugetlb_vma_unlock_read(vma); mutex_unlock(&hugetlb_fault_mutex_table[hash]); - unmap_ref_private(mm, vma, &old_folio->page, - vmf->address); + unmap_ref_private(mm, vma, folio_page(old_folio, 0), + vmf->address); mutex_lock(&hugetlb_fault_mutex_table[hash]); hugetlb_vma_lock_read(vma); @@ -7832,7 +7834,7 @@ void move_hugetlb_state(struct folio *old_folio, struct folio *new_folio, int re struct hstate *h = folio_hstate(old_folio); hugetlb_cgroup_migrate(old_folio, new_folio); - set_page_owner_migrate_reason(&new_folio->page, reason); + set_page_owner_migrate_reason(folio_page(new_folio, 0), reason); /* * transfer temporary state of the new hugetlb folio. This is diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 9a99dfa3c495..97a7a67515cd 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -454,7 +454,7 @@ static int __hugetlb_vmemmap_restore_folio(const struct hstate *h, struct folio *folio, unsigned long flags) { int ret; - unsigned long vmemmap_start = (unsigned long)&folio->page, vmemmap_end; + unsigned long vmemmap_start = (unsigned long)folio_page(folio, 0), vmemmap_end; unsigned long vmemmap_reuse; VM_WARN_ON_ONCE_FOLIO(!folio_test_hugetlb(folio), folio); @@ -566,7 +566,7 @@ static int __hugetlb_vmemmap_optimize_folio(const struct hstate *h, unsigned long flags) { int ret = 0; - unsigned long vmemmap_start = (unsigned long)&folio->page, vmemmap_end; + unsigned long vmemmap_start = (unsigned long)folio_page(folio, 0), vmemmap_end; unsigned long vmemmap_reuse; VM_WARN_ON_ONCE_FOLIO(!folio_test_hugetlb(folio), folio); @@ -632,7 +632,7 @@ void hugetlb_vmemmap_optimize_folio(const struct hstate *h, struct folio *folio) static int hugetlb_vmemmap_split_folio(const struct hstate *h, struct folio *folio) { - unsigned long vmemmap_start = (unsigned long)&folio->page, vmemmap_end; + unsigned long vmemmap_start = (unsigned long)folio_page(folio, 0), vmemmap_end; unsigned long vmemmap_reuse; if (!vmemmap_should_optimize_folio(h, folio)) @@ -668,13 +668,13 @@ static void __hugetlb_vmemmap_optimize_folios(struct hstate *h, * Already optimized by pre-HVO, just map the * mirrored tail page structs RO. */ - spfn = (unsigned long)&folio->page; + spfn = (unsigned long)folio_page(folio, 0); epfn = spfn + pages_per_huge_page(h); vmemmap_wrprotect_hvo(spfn, epfn, folio_nid(folio), HUGETLB_VMEMMAP_RESERVE_SIZE); register_page_bootmem_memmap(pfn_to_section_nr(spfn), - &folio->page, - HUGETLB_VMEMMAP_RESERVE_SIZE); + folio_page(folio, 0), + HUGETLB_VMEMMAP_RESERVE_SIZE); static_branch_inc(&hugetlb_optimize_vmemmap_key); continue; } diff --git a/mm/khugepaged.c b/mm/khugepaged.c index b8838ba8207a..79d18ff5cda5 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -696,14 +696,16 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, result = SCAN_LACK_REFERENCED_PAGE; } else { result = SCAN_SUCCEED; - trace_mm_collapse_huge_page_isolate(&folio->page, none_or_zero, - referenced, writable, result); + trace_mm_collapse_huge_page_isolate(folio_page(folio, 0), + none_or_zero, referenced, + writable, result); return result; } out: release_pte_pages(pte, _pte, compound_pagelist); - trace_mm_collapse_huge_page_isolate(&folio->page, none_or_zero, - referenced, writable, result); + trace_mm_collapse_huge_page_isolate(folio_page(folio, 0), + none_or_zero, referenced, + writable, result); return result; } @@ -1435,8 +1437,9 @@ static int hpage_collapse_scan_pmd(struct mm_struct *mm, *mmap_locked = false; } out: - trace_mm_khugepaged_scan_pmd(mm, &folio->page, writable, referenced, - none_or_zero, result, unmapped); + trace_mm_khugepaged_scan_pmd(mm, folio_page(folio, 0), writable, + referenced, none_or_zero, result, + unmapped); return result; } @@ -1689,7 +1692,7 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, maybe_install_pmd: /* step 5: install pmd entry */ result = install_pmd - ? set_huge_pmd(vma, haddr, pmd, &folio->page) + ? set_huge_pmd(vma, haddr, pmd, folio_page(folio, 0)) : SCAN_SUCCEED; goto drop_folio; abort: