From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: <willy@infradead.org>, <linux-mm@kvack.org>,
<linux-kernel@vger.kernel.org>, <ying.huang@intel.com>,
<david@redhat.com>, Zi Yan <ziy@nvidia.com>,
Ingo Molnar <mingo@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Juri Lelli <juri.lelli@redhat.com>,
Vincent Guittot <vincent.guittot@linaro.org>,
Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH -next v2 06/19] mm: remove page_cpupid_last()
Date: Fri, 13 Oct 2023 16:55:50 +0800 [thread overview]
Message-ID: <20231013085603.1227349-7-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20231013085603.1227349-1-wangkefeng.wang@huawei.com>
Since all calls use folio_last_cpupid(), remove page_cpupid_last().
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
include/linux/mm.h | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 1c393a72037b..1d56a818b212 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1700,18 +1700,18 @@ static inline int page_cpupid_xchg_last(struct page *page, int cpupid)
return xchg(&page->_last_cpupid, cpupid & LAST_CPUPID_MASK);
}
-static inline int page_cpupid_last(struct page *page)
+static inline int folio_last_cpupid(struct folio *folio)
{
- return page->_last_cpupid;
+ return folio->_last_cpupid;
}
static inline void page_cpupid_reset_last(struct page *page)
{
page->_last_cpupid = -1 & LAST_CPUPID_MASK;
}
#else
-static inline int page_cpupid_last(struct page *page)
+static inline int folio_last_cpupid(struct folio *folio)
{
- return (page->flags >> LAST_CPUPID_PGSHIFT) & LAST_CPUPID_MASK;
+ return (folio->flags >> LAST_CPUPID_PGSHIFT) & LAST_CPUPID_MASK;
}
extern int page_cpupid_xchg_last(struct page *page, int cpupid);
@@ -1750,9 +1750,9 @@ static inline int xchg_page_access_time(struct page *page, int time)
return 0;
}
-static inline int page_cpupid_last(struct page *page)
+static inline int folio_last_cpupid(struct folio *folio)
{
- return page_to_nid(page); /* XXX */
+ return folio_nid(folio); /* XXX */
}
static inline int cpupid_to_nid(int cpupid)
@@ -1794,11 +1794,6 @@ static inline void vma_set_access_pid_bit(struct vm_area_struct *vma)
}
#endif /* CONFIG_NUMA_BALANCING */
-static inline int folio_last_cpupid(struct folio *folio)
-{
- return page_cpupid_last(&folio->page);
-}
-
#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS)
/*
--
2.27.0
next prev parent reply other threads:[~2023-10-13 8:58 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-13 8:55 [PATCH -next v2 00/19] mm: convert page cpupid functions to folios Kefeng Wang
2023-10-13 8:55 ` [PATCH -next v2 01/19] mm_types: add virtual and _last_cpupid into struct folio Kefeng Wang
2023-10-13 8:55 ` [PATCH -next v2 02/19] mm: add folio_last_cpupid() Kefeng Wang
2023-10-13 8:55 ` [PATCH -next v2 03/19] mm: memory: use folio_last_cpupid() in do_numa_page() Kefeng Wang
2023-10-13 8:55 ` [PATCH -next v2 04/19] mm: huge_memory: use folio_last_cpupid() in do_huge_pmd_numa_page() Kefeng Wang
2023-10-13 8:55 ` [PATCH -next v2 05/19] mm: huge_memory: use folio_last_cpupid() in __split_huge_page_tail() Kefeng Wang
2023-10-13 8:55 ` Kefeng Wang [this message]
2023-10-13 8:55 ` [PATCH -next v2 07/19] mm: add folio_xchg_access_time() Kefeng Wang
2023-10-13 8:55 ` [PATCH -next v2 08/19] sched/fair: use folio_xchg_access_time() in numa_hint_fault_latency() Kefeng Wang
2023-10-13 8:55 ` [PATCH -next v2 09/19] mm: mprotect: use a folio in change_pte_range() Kefeng Wang
2023-10-13 15:13 ` Matthew Wilcox
2023-10-14 3:11 ` Kefeng Wang
2023-10-13 8:55 ` [PATCH -next v2 10/19] mm: huge_memory: use a folio in change_huge_pmd() Kefeng Wang
2023-10-13 8:55 ` [PATCH -next v2 11/19] mm: remove xchg_page_access_time() Kefeng Wang
2023-10-13 8:55 ` [PATCH -next v2 12/19] mm: add folio_xchg_last_cpupid() Kefeng Wang
2023-10-13 8:55 ` [PATCH -next v2 13/19] sched/fair: use folio_xchg_last_cpupid() in should_numa_migrate_memory() Kefeng Wang
2023-10-13 8:55 ` [PATCH -next v2 14/19] mm: migrate: use folio_xchg_last_cpupid() in folio_migrate_flags() Kefeng Wang
2023-10-13 8:55 ` [PATCH -next v2 15/19] mm: huge_memory: use folio_xchg_last_cpupid() in __split_huge_page_tail() Kefeng Wang
2023-10-13 8:56 ` [PATCH -next v2 16/19] mm: make finish_mkwrite_fault() static Kefeng Wang
2023-10-13 8:56 ` [PATCH -next v2 17/19] mm: convert wp_page_reuse() and finish_mkwrite_fault() to take a folio Kefeng Wang
2023-10-17 7:33 ` kernel test robot
2023-10-17 9:04 ` Kefeng Wang
2023-10-17 14:51 ` Andrew Morton
2023-10-13 8:56 ` [PATCH -next v2 18/19] mm: use folio_xchg_last_cpupid() in wp_page_reuse() Kefeng Wang
2023-10-13 15:19 ` Matthew Wilcox
2023-10-13 8:56 ` [PATCH -next v2 19/19] mm: remove page_cpupid_xchg_last() 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=20231013085603.1227349-7-wangkefeng.wang@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=juri.lelli@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=vincent.guittot@linaro.org \
--cc=willy@infradead.org \
--cc=ying.huang@intel.com \
--cc=ziy@nvidia.com \
/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