Commit 19b6caf4 authored by Chris Mason's avatar Chris Mason

Btrfs: reduce extent_state lock contention for metadata

For metadata buffers that don't straddle pages (all of them), btrfs
can safely use the page uptodate bits and extent_buffer uptodate bit
instead of needing to use the extent_state tree.

This greatly reduces contention on the state tree lock.
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 31533fb2
...@@ -3268,6 +3268,22 @@ int set_extent_buffer_dirty(struct extent_io_tree *tree, ...@@ -3268,6 +3268,22 @@ int set_extent_buffer_dirty(struct extent_io_tree *tree,
return was_dirty; return was_dirty;
} }
static int __eb_straddles_pages(u64 start, u64 len)
{
if (len < PAGE_CACHE_SIZE)
return 1;
if (start & (PAGE_CACHE_SIZE - 1))
return 1;
if ((start + len) & (PAGE_CACHE_SIZE - 1))
return 1;
return 0;
}
static int eb_straddles_pages(struct extent_buffer *eb)
{
return __eb_straddles_pages(eb->start, eb->len);
}
int clear_extent_buffer_uptodate(struct extent_io_tree *tree, int clear_extent_buffer_uptodate(struct extent_io_tree *tree,
struct extent_buffer *eb, struct extent_buffer *eb,
struct extent_state **cached_state) struct extent_state **cached_state)
...@@ -3279,8 +3295,10 @@ int clear_extent_buffer_uptodate(struct extent_io_tree *tree, ...@@ -3279,8 +3295,10 @@ int clear_extent_buffer_uptodate(struct extent_io_tree *tree,
num_pages = num_extent_pages(eb->start, eb->len); num_pages = num_extent_pages(eb->start, eb->len);
clear_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags); clear_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags);
clear_extent_uptodate(tree, eb->start, eb->start + eb->len - 1, if (eb_straddles_pages(eb)) {
cached_state, GFP_NOFS); clear_extent_uptodate(tree, eb->start, eb->start + eb->len - 1,
cached_state, GFP_NOFS);
}
for (i = 0; i < num_pages; i++) { for (i = 0; i < num_pages; i++) {
page = extent_buffer_page(eb, i); page = extent_buffer_page(eb, i);
if (page) if (page)
...@@ -3298,8 +3316,10 @@ int set_extent_buffer_uptodate(struct extent_io_tree *tree, ...@@ -3298,8 +3316,10 @@ int set_extent_buffer_uptodate(struct extent_io_tree *tree,
num_pages = num_extent_pages(eb->start, eb->len); num_pages = num_extent_pages(eb->start, eb->len);
set_extent_uptodate(tree, eb->start, eb->start + eb->len - 1, if (eb_straddles_pages(eb)) {
NULL, GFP_NOFS); set_extent_uptodate(tree, eb->start, eb->start + eb->len - 1,
NULL, GFP_NOFS);
}
for (i = 0; i < num_pages; i++) { for (i = 0; i < num_pages; i++) {
page = extent_buffer_page(eb, i); page = extent_buffer_page(eb, i);
if ((i == 0 && (eb->start & (PAGE_CACHE_SIZE - 1))) || if ((i == 0 && (eb->start & (PAGE_CACHE_SIZE - 1))) ||
...@@ -3322,9 +3342,12 @@ int extent_range_uptodate(struct extent_io_tree *tree, ...@@ -3322,9 +3342,12 @@ int extent_range_uptodate(struct extent_io_tree *tree,
int uptodate; int uptodate;
unsigned long index; unsigned long index;
ret = test_range_bit(tree, start, end, EXTENT_UPTODATE, 1, NULL); if (__eb_straddles_pages(start, end - start + 1)) {
if (ret) ret = test_range_bit(tree, start, end,
return 1; EXTENT_UPTODATE, 1, NULL);
if (ret)
return 1;
}
while (start <= end) { while (start <= end) {
index = start >> PAGE_CACHE_SHIFT; index = start >> PAGE_CACHE_SHIFT;
page = find_get_page(tree->mapping, index); page = find_get_page(tree->mapping, index);
...@@ -3352,10 +3375,12 @@ int extent_buffer_uptodate(struct extent_io_tree *tree, ...@@ -3352,10 +3375,12 @@ int extent_buffer_uptodate(struct extent_io_tree *tree,
if (test_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags)) if (test_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags))
return 1; return 1;
ret = test_range_bit(tree, eb->start, eb->start + eb->len - 1, if (eb_straddles_pages(eb)) {
EXTENT_UPTODATE, 1, cached_state); ret = test_range_bit(tree, eb->start, eb->start + eb->len - 1,
if (ret) EXTENT_UPTODATE, 1, cached_state);
return ret; if (ret)
return ret;
}
num_pages = num_extent_pages(eb->start, eb->len); num_pages = num_extent_pages(eb->start, eb->len);
for (i = 0; i < num_pages; i++) { for (i = 0; i < num_pages; i++) {
...@@ -3388,9 +3413,11 @@ int read_extent_buffer_pages(struct extent_io_tree *tree, ...@@ -3388,9 +3413,11 @@ int read_extent_buffer_pages(struct extent_io_tree *tree,
if (test_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags)) if (test_bit(EXTENT_BUFFER_UPTODATE, &eb->bflags))
return 0; return 0;
if (test_range_bit(tree, eb->start, eb->start + eb->len - 1, if (eb_straddles_pages(eb)) {
EXTENT_UPTODATE, 1, NULL)) { if (test_range_bit(tree, eb->start, eb->start + eb->len - 1,
return 0; EXTENT_UPTODATE, 1, NULL)) {
return 0;
}
} }
if (start) { if (start) {
......
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