From: alexs@kernel.org
To: Andrew Morton <akpm@linux-foundation.org>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
zik.eidus@ravellosystems.com, willy@infradead.org,
aarcange@redhat.com, hughd@google.com, chrisw@sous-sol.org,
david@redhat.com
Cc: "Alex Shi (tencent)" <alexs@kernel.org>
Subject: [PATCH v5 09/10] mm/ksm: rename get_ksm_page_flags() to ksm_get_folio_flags
Date: Thu, 11 Apr 2024 14:17:10 +0800 [thread overview]
Message-ID: <20240411061713.1847574-10-alexs@kernel.org> (raw)
In-Reply-To: <20240411061713.1847574-1-alexs@kernel.org>
From: David Hildenbrand <david@redhat.com>
As we are removing get_ksm_page_flags(), make the flags match the new
function name.
Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Alex Shi <alexs@kernel.org>
---
mm/ksm.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/mm/ksm.c b/mm/ksm.c
index 61a7b5b037a6..662fdaaf3ea3 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -890,10 +890,10 @@ static void remove_node_from_stable_tree(struct ksm_stable_node *stable_node)
free_stable_node(stable_node);
}
-enum get_ksm_page_flags {
- GET_KSM_PAGE_NOLOCK,
- GET_KSM_PAGE_LOCK,
- GET_KSM_PAGE_TRYLOCK
+enum ksm_get_folio_flags {
+ KSM_GET_FOLIO_NOLOCK,
+ KSM_GET_FOLIO_LOCK,
+ KSM_GET_FOLIO_TRYLOCK
};
/*
@@ -916,7 +916,7 @@ enum get_ksm_page_flags {
* is on its way to being freed; but it is an anomaly to bear in mind.
*/
static struct folio *ksm_get_folio(struct ksm_stable_node *stable_node,
- enum get_ksm_page_flags flags)
+ enum ksm_get_folio_flags flags)
{
struct folio *folio;
void *expected_mapping;
@@ -959,15 +959,15 @@ static struct folio *ksm_get_folio(struct ksm_stable_node *stable_node,
goto stale;
}
- if (flags == GET_KSM_PAGE_TRYLOCK) {
+ if (flags == KSM_GET_FOLIO_TRYLOCK) {
if (!folio_trylock(folio)) {
folio_put(folio);
return ERR_PTR(-EBUSY);
}
- } else if (flags == GET_KSM_PAGE_LOCK)
+ } else if (flags == KSM_GET_FOLIO_LOCK)
folio_lock(folio);
- if (flags != GET_KSM_PAGE_NOLOCK) {
+ if (flags != KSM_GET_FOLIO_NOLOCK) {
if (READ_ONCE(folio->mapping) != expected_mapping) {
folio_unlock(folio);
folio_put(folio);
@@ -1001,7 +1001,7 @@ static void remove_rmap_item_from_tree(struct ksm_rmap_item *rmap_item)
struct folio *folio;
stable_node = rmap_item->head;
- folio = ksm_get_folio(stable_node, GET_KSM_PAGE_LOCK);
+ folio = ksm_get_folio(stable_node, KSM_GET_FOLIO_LOCK);
if (!folio)
goto out;
@@ -1116,7 +1116,7 @@ static int remove_stable_node(struct ksm_stable_node *stable_node)
struct folio *folio;
int err;
- folio = ksm_get_folio(stable_node, GET_KSM_PAGE_LOCK);
+ folio = ksm_get_folio(stable_node, KSM_GET_FOLIO_LOCK);
if (!folio) {
/*
* ksm_get_folio did remove_node_from_stable_tree itself.
@@ -1656,7 +1656,7 @@ static struct folio *stable_node_dup(struct ksm_stable_node **_stable_node_dup,
* stable_node parameter itself will be freed from
* under us if it returns NULL.
*/
- folio = ksm_get_folio(dup, GET_KSM_PAGE_NOLOCK);
+ folio = ksm_get_folio(dup, KSM_GET_FOLIO_NOLOCK);
if (!folio)
continue;
nr += 1;
@@ -1779,7 +1779,7 @@ static struct folio *__stable_node_chain(struct ksm_stable_node **_stable_node_d
if (!is_stable_node_chain(stable_node)) {
if (is_page_sharing_candidate(stable_node)) {
*_stable_node_dup = stable_node;
- return ksm_get_folio(stable_node, GET_KSM_PAGE_NOLOCK);
+ return ksm_get_folio(stable_node, KSM_GET_FOLIO_NOLOCK);
}
/*
* _stable_node_dup set to NULL means the stable_node
@@ -1887,7 +1887,7 @@ static struct page *stable_tree_search(struct page *page)
* fine to continue the walk.
*/
tree_folio = ksm_get_folio(stable_node_any,
- GET_KSM_PAGE_NOLOCK);
+ KSM_GET_FOLIO_NOLOCK);
}
VM_BUG_ON(!stable_node_dup ^ !!stable_node_any);
if (!tree_folio) {
@@ -1948,7 +1948,7 @@ static struct page *stable_tree_search(struct page *page)
* than kpage, but that involves more changes.
*/
tree_folio = ksm_get_folio(stable_node_dup,
- GET_KSM_PAGE_TRYLOCK);
+ KSM_GET_FOLIO_TRYLOCK);
if (PTR_ERR(tree_folio) == -EBUSY)
return ERR_PTR(-EBUSY);
@@ -2120,7 +2120,7 @@ static struct ksm_stable_node *stable_tree_insert(struct folio *kfolio)
* fine to continue the walk.
*/
tree_folio = ksm_get_folio(stable_node_any,
- GET_KSM_PAGE_NOLOCK);
+ KSM_GET_FOLIO_NOLOCK);
}
VM_BUG_ON(!stable_node_dup ^ !!stable_node_any);
if (!tree_folio) {
@@ -2611,7 +2611,7 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(struct page **page)
list_for_each_entry_safe(stable_node, next,
&migrate_nodes, list) {
folio = ksm_get_folio(stable_node,
- GET_KSM_PAGE_NOLOCK);
+ KSM_GET_FOLIO_NOLOCK);
if (folio)
folio_put(folio);
cond_resched();
--
2.43.0
next prev parent reply other threads:[~2024-04-11 6:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-11 6:17 [PATCH v5 0/10] transfer page to folio in KSM alexs
2024-04-11 6:17 ` [PATCH v5 01/10] mm/ksm: add ksm_get_folio alexs
2024-04-11 6:17 ` [PATCH v5 02/10] mm/ksm: use folio in remove_rmap_item_from_tree alexs
2024-04-11 6:17 ` [PATCH v5 03/10] mm/ksm: add folio_set_stable_node alexs
2024-04-11 6:17 ` [PATCH v5 04/10] mm/ksm: use folio in remove_stable_node alexs
2024-04-11 6:17 ` [PATCH v5 05/10] mm/ksm: use folio in stable_node_dup alexs
2024-04-11 6:17 ` [PATCH v5 06/10] mm/ksm: use ksm_get_folio in scan_get_next_rmap_item alexs
2024-04-11 6:17 ` [PATCH v5 07/10] mm/ksm: use folio in write_protect_page alexs
2024-04-11 6:17 ` [PATCH v5 08/10] mm/ksm: Convert chain series funcs and replace get_ksm_page alexs
[not found] ` <8a79bfbd-b01d-4425-8fd9-de2d3e6cd1af@redhat.com>
2024-04-11 11:38 ` Alex Shi
2024-04-11 6:17 ` alexs [this message]
[not found] ` <192aaa5c-3ff3-40c1-b12a-b674518bf5de@redhat.com>
2024-04-11 11:42 ` [PATCH v5 09/10] mm/ksm: rename get_ksm_page_flags() to ksm_get_folio_flags Alex Shi
[not found] ` <47686d5e-efd3-4431-b72c-620f749faeaa@redhat.com>
2024-04-11 20:42 ` Andrew Morton
2024-04-12 1:57 ` Alex Shi
2024-04-11 6:17 ` [PATCH v5 10/10] mm/ksm: replace set_page_stable_node by folio_set_stable_node alexs
2024-04-11 7:55 ` [PATCH v5 0/10] transfer page to folio in KSM David Hildenbrand
2024-04-11 11:45 ` Alex Shi
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=20240411061713.1847574-10-alexs@kernel.org \
--to=alexs@kernel.org \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=chrisw@sous-sol.org \
--cc=david@redhat.com \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=willy@infradead.org \
--cc=zik.eidus@ravellosystems.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