linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Peng Zhang <zhangpeng362@huawei.com>
To: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>
Cc: <willy@infradead.org>, <sidhartha.kumar@oracle.com>,
	<akpm@linux-foundation.org>, <wangkefeng.wang@huawei.com>,
	<sunnanyong@huawei.com>, ZhangPeng <zhangpeng362@huawei.com>
Subject: [PATCH 5/6] mm/page_io: convert count_swpout_vm_event() to take in a folio
Date: Mon, 17 Jul 2023 21:26:01 +0800	[thread overview]
Message-ID: <20230717132602.2202147-6-zhangpeng362@huawei.com> (raw)
In-Reply-To: <20230717132602.2202147-1-zhangpeng362@huawei.com>

From: ZhangPeng <zhangpeng362@huawei.com>

Convert count_swpout_vm_event() to take in a folio. We can remove five
implicit calls to compound_head() by taking in a folio.

Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>
---
 mm/page_io.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mm/page_io.c b/mm/page_io.c
index 84cc9e652451..66e8403bf96e 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -208,13 +208,13 @@ int swap_writepage(struct page *page, struct writeback_control *wbc)
 	return 0;
 }
 
-static inline void count_swpout_vm_event(struct page *page)
+static inline void count_swpout_vm_event(struct folio *folio)
 {
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-	if (unlikely(PageTransHuge(page)))
+	if (unlikely(folio_test_large(folio)))
 		count_vm_event(THP_SWPOUT);
 #endif
-	count_vm_events(PSWPOUT, thp_nr_pages(page));
+	count_vm_events(PSWPOUT, folio_nr_pages(folio));
 }
 
 #if defined(CONFIG_MEMCG) && defined(CONFIG_BLK_CGROUP)
@@ -283,7 +283,7 @@ static void sio_write_complete(struct kiocb *iocb, long ret)
 		}
 	} else {
 		for (p = 0; p < sio->pages; p++)
-			count_swpout_vm_event(sio->bvec[p].bv_page);
+			count_swpout_vm_event(page_folio(sio->bvec[p].bv_page));
 	}
 
 	for (p = 0; p < sio->pages; p++)
@@ -342,7 +342,7 @@ static void swap_writepage_bdev_sync(struct page *page,
 	__bio_add_page(&bio, page, thp_size(page), 0);
 
 	bio_associate_blkg_from_page(&bio, page);
-	count_swpout_vm_event(page);
+	count_swpout_vm_event(folio);
 
 	folio_start_writeback(folio);
 	folio_unlock(folio);
@@ -365,7 +365,7 @@ static void swap_writepage_bdev_async(struct page *page,
 	__bio_add_page(bio, page, thp_size(page), 0);
 
 	bio_associate_blkg_from_page(bio, page);
-	count_swpout_vm_event(page);
+	count_swpout_vm_event(folio);
 	folio_start_writeback(folio);
 	folio_unlock(folio);
 	submit_bio(bio);
-- 
2.25.1



  parent reply	other threads:[~2023-07-17 13:26 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-17 13:25 [PATCH 0/6] Convert several functions in page_io.c to use " Peng Zhang
2023-07-17 13:25 ` [PATCH 1/6] mm/page_io: use a folio in __end_swap_bio_read() Peng Zhang
2023-07-17 13:34   ` Matthew Wilcox
2023-07-18 12:56     ` zhangpeng (AS)
2023-07-18 16:16       ` Matthew Wilcox
2023-07-19  7:46         ` zhangpeng (AS)
2023-07-20  5:21         ` Christoph Hellwig
2023-07-17 13:25 ` [PATCH 2/6] mm/page_io: use a folio in sio_read_complete() Peng Zhang
2023-07-17 13:40   ` Matthew Wilcox
2023-07-18 12:58     ` zhangpeng (AS)
2023-07-18 16:21       ` Matthew Wilcox
2023-07-19  7:47         ` zhangpeng (AS)
2023-07-20  5:22     ` Christoph Hellwig
2023-07-17 13:25 ` [PATCH 3/6] mm/page_io: use a folio in swap_writepage_bdev_sync() Peng Zhang
2023-07-17 14:00   ` Matthew Wilcox
2023-07-17 13:26 ` [PATCH 4/6] mm/page_io: use a folio in swap_writepage_bdev_async() Peng Zhang
2023-07-17 14:01   ` Matthew Wilcox
2023-07-17 13:26 ` Peng Zhang [this message]
2023-07-17 13:48   ` [PATCH 5/6] mm/page_io: convert count_swpout_vm_event() to take in a folio Matthew Wilcox
2023-07-18 12:56     ` zhangpeng (AS)
2023-07-17 13:26 ` [PATCH 6/6] mm/page_io: convert bio_associate_blkg_from_page() " Peng Zhang
2023-07-17 13:46   ` Matthew Wilcox

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=20230717132602.2202147-6-zhangpeng362@huawei.com \
    --to=zhangpeng362@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=sidhartha.kumar@oracle.com \
    --cc=sunnanyong@huawei.com \
    --cc=wangkefeng.wang@huawei.com \
    --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