Skip to contentSkip to conversation

swap_state: update shadow_nodes for anonymous page

PATCH Superseded [email protected] 3 participants 3 messages Jan 13, 2023

Subsystems (4)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 swap_state: update shadow_nodes for anonymous page

From: Yang Yang <[email protected]>

Shadow_nodes is for shadow nodes reclaiming of workingset handling, it is updated when page cache add or delete since long time ago workingset only supported page cache. But when workingset supports anonymous page detection, we missied updating shadow nodes for it. This caused that shadow nodes of anonymous page will never be reclaimd by scan_shadow_nodes() even they use much memory and system memory is tense.

This patch updates shadow_nodes of anonymous page when swap cache is add or delete.

Fixes aae466b0052e ("mm/swap: implement workingset detection for anonymous LRU")

---
change for v2
- Include a description of the user-visible effect. Add fixes tag. Modify comments. Also call workingset_update_node() in clear_shadow_from_swap_cache(). Thanks to Matthew Wilcox.
---
include/linux/xarray.h | 3 ++-

 mm/swap_state.c        | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
include/linux/xarray.h +2 -1
index 44dd6d6e01bc..5cc1f718fec9 100644
@@ -1643,7 +1643,8 @@ static inline void xas_set_order(struct xa_state *xas, unsigned long index,
  * @update: Function to call when updating a node.
  *
  * The XArray can notify a caller after it has updated an xa_node.
- * This is advanced functionality and is only needed by the page cache.
+ * This is advanced functionality and is only needed by the page cache
+ * and swap cache.
  */
 static inline void xas_set_update(struct xa_state *xas, xa_update_node_t update)
 {
mm/swap_state.c +6 -0
index cb9aaa00951d..7a003d8abb37 100644
@@ -94,6 +94,8 @@ int add_to_swap_cache(struct folio *folio, swp_entry_t entry,
 	unsigned long i, nr = folio_nr_pages(folio);
 	void *old;
 
+	xas_set_update(&xas, workingset_update_node);
+
 	VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio);
 	VM_BUG_ON_FOLIO(folio_test_swapcache(folio), folio);
 	VM_BUG_ON_FOLIO(!folio_test_swapbacked(folio), folio);
@@ -145,6 +147,8 @@ void __delete_from_swap_cache(struct folio *folio,
 	pgoff_t idx = swp_offset(entry);
 	XA_STATE(xas, &address_space->i_pages, idx);
 
+	xas_set_update(&xas, workingset_update_node);
+
 	VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio);
 	VM_BUG_ON_FOLIO(!folio_test_swapcache(folio), folio);
 	VM_BUG_ON_FOLIO(folio_test_writeback(folio), folio);
@@ -252,6 +256,8 @@ void clear_shadow_from_swap_cache(int type, unsigned long begin,
 		struct address_space *address_space = swap_address_space(entry);
 		XA_STATE(xas, &address_space->i_pages, curr);
 
+		xas_set_update(&xas, workingset_update_node);
+
 		xa_lock_irq(&address_space->i_pages);
 		xas_for_each(&xas, old, end) {
 			if (!xa_is_value(old))
Signature · 1 line
2.15.2
#1 lore raw
Quoted 2 lines · On Fri, Jan 13, 2023 at 03:50:45PM +0800, [email protected] wrote:

This patch updates shadow_nodes of anonymous page when swap cache is add or delete.

By what?

Quoted 23 lines
mm/swap_state.c +4 -0
index cb9aaa00951d..7a003d8abb37 100644
@@ -94,6 +94,8 @@ int add_to_swap_cache(struct folio *folio, swp_entry_t entry,
 	unsigned long i, nr = folio_nr_pages(folio);
 	void *old;
 
+	xas_set_update(&xas, workingset_update_node);
+
 	VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio);
 	VM_BUG_ON_FOLIO(folio_test_swapcache(folio), folio);
 	VM_BUG_ON_FOLIO(!folio_test_swapbacked(folio), folio);
@@ -145,6 +147,8 @@ void __delete_from_swap_cache(struct folio *folio,
 	pgoff_t idx = swp_offset(entry);
 	XA_STATE(xas, &address_space->i_pages, idx);
 
+	xas_set_update(&xas, workingset_update_node);
+
 	VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio);
 	VM_BUG_ON_FOLIO(!folio_test_swapcache(folio), folio);
 	VM_BUG_ON_FOLIO(folio_test_writeback(folio), folio);

mm/swap_state.c void clear_shadow_from_swap_cache(int type, unsigned long begin, · line 263

Quoted 8 lines
mm/swap_state.c +2 -0
@@ -252,6 +256,8 @@ void clear_shadow_from_swap_cache(int type, unsigned long begin,
 		struct address_space *address_space = swap_address_space(entry);
 		XA_STATE(xas, &address_space->i_pages, curr);
 
+		xas_set_update(&xas, workingset_update_node);
+
 		xa_lock_irq(&address_space->i_pages);
 		xas_for_each(&xas, old, end) {
 			if (!xa_is_value(old))

Adding xas_set_update() call?

In any case, please explain what you are doing above in imperative mood (no "This patch does foo" but "Do foo" instead).

Thanks.

Signature · 1 line
An old man doll... just what I always wanted! - Clara
maintainer
#2 lore raw
Quoted 5 lines · Bagas Sanjaya
Quoted 2 lines · On Fri, Jan 13, 2023 at 03:50:45PM +0800, [email protected] wrote:

This patch updates shadow_nodes of anonymous page when swap cache is add or delete.

By what?

This is not a helpful question.

Quoted 11 lines

mm/swap_state.c void clear_shadow_from_swap_cache(int type, unsigned long begin, · line 263

Quoted 9 lines
mm/swap_state.c +2 -0
@@ -252,6 +256,8 @@ void clear_shadow_from_swap_cache(int type, unsigned long begin,
 		struct address_space *address_space = swap_address_space(entry);
 		XA_STATE(xas, &address_space->i_pages, curr);
 
+		xas_set_update(&xas, workingset_update_node);
+
 		xa_lock_irq(&address_space->i_pages);
 		xas_for_each(&xas, old, end) {
 			if (!xa_is_value(old))

Adding xas_set_update() call?

It makes perfect sense to me.

Quoted 2 lines

In any case, please explain what you are doing above in imperative mood (no "This patch does foo" but "Do foo" instead).

Not helpful either.