Commit 397c6bba authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Luis Henriques

dm bufio: when done scanning return from __scan immediately

commit 0e825862 upstream.

When __scan frees the required number of buffer entries that the
shrinker requested (nr_to_scan becomes zero) it must return.  Before
this fix the __scan code exited only the inner loop and continued in the
outer loop -- which could result in reduced performance due to extra
buffers being freed (e.g. unnecessarily evicted thinp metadata needing
to be synchronously re-read into bufio's cache).

Also, move dm_bufio_cond_resched to __scan's inner loop, so that
iterating the bufio client's lru lists doesn't result in scheduling
latency.
Reported-by: default avatarJoe Thornber <thornber@redhat.com>
Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent fd5d12b9
...@@ -1486,10 +1486,10 @@ static long __scan(struct dm_bufio_client *c, unsigned long nr_to_scan, ...@@ -1486,10 +1486,10 @@ static long __scan(struct dm_bufio_client *c, unsigned long nr_to_scan,
list_for_each_entry_safe_reverse(b, tmp, &c->lru[l], lru_list) { list_for_each_entry_safe_reverse(b, tmp, &c->lru[l], lru_list) {
freed += __cleanup_old_buffer(b, gfp_mask, 0); freed += __cleanup_old_buffer(b, gfp_mask, 0);
if (!--nr_to_scan) if (!--nr_to_scan)
break; return freed;
}
dm_bufio_cond_resched(); dm_bufio_cond_resched();
} }
}
return freed; return freed;
} }
......
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