mm: workingset: Simplify lockdep check in update_node
Subsystems (3)
PATCH 1/1 mm: workingset: Simplify lockdep check in update_node
container_of(node->array, ..., i_pages) just to access i_pages again is an incredibly roundabout way of accessing node->array itself. Simplify it.
--- mm/workingset.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
mm/workingset.c +1 -3
@@ -612,7 +612,6 @@ struct list_lru shadow_nodes;void workingset_update_node (struct xa_node *node) { -struct address_space *mapping;struct page *page =virt_to_page (node);/*
@@ -623,8 +622,7 @@ void workingset_update_node(struct xa_node *node)* already where they should be. The list_empty() test is safe * as node->private_list is protected by the i_pages lock. */ - mapping = container_of(node->array, struct address_space, i_pages); -lockdep_assert_held (&mapping->i_pages.xa_lock); +lockdep_assert_held (&node->array->xa_lock);if (node->count && node->count == node->nr_values) {if (list_empty (&node->private_list)) {
---
base-commit: 856ddd6c69a1a1935f32de8411550d997bcbe6f5
change-id: 20250421-workingset-simplify-eef38019a78c
Best regards,
Signature · 1 line
Pedro Falcato <[email protected]>
Quoted 23 lines · Pedro Falcato
container_of(node->array, ..., i_pages)just to accessi_pagesagain is an incredibly roundabout way of accessingnode->arrayitself. Simplify it.Signed-off-by Pedro Falcato <[email protected]>--- mm/workingset.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)mm/workingset.c +0
-1@@ -612,7 +612,6 @@ struct list_lru shadow_nodes;void workingset_update_node (struct xa_node *node) { -struct address_space *mapping;struct page *page =virt_to_page (node);/*
mm/workingset.c void workingset_update_node(struct xa_node *node) · line 628
Quoted 9 lines
mm/workingset.c +1
-2@@ -623,8 +622,7 @@ void workingset_update_node(struct xa_node *node)* already where they should be. The list_empty() test is safe * as node->private_list is protected by the i_pages lock. */ - mapping = container_of(node->array, struct address_space, i_pages); -lockdep_assert_held (&mapping->i_pages.xa_lock); +lockdep_assert_held (&node->array->xa_lock);if (node->count && node->count == node->nr_values) {if (list_empty (&node->private_list)) {
Actually, not sure if this is wanted given the original code is a little more explicit on what the lock is. +CC the original author
If people think this is worse, just drop the patch, I don't really care - was just checking out the function for other purposes and found this bit a little confusing.
Signature · 1 line
Pedro
Matthew Wilcox
Reviewed-byQuoted 5 lines · Pedro Falcato
Actually, not sure if this is wanted given the original code is a little more explicit on what the lock is. +CC the original author
If people think this is worse, just drop the patch, I don't really care - was just checking out the function for other purposes and found this bit a little confusing.
I think it's clearer.
Quoted 3 lines · Pedro Falcato
container_of(node->array, ..., i_pages)just to accessi_pagesagain is an incredibly roundabout way of accessingnode->arrayitself. Simplify it.
Agreed. The other side is shadow_lru_isolate() which goes also goes through mapping->i_pages. That's probably how it came to be. But your patch doesn't make that relationship any harder to understand.
Quoted 1 line
Signed-off-by Pedro Falcato <[email protected]>
Thanks