Skip to contentSkip to conversation

mm/truncate: reset xa_has_values flag on each iteration

PATCH Applied Shakeel Butt 3 participants 6 messages Oct 2, 2024 – Oct 6, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm/truncate: reset xa_has_values flag on each iteration

Currently mapping_try_invalidate() and invalidate_inode_pages2_range() traverses the xarray in batches and then for each batch, maintains and set the flag named xa_has_values if the batch has a shadow entry to clear the entries at the end of the iteration. However they forgot to reset the flag at the end of the iteration which cause them to always try to clear the shadow entries in the subsequent iterations where there might not be any shadow entries. Fixing it.

Fixes 61c663e020d2 ("mm/truncate: batch-clear shadow entries")
---
 mm/truncate.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
mm/truncate.c +2 -2
index 520c8cf8f58f..e5151703ba04 100644
@@ -463,10 +463,10 @@ unsigned long mapping_try_invalidate(struct address_space *mapping,
 	unsigned long ret;
 	unsigned long count = 0;
 	int i;
-	bool xa_has_values = false;
 
 	folio_batch_init(&fbatch);
 	while (find_lock_entries(mapping, &index, end, &fbatch, indices)) {
+		bool xa_has_values = false;
 		int nr = folio_batch_count(&fbatch);
 
 		for (i = 0; i < nr; i++) {
@@ -592,7 +592,6 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
 	int ret = 0;
 	int ret2 = 0;
 	int did_range_unmap = 0;
-	bool xa_has_values = false;
 
 	if (mapping_empty(mapping))
 		return 0;
@@ -600,6 +599,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
 	folio_batch_init(&fbatch);
 	index = start;
 	while (find_get_entries(mapping, &index, end, &fbatch, indices)) {
+		bool xa_has_values = false;
 		int nr = folio_batch_count(&fbatch);
 
 		for (i = 0; i < nr; i++) {
Signature · 1 line
2.43.5
maintainer
#1 lore raw
Quoted 8 lines · On Wed, 2 Oct 2024 15:51:50 -0700 Shakeel Butt <[email protected]> wrote:

Currently mapping_try_invalidate() and invalidate_inode_pages2_range() traverses the xarray in batches and then for each batch, maintains and set the flag named xa_has_values if the batch has a shadow entry to clear the entries at the end of the iteration. However they forgot to reset the flag at the end of the iteration which cause them to always try to clear the shadow entries in the subsequent iterations where there might not be any shadow entries. Fixing it.

So this is an efficiency thing, no other effects expected?

Quoted 32 lines
mm/truncate.c +2 -2
@@ -463,10 +463,10 @@ unsigned long mapping_try_invalidate(struct address_space *mapping,
 	unsigned long ret;
 	unsigned long count = 0;
 	int i;
-	bool xa_has_values = false;
 
 	folio_batch_init(&fbatch);
 	while (find_lock_entries(mapping, &index, end, &fbatch, indices)) {
+		bool xa_has_values = false;
 		int nr = folio_batch_count(&fbatch);
 
 		for (i = 0; i < nr; i++) {
@@ -592,7 +592,6 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
 	int ret = 0;
 	int ret2 = 0;
 	int did_range_unmap = 0;
-	bool xa_has_values = false;
 
 	if (mapping_empty(mapping))
 		return 0;
@@ -600,6 +599,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
 	folio_batch_init(&fbatch);
 	index = start;
 	while (find_get_entries(mapping, &index, end, &fbatch, indices)) {
+		bool xa_has_values = false;
 		int nr = folio_batch_count(&fbatch);
 
 		for (i = 0; i < nr; i++) {
Signature · 1 line
2.43.5
#2 lore raw
Quoted 11 lines · Andrew Morton
Quoted 8 lines · On Wed, 2 Oct 2024 15:51:50 -0700 Shakeel Butt <[email protected]> wrote:

Currently mapping_try_invalidate() and invalidate_inode_pages2_range() traverses the xarray in batches and then for each batch, maintains and set the flag named xa_has_values if the batch has a shadow entry to clear the entries at the end of the iteration. However they forgot to reset the flag at the end of the iteration which cause them to always try to clear the shadow entries in the subsequent iterations where there might not be any shadow entries. Fixing it.

Quoted 2 lines

So this is an efficiency thing, no other effects expected?

Correct, just an efficiency thing.

maintainer
#3 lore raw
Quoted 12 lines · On Wed, 2 Oct 2024 16:09:11 -0700 Shakeel Butt <[email protected]> wrote:
Quoted 11 lines · Andrew Morton
Quoted 8 lines · On Wed, 2 Oct 2024 15:51:50 -0700 Shakeel Butt <[email protected]> wrote:

Currently mapping_try_invalidate() and invalidate_inode_pages2_range() traverses the xarray in batches and then for each batch, maintains and set the flag named xa_has_values if the batch has a shadow entry to clear the entries at the end of the iteration. However they forgot to reset the flag at the end of the iteration which cause them to always try to clear the shadow entries in the subsequent iterations where there might not be any shadow entries. Fixing it.

Quoted 4 lines
Quoted 2 lines

So this is an efficiency thing, no other effects expected?

Correct, just an efficiency thing.

Thanks. I'm assuming the benfits are sufficiently small that a backport is inappropriate.

#4 lore raw
Quoted 14 lines · Andrew Morton
Quoted 12 lines · On Wed, 2 Oct 2024 16:09:11 -0700 Shakeel Butt <[email protected]> wrote:
Quoted 11 lines · Andrew Morton
Quoted 8 lines · On Wed, 2 Oct 2024 15:51:50 -0700 Shakeel Butt <[email protected]> wrote:

Currently mapping_try_invalidate() and invalidate_inode_pages2_range() traverses the xarray in batches and then for each batch, maintains and set the flag named xa_has_values if the batch has a shadow entry to clear the entries at the end of the iteration. However they forgot to reset the flag at the end of the iteration which cause them to always try to clear the shadow entries in the subsequent iterations where there might not be any shadow entries. Fixing it.

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

So this is an efficiency thing, no other effects expected?

Correct, just an efficiency thing.

Thanks. I'm assuming the benfits are sufficiently small that a backport is inappropriate.

I agree.

Acked-by on v1 1/1
#5 lore raw
In reply to Shakeel Butt
Quoted 11 lines · Shakeel Butt

Currently mapping_try_invalidate() and invalidate_inode_pages2_range() traverses the xarray in batches and then for each batch, maintains and set the flag named xa_has_values if the batch has a shadow entry to clear the entries at the end of the iteration. However they forgot to reset the flag at the end of the iteration which cause them to always try to clear the shadow entries in the subsequent iterations where there might not be any shadow entries. Fixing it.

Fixes 61c663e020d2 ("mm/truncate: batch-clear shadow entries")