Commit 85b67b01 authored by David Hildenbrand's avatar David Hildenbrand Committed by Andrew Morton

mm/ksm: rename get_ksm_page_flags to ksm_get_folio_flags

As we are removing get_ksm_page_flags(), make the flags match the new
function name.

Link: https://lkml.kernel.org/r/20240411061713.1847574-10-alexs@kernel.orgSigned-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarAlex Shi <alexs@kernel.org>
Reviewed-by: default avatarAlex Shi <alexs@kernel.org>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: Izik Eidus <izik.eidus@ravellosystems.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 79899cce
...@@ -890,10 +890,10 @@ static void remove_node_from_stable_tree(struct ksm_stable_node *stable_node) ...@@ -890,10 +890,10 @@ static void remove_node_from_stable_tree(struct ksm_stable_node *stable_node)
free_stable_node(stable_node); free_stable_node(stable_node);
} }
enum get_ksm_page_flags { enum ksm_get_folio_flags {
GET_KSM_PAGE_NOLOCK, KSM_GET_FOLIO_NOLOCK,
GET_KSM_PAGE_LOCK, KSM_GET_FOLIO_LOCK,
GET_KSM_PAGE_TRYLOCK KSM_GET_FOLIO_TRYLOCK
}; };
/* /*
...@@ -916,7 +916,7 @@ enum get_ksm_page_flags { ...@@ -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. * 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, 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; struct folio *folio;
void *expected_mapping; void *expected_mapping;
...@@ -959,15 +959,15 @@ static struct folio *ksm_get_folio(struct ksm_stable_node *stable_node, ...@@ -959,15 +959,15 @@ static struct folio *ksm_get_folio(struct ksm_stable_node *stable_node,
goto stale; goto stale;
} }
if (flags == GET_KSM_PAGE_TRYLOCK) { if (flags == KSM_GET_FOLIO_TRYLOCK) {
if (!folio_trylock(folio)) { if (!folio_trylock(folio)) {
folio_put(folio); folio_put(folio);
return ERR_PTR(-EBUSY); return ERR_PTR(-EBUSY);
} }
} else if (flags == GET_KSM_PAGE_LOCK) } else if (flags == KSM_GET_FOLIO_LOCK)
folio_lock(folio); folio_lock(folio);
if (flags != GET_KSM_PAGE_NOLOCK) { if (flags != KSM_GET_FOLIO_NOLOCK) {
if (READ_ONCE(folio->mapping) != expected_mapping) { if (READ_ONCE(folio->mapping) != expected_mapping) {
folio_unlock(folio); folio_unlock(folio);
folio_put(folio); folio_put(folio);
...@@ -1001,7 +1001,7 @@ static void remove_rmap_item_from_tree(struct ksm_rmap_item *rmap_item) ...@@ -1001,7 +1001,7 @@ static void remove_rmap_item_from_tree(struct ksm_rmap_item *rmap_item)
struct folio *folio; struct folio *folio;
stable_node = rmap_item->head; 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) if (!folio)
goto out; goto out;
...@@ -1116,7 +1116,7 @@ static int remove_stable_node(struct ksm_stable_node *stable_node) ...@@ -1116,7 +1116,7 @@ static int remove_stable_node(struct ksm_stable_node *stable_node)
struct folio *folio; struct folio *folio;
int err; int err;
folio = ksm_get_folio(stable_node, GET_KSM_PAGE_LOCK); folio = ksm_get_folio(stable_node, KSM_GET_FOLIO_LOCK);
if (!folio) { if (!folio) {
/* /*
* ksm_get_folio did remove_node_from_stable_tree itself. * 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, ...@@ -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 * stable_node parameter itself will be freed from
* under us if it returns NULL. * 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) if (!folio)
continue; continue;
nr += 1; nr += 1;
...@@ -1779,7 +1779,7 @@ static struct folio *__stable_node_chain(struct ksm_stable_node **_stable_node_d ...@@ -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_stable_node_chain(stable_node)) {
if (is_page_sharing_candidate(stable_node)) { if (is_page_sharing_candidate(stable_node)) {
*_stable_node_dup = 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 * _stable_node_dup set to NULL means the stable_node
...@@ -1887,7 +1887,7 @@ static struct page *stable_tree_search(struct page *page) ...@@ -1887,7 +1887,7 @@ static struct page *stable_tree_search(struct page *page)
* fine to continue the walk. * fine to continue the walk.
*/ */
tree_folio = ksm_get_folio(stable_node_any, 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); VM_BUG_ON(!stable_node_dup ^ !!stable_node_any);
if (!tree_folio) { if (!tree_folio) {
...@@ -1948,7 +1948,7 @@ static struct page *stable_tree_search(struct page *page) ...@@ -1948,7 +1948,7 @@ static struct page *stable_tree_search(struct page *page)
* than kpage, but that involves more changes. * than kpage, but that involves more changes.
*/ */
tree_folio = ksm_get_folio(stable_node_dup, tree_folio = ksm_get_folio(stable_node_dup,
GET_KSM_PAGE_TRYLOCK); KSM_GET_FOLIO_TRYLOCK);
if (PTR_ERR(tree_folio) == -EBUSY) if (PTR_ERR(tree_folio) == -EBUSY)
return ERR_PTR(-EBUSY); return ERR_PTR(-EBUSY);
...@@ -2120,7 +2120,7 @@ static struct ksm_stable_node *stable_tree_insert(struct folio *kfolio) ...@@ -2120,7 +2120,7 @@ static struct ksm_stable_node *stable_tree_insert(struct folio *kfolio)
* fine to continue the walk. * fine to continue the walk.
*/ */
tree_folio = ksm_get_folio(stable_node_any, 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); VM_BUG_ON(!stable_node_dup ^ !!stable_node_any);
if (!tree_folio) { if (!tree_folio) {
...@@ -2611,7 +2611,7 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(struct page **page) ...@@ -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, list_for_each_entry_safe(stable_node, next,
&migrate_nodes, list) { &migrate_nodes, list) {
folio = ksm_get_folio(stable_node, folio = ksm_get_folio(stable_node,
GET_KSM_PAGE_NOLOCK); KSM_GET_FOLIO_NOLOCK);
if (folio) if (folio)
folio_put(folio); folio_put(folio);
cond_resched(); cond_resched();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment