linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Andrew Morton <akpm@linux-foundation.org>, <linux-mm@kvack.org>
Cc: <willy@infradead.org>, <david@redhat.com>,
	<linux-s390@vger.kernel.org>, <linux-perf-users@vger.kernel.org>,
	Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH v2 3/8] mm: huge_memory: use pfn_swap_entry_to_folio() in __split_huge_pmd_locked()
Date: Thu, 11 Jan 2024 19:12:34 +0800	[thread overview]
Message-ID: <20240111111239.2453282-4-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20240111111239.2453282-1-wangkefeng.wang@huawei.com>

Using pfn_swap_entry_to_folio() in __split_huge_pmd_locked() which is
preparetion for converting mm counter functions to take a folio.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 mm/huge_memory.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 94ef5c02b459..6139887933a7 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2432,7 +2432,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd,
 			swp_entry_t entry;
 
 			entry = pmd_to_swp_entry(old_pmd);
-			page = pfn_swap_entry_to_page(entry);
+			folio = pfn_swap_entry_to_folio(entry);
 		} else {
 			page = pmd_page(old_pmd);
 			folio = page_folio(page);
@@ -2443,7 +2443,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd,
 			folio_remove_rmap_pmd(folio, page, vma);
 			folio_put(folio);
 		}
-		add_mm_counter(mm, mm_counter_file(page), -HPAGE_PMD_NR);
+		add_mm_counter(mm, mm_counter_file(&folio->page), -HPAGE_PMD_NR);
 		return;
 	}
 
-- 
2.27.0



  parent reply	other threads:[~2024-01-11 11:13 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-11 11:12 [PATCH v2 0/8] mm: convert mm counter to take a folio Kefeng Wang
2024-01-11 11:12 ` [PATCH v2 1/8] mm: swap: introduce pfn_swap_entry_to_folio() Kefeng Wang
2024-01-11 14:37   ` Matthew Wilcox
2024-01-11 14:39     ` Matthew Wilcox
2024-01-12  4:17       ` Kefeng Wang
2024-01-11 11:12 ` [PATCH v2 2/8] s390: pgtable: use pfn_swap_entry_to_folio() in ptep_zap_swap_entry() Kefeng Wang
2024-01-11 11:12 ` Kefeng Wang [this message]
2024-01-11 11:12 ` [PATCH v2 4/8] mm: huge_memory: use pfn_swap_entry_to_folio() in zap_huge_pmd() Kefeng Wang
2024-01-11 11:12 ` [PATCH v2 5/8] mm: memory: use pfn_swap_entry_to_folio() in copy_nonpresent_pte() Kefeng Wang
2024-01-11 11:12 ` [PATCH v2 6/8] mm: memory: convert to should_zap_folio() Kefeng Wang
2024-01-11 11:12 ` [PATCH v2 7/8] mm: convert mm_counter() to take a folio Kefeng Wang
2024-01-11 11:12 ` [PATCH v2 8/8] mm: convert mm_counter_file() " Kefeng Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240111111239.2453282-4-wangkefeng.wang@huawei.com \
    --to=wangkefeng.wang@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=david@redhat.com \
    --cc=linux-mm@kvack.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=willy@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox