Btrfs: optimize key searches in btrfs_search_slot
PATCH 1/1 Btrfs: optimize key searches in btrfs_search_slot
When the binary search returns 0 (exact match), the target key will necessarily be at slot 0 of all nodes below the current one, so in this case the binary search is not needed because it will always return 0, and we waste time doing it, holding node locks for longer than necessary, etc.
Below follow histograms with the times spent on the current approach of doing a binary search when the previous binary search returned 0, and times for the new approach, which directly picks the first item/child node in the leaf/node.
Current approach:
Count: 5013
Range: 25.000 - 497.000; Mean: 82.767; Median: 64.000; Stddev: 49.972
Percentiles: 90th: 141.000; 95th: 182.000; 99th: 287.000
25.000 - 33.930: 211 ###### 33.930 - 45.927: 277 ######## 45.927 - 62.045: 1834 ##################################################### 62.045 - 83.699: 1203 ################################### 83.699 - 112.789: 609 ################## 112.789 - 151.872: 450 ############# 151.872 - 204.377: 246 ####### 204.377 - 274.917: 124 #### 274.917 - 369.684: 48 # 369.684 - 497.000: 11 |
Approach proposed by this patch:
Count: 5013
Range: 10.000 - 8303.000; Mean: 28.505; Median: 18.000; Stddev: 119.147
Percentiles: 90th: 49.000; 95th: 74.000; 99th: 115.000
10.000 - 20.339: 3160 ##################################################### 20.339 - 40.397: 1131 ################### 40.397 - 79.308: 507 ######### 79.308 - 154.794: 199 ### 154.794 - 301.232: 14 | 301.232 - 585.313: 1 |
585.313 - 8303.000: 1 |
These samples were captured during a run of the btrfs tests 001, 002 and 004 in the xfstests, with a leaf/node size of 4Kb.
--- fs/btrfs/ctree.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-)
fs/btrfs/ctree.c +59 -2
@@ -2426,6 +2426,59 @@ done:return ret; } +static int key_search (struct extent_buffer *b,struct btrfs_key *key, +int level,int *prev_cmp,int *slot) +{ +unsigned long eb_offset =0 ; +unsigned long len_left = b->len; +char *kaddr =NULL ; +unsigned long map_start =0 ; +unsigned long map_len =0 ; +unsigned long offset; +struct btrfs_disk_key *k =NULL ; +struct btrfs_disk_key unaligned; + +if (*prev_cmp !=0 ) { + *prev_cmp =bin_search (b, key, level, slot); +return *prev_cmp; + } + +if (level ==0 ) + offset = offsetof(struct btrfs_leaf , items); +else + offset = offsetof(struct btrfs_node , ptrs); + +/* +* Map the entire extent buffer, otherwise callers can't access +* all keys/items of the leaf/node. Specially needed for case +* where leaf/node size is greater than page cache size. +*/ +while (len_left >0 ) { +unsigned long len =min (PAGE_CACHE_SIZE , len_left); +int err; + + err =map_private_extent_buffer (b, eb_offset, len, &kaddr, + &map_start, &map_len); + len_left -= len; + eb_offset += len; +if (k) +continue ; +if (!err) { + k = (struct btrfs_disk_key *)(kaddr + offset - + map_start); + }else { +read_extent_buffer (b, &unaligned, + offset,sizeof (unaligned)); + k = &unaligned; + } + } + +BUG_ON (comp_keys (k, key) !=0 ); + *slot =0 ; + +return 0 ; +} +/* * look for key in the tree. path is filled in with nodes along the way * if key is found, we return zero and you can find the item in the leaf
@@ -2454,6 +2507,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_rootint write_lock_level =0 ;u8 lowest_level =0 ;int min_write_lock_level; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (lowest_level && ins_len >0 );
@@ -2484,6 +2538,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root min_write_lock_level = write_lock_level; again: + prev_cmp =-1 ;/* * we try very hard to do read locks on the root */
@@ -2584,7 +2639,7 @@ cow_done:if (!cow)btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;
@@ -2719,6 +2774,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key,int level;int lowest_unlock =1 ;u8 lowest_level =0 ; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (p->nodes[0 ] !=NULL );
@@ -2729,6 +2785,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key, } again: + prev_cmp =-1 ; b =get_old_root (root, time_seq); level =btrfs_header_level (b); p->locks[level] =BTRFS_READ_LOCK ;
@@ -2746,7 +2803,7 @@ again:*/ btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;
Signature · 1 line
1.7.9.5
PATCH v2 1/1 Btrfs: optimize key searches in btrfs_search_slot
When the binary search returns 0 (exact match), the target key will necessarily be at slot 0 of all nodes below the current one, so in this case the binary search is not needed because it will always return 0, and we waste time doing it, holding node locks for longer than necessary, etc.
Below follow histograms with the times spent on the current approach of doing a binary search when the previous binary search returned 0, and times for the new approach, which directly picks the first item/child node in the leaf/node.
Current approach:
Count: 5013
Range: 25.000 - 497.000; Mean: 82.767; Median: 64.000; Stddev: 49.972
Percentiles: 90th: 141.000; 95th: 182.000; 99th: 287.000
25.000 - 33.930: 211 ###### 33.930 - 45.927: 277 ######## 45.927 - 62.045: 1834 ##################################################### 62.045 - 83.699: 1203 ################################### 83.699 - 112.789: 609 ################## 112.789 - 151.872: 450 ############# 151.872 - 204.377: 246 ####### 204.377 - 274.917: 124 #### 274.917 - 369.684: 48 # 369.684 - 497.000: 11 |
Approach proposed by this patch:
Count: 5013
Range: 10.000 - 8303.000; Mean: 28.505; Median: 18.000; Stddev: 119.147
Percentiles: 90th: 49.000; 95th: 74.000; 99th: 115.000
10.000 - 20.339: 3160 ##################################################### 20.339 - 40.397: 1131 ################### 40.397 - 79.308: 507 ######### 79.308 - 154.794: 199 ### 154.794 - 301.232: 14 | 301.232 - 585.313: 1 |
585.313 - 8303.000: 1 |
These samples were captured during a run of the btrfs tests 001, 002 and 004 in the xfstests, with a leaf/node size of 4Kb.
---
V2: Simplified code, removed unnecessary code.
fs/btrfs/ctree.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-)
fs/btrfs/ctree.c +42 -2
@@ -2426,6 +2426,42 @@ done:return ret; } +static int key_search (struct extent_buffer *b,struct btrfs_key *key, +int level,int *prev_cmp,int *slot) +{ +char *kaddr =NULL ; +unsigned long map_start =0 ; +unsigned long map_len =0 ; +unsigned long offset; +struct btrfs_disk_key *k =NULL ; +struct btrfs_disk_key unaligned; +int err; + +if (*prev_cmp !=0 ) { + *prev_cmp =bin_search (b, key, level, slot); +return *prev_cmp; + } + +if (level ==0 ) + offset = offsetof(struct btrfs_leaf , items); +else + offset = offsetof(struct btrfs_node , ptrs); + + err =map_private_extent_buffer (b, offset,sizeof (struct btrfs_disk_key ), + &kaddr, &map_start, &map_len); +if (!err) { + k = (struct btrfs_disk_key *)(kaddr + offset - map_start); + }else { +read_extent_buffer (b, &unaligned, offset,sizeof (unaligned)); + k = &unaligned; + } + +BUG_ON (comp_keys (k, key) !=0 ); + *slot =0 ; + +return 0 ; +} +/* * look for key in the tree. path is filled in with nodes along the way * if key is found, we return zero and you can find the item in the leaf
@@ -2454,6 +2490,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_rootint write_lock_level =0 ;u8 lowest_level =0 ;int min_write_lock_level; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (lowest_level && ins_len >0 );
@@ -2484,6 +2521,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root min_write_lock_level = write_lock_level; again: + prev_cmp =-1 ;/* * we try very hard to do read locks on the root */
@@ -2584,7 +2622,7 @@ cow_done:if (!cow)btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;
@@ -2719,6 +2757,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key,int level;int lowest_unlock =1 ;u8 lowest_level =0 ; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (p->nodes[0 ] !=NULL );
@@ -2729,6 +2768,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key, } again: + prev_cmp =-1 ; b =get_old_root (root, time_seq); level =btrfs_header_level (b); p->locks[level] =BTRFS_READ_LOCK ;
@@ -2746,7 +2786,7 @@ again:*/ btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;
Signature · 1 line
1.7.9.5
Quoted 93 lines · Filipe David Borba Manana
When the binary search returns 0 (exact match), the target key will necessarily be at slot 0 of all nodes below the current one, so in this case the binary search is not needed because it will always return 0, and we waste time doing it, holding node locks for longer than necessary, etc.
Below follow histograms with the times spent on the current approach of doing a binary search when the previous binary search returned 0, and times for the new approach, which directly picks the first item/child node in the leaf/node.
Current approach:
Count: 5013
Range: 25.000 - 497.000; Mean: 82.767; Median: 64.000; Stddev: 49.972
Percentiles: 90th: 141.000; 95th: 182.000; 99th: 287.00025.000 - 33.930: 211 ###### 33.930 - 45.927: 277 ######## 45.927 - 62.045: 1834 ##################################################### 62.045 - 83.699: 1203 ################################### 83.699 - 112.789: 609 ################## 112.789 - 151.872: 450 ############# 151.872 - 204.377: 246 ####### 204.377 - 274.917: 124 #### 274.917 - 369.684: 48 # 369.684 - 497.000: 11 |Approach proposed by this patch:
Count: 5013
Range: 10.000 - 8303.000; Mean: 28.505; Median: 18.000; Stddev: 119.147
Percentiles: 90th: 49.000; 95th: 74.000; 99th: 115.00010.000 - 20.339: 3160 ##################################################### 20.339 - 40.397: 1131 ################### 40.397 - 79.308: 507 ######### 79.308 - 154.794: 199 ### 154.794 - 301.232: 14 | 301.232 - 585.313: 1 |585.313 - 8303.000: 1 |
These samples were captured during a run of the btrfs tests 001, 002 and 004 in the xfstests, with a leaf/node size of 4Kb.
Signed-off-by Filipe David Borba Manana <[email protected]>--- fs/btrfs/ctree.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-)fs/btrfs/ctree.c +37
-0@@ -2426,6 +2426,59 @@ done:return ret; } +static int key_search (struct extent_buffer *b,struct btrfs_key *key, +int level,int *prev_cmp,int *slot) +{ +unsigned long eb_offset =0 ; +unsigned long len_left = b->len; +char *kaddr =NULL ; +unsigned long map_start =0 ; +unsigned long map_len =0 ; +unsigned long offset; +struct btrfs_disk_key *k =NULL ; +struct btrfs_disk_key unaligned; + +if (*prev_cmp !=0 ) { + *prev_cmp =bin_search (b, key, level, slot); +return *prev_cmp; + } + +if (level ==0 ) + offset = offsetof(struct btrfs_leaf , items); +else + offset = offsetof(struct btrfs_node , ptrs); + +/* +* Map the entire extent buffer, otherwise callers can't access +* all keys/items of the leaf/node. Specially needed for case +* where leaf/node size is greater than page cache size. +*/ +while (len_left >0 ) { +unsigned long len =min (PAGE_CACHE_SIZE , len_left); +int err; + + err =map_private_extent_buffer (b, eb_offset, len, &kaddr, + &map_start, &map_len); + len_left -= len; + eb_offset += len; +if (k) +continue ;
fs/btrfs/ctree.c done: · line 2475
Quoted 10 lines
fs/btrfs/ctree.c +10
-0+if (!err) { + k = (struct btrfs_disk_key *)(kaddr + offset - + map_start); + }else { +read_extent_buffer (b, &unaligned, + offset,sizeof (unaligned)); + k = &unaligned; + } + } +
This confuses me, if we're at slot 0 we should be at the front of the first page, no matter what, so why not just read the first key and carry on?
fs/btrfs/ctree.c done: · line 2476
Quoted 1 line
fs/btrfs/ctree.c +1
-0+BUG_ON (comp_keys (k, key) !=0 );
Please use the ASSERT() macro. Thanks,
Josef
Quoted 99 lines · Josef Bacik
Quoted 98 lines · Filipe David Borba Manana
When the binary search returns 0 (exact match), the target key will necessarily be at slot 0 of all nodes below the current one, so in this case the binary search is not needed because it will always return 0, and we waste time doing it, holding node locks for longer than necessary, etc.
Below follow histograms with the times spent on the current approach of doing a binary search when the previous binary search returned 0, and times for the new approach, which directly picks the first item/child node in the leaf/node.
Current approach:
Count: 5013
Range: 25.000 - 497.000; Mean: 82.767; Median: 64.000; Stddev: 49.972
Percentiles: 90th: 141.000; 95th: 182.000; 99th: 287.00025.000 - 33.930: 211 ###### 33.930 - 45.927: 277 ######## 45.927 - 62.045: 1834 ##################################################### 62.045 - 83.699: 1203 ################################### 83.699 - 112.789: 609 ################## 112.789 - 151.872: 450 ############# 151.872 - 204.377: 246 ####### 204.377 - 274.917: 124 #### 274.917 - 369.684: 48 # 369.684 - 497.000: 11 |Approach proposed by this patch:
Count: 5013
Range: 10.000 - 8303.000; Mean: 28.505; Median: 18.000; Stddev: 119.147
Percentiles: 90th: 49.000; 95th: 74.000; 99th: 115.00010.000 - 20.339: 3160 ##################################################### 20.339 - 40.397: 1131 ################### 40.397 - 79.308: 507 ######### 79.308 - 154.794: 199 ### 154.794 - 301.232: 14 | 301.232 - 585.313: 1 |585.313 - 8303.000: 1 |
These samples were captured during a run of the btrfs tests 001, 002 and 004 in the xfstests, with a leaf/node size of 4Kb.
Signed-off-by Filipe David Borba Manana <[email protected]>--- fs/btrfs/ctree.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-)fs/btrfs/ctree.c +42
-0@@ -2426,6 +2426,59 @@ done:return ret; } +static int key_search (struct extent_buffer *b,struct btrfs_key *key, +int level,int *prev_cmp,int *slot) +{ +unsigned long eb_offset =0 ; +unsigned long len_left = b->len; +char *kaddr =NULL ; +unsigned long map_start =0 ; +unsigned long map_len =0 ; +unsigned long offset; +struct btrfs_disk_key *k =NULL ; +struct btrfs_disk_key unaligned; + +if (*prev_cmp !=0 ) { + *prev_cmp =bin_search (b, key, level, slot); +return *prev_cmp; + } + +if (level ==0 ) + offset = offsetof(struct btrfs_leaf , items); +else + offset = offsetof(struct btrfs_node , ptrs); + +/* +* Map the entire extent buffer, otherwise callers can't access +* all keys/items of the leaf/node. Specially needed for case +* where leaf/node size is greater than page cache size. +*/ +while (len_left >0 ) { +unsigned long len =min (PAGE_CACHE_SIZE , len_left); +int err; + + err =map_private_extent_buffer (b, eb_offset, len, &kaddr, + &map_start, &map_len); + len_left -= len; + eb_offset += len; +if (k) +continue ; +if (!err) { + k = (struct btrfs_disk_key *)(kaddr + offset - + map_start); + }else { + read_extent_buffer(b, &unaligned,
Quoted 8 lines
fs/btrfs/ctree.c done: · line 2475
Quoted 5 lines
fs/btrfs/ctree.c +5
-0+ offset, sizeof(unaligned)); + k = &unaligned; + } + } +This confuses me, if we're at slot 0 we should be at the front of the first page, no matter what, so why not just read the first key and carry on?
Correct. Mistake of mine, corrected in the second patch version. I was having NULL pointer dereferences in read_extent_buffer when the leaf/node sizes were bigger than page cache size. Turned out to be a mistake from me, and no need to do the whole mapping on page size units.
Quoted 4 lines
fs/btrfs/ctree.c done: · line 2476
Quoted 2 lines
fs/btrfs/ctree.c +1
-0+BUG_ON (comp_keys (k, key) !=0 );Please use the
ASSERT()macro. Thanks,
Ok, updating it.
Thanks Josef.
Quoted 2 lines
Josef
Signature · 5 lines
Filipe David Manana, "Reasonable men adapt themselves to the world. Unreasonable men adapt the world to themselves. That's why all progress depends on unreasonable men."
PATCH v3 1/1 Btrfs: optimize key searches in btrfs_search_slot
In reply to Filipe David Borba MananaWhen the binary search returns 0 (exact match), the target key will necessarily be at slot 0 of all nodes below the current one, so in this case the binary search is not needed because it will always return 0, and we waste time doing it, holding node locks for longer than necessary, etc.
Below follow histograms with the times spent on the current approach of doing a binary search when the previous binary search returned 0, and times for the new approach, which directly picks the first item/child node in the leaf/node.
Current approach:
Count: 5013
Range: 25.000 - 497.000; Mean: 82.767; Median: 64.000; Stddev: 49.972
Percentiles: 90th: 141.000; 95th: 182.000; 99th: 287.000
25.000 - 33.930: 211 ###### 33.930 - 45.927: 277 ######## 45.927 - 62.045: 1834 ##################################################### 62.045 - 83.699: 1203 ################################### 83.699 - 112.789: 609 ################## 112.789 - 151.872: 450 ############# 151.872 - 204.377: 246 ####### 204.377 - 274.917: 124 #### 274.917 - 369.684: 48 # 369.684 - 497.000: 11 |
Approach proposed by this patch:
Count: 5013
Range: 10.000 - 8303.000; Mean: 28.505; Median: 18.000; Stddev: 119.147
Percentiles: 90th: 49.000; 95th: 74.000; 99th: 115.000
10.000 - 20.339: 3160 ##################################################### 20.339 - 40.397: 1131 ################### 40.397 - 79.308: 507 ######### 79.308 - 154.794: 199 ### 154.794 - 301.232: 14 | 301.232 - 585.313: 1 |
585.313 - 8303.000: 1 |
These samples were captured during a run of the btrfs tests 001, 002 and 004 in the xfstests, with a leaf/node size of 4Kb.
---
V2: Simplified code, removed unnecessary code.
V3: Replaced BUG_ON() with the new ASSERT() from Josef.
fs/btrfs/ctree.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-)
fs/btrfs/ctree.c +42 -2
@@ -2426,6 +2426,42 @@ done:return ret; } +static int key_search (struct extent_buffer *b,struct btrfs_key *key, +int level,int *prev_cmp,int *slot) +{ +char *kaddr =NULL ; +unsigned long map_start =0 ; +unsigned long map_len =0 ; +unsigned long offset; +struct btrfs_disk_key *k =NULL ; +struct btrfs_disk_key unaligned; +int err; + +if (*prev_cmp !=0 ) { + *prev_cmp =bin_search (b, key, level, slot); +return *prev_cmp; + } + +if (level ==0 ) + offset = offsetof(struct btrfs_leaf , items); +else + offset = offsetof(struct btrfs_node , ptrs); + + err =map_private_extent_buffer (b, offset,sizeof (struct btrfs_disk_key ), + &kaddr, &map_start, &map_len); +if (!err) { + k = (struct btrfs_disk_key *)(kaddr + offset - map_start); + }else { +read_extent_buffer (b, &unaligned, offset,sizeof (unaligned)); + k = &unaligned; + } + +ASSERT (comp_keys (k, key) ==0 ); + *slot =0 ; + +return 0 ; +} +/* * look for key in the tree. path is filled in with nodes along the way * if key is found, we return zero and you can find the item in the leaf
@@ -2454,6 +2490,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_rootint write_lock_level =0 ;u8 lowest_level =0 ;int min_write_lock_level; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (lowest_level && ins_len >0 );
@@ -2484,6 +2521,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root min_write_lock_level = write_lock_level; again: + prev_cmp =-1 ;/* * we try very hard to do read locks on the root */
@@ -2584,7 +2622,7 @@ cow_done:if (!cow)btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;
@@ -2719,6 +2757,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key,int level;int lowest_unlock =1 ;u8 lowest_level =0 ; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (p->nodes[0 ] !=NULL );
@@ -2729,6 +2768,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key, } again: + prev_cmp =-1 ; b =get_old_root (root, time_seq); level =btrfs_header_level (b); p->locks[level] =BTRFS_READ_LOCK ;
@@ -2746,7 +2786,7 @@ again:*/ btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;
Signature · 1 line
1.7.9.5
Quoted 11 lines · Filipe David Borba Manana
When the binary search returns 0 (exact match), the target key will necessarily be at slot 0 of all nodes below the current one, so in this case the binary search is not needed because it will always return 0, and we waste time doing it, holding node locks for longer than necessary, etc.
Below follow histograms with the times spent on the current approach of doing a binary search when the previous binary search returned 0, and times for the new approach, which directly picks the first item/child node in the leaf/node.
Quoted 7 lines
Count: 5013
Range: 25.000 - 497.000; Mean: 82.767; Median: 64.000; Stddev: 49.972
Percentiles: 90th: 141.000; 95th: 182.000; 99th: 287.000Count: 5013
Range: 10.000 - 8303.000; Mean: 28.505; Median: 18.000; Stddev: 119.147
Percentiles: 90th: 49.000; 95th: 74.000; 99th: 115.000
Where'd the giant increase in the range max come from? Just jittery measurement? Maybe get a lot more data points to smooth that out?
Quoted 10 lines
fs/btrfs/ctree.c +10
-0+static int key_search (struct extent_buffer *b,struct btrfs_key *key, +int level,int *prev_cmp,int *slot) +{ +char *kaddr =NULL ; +unsigned long map_start =0 ; +unsigned long map_len =0 ; +unsigned long offset; +struct btrfs_disk_key *k =NULL ; +struct btrfs_disk_key unaligned; +int err;
fs/btrfs/ctree.c done: · line 2462
Quoted 10 lines
fs/btrfs/ctree.c +8
-0+ +if (*prev_cmp !=0 ) { + *prev_cmp =bin_search (b, key, level, slot); +return *prev_cmp; + } + *slot =0 ; + +return 0 ;
So this is the actual work done by the function.
fs/btrfs/ctree.c done: · line 2448
Quoted 5 lines
fs/btrfs/ctree.c +5
-0+ +if (level ==0 ) + offset = offsetof(struct btrfs_leaf , items); +else + offset = offsetof(struct btrfs_node , ptrs);
(+10 fragility points for assuming that the key starts each struct instead of using [0].key)
fs/btrfs/ctree.c done: · line 2459
Quoted 11 lines
fs/btrfs/ctree.c +11
-0+ + err =map_private_extent_buffer (b, offset,sizeof (struct btrfs_disk_key ), + &kaddr, &map_start, &map_len); +if (!err) { + k = (struct btrfs_disk_key *)(kaddr + offset - map_start); + }else { +read_extent_buffer (b, &unaligned, offset,sizeof (unaligned)); + k = &unaligned; + } + +ASSERT (comp_keys (k, key) ==0 );
All of the rest of the function, including most of the local variables, is overhead for that assertion. We don't actually care about the relative sorted key position of the two keys so we don't need smart field-aware comparisions. We can use a dumb memcmp.
We can replace all that stuff with two easy memcmp_extent_buffers() which vanish if ASSERT is a nop.
if (level) ASSERT(!memcmp_extent_buffer(b, key, offsetof(struct btrfs_node, ptrs[0].key), sizeof(*key))); else ASSERT(!memcmp_extent_buffer(b, key, offsetof(struct btrfs_leaf, items[0].key), sizeof(*key)));
Right?
- z
Quoted 72 lines · Zach Brown
Quoted 11 lines · Filipe David Borba Manana
When the binary search returns 0 (exact match), the target key will necessarily be at slot 0 of all nodes below the current one, so in this case the binary search is not needed because it will always return 0, and we waste time doing it, holding node locks for longer than necessary, etc.
Below follow histograms with the times spent on the current approach of doing a binary search when the previous binary search returned 0, and times for the new approach, which directly picks the first item/child node in the leaf/node.
Quoted 7 lines
Count: 5013
Range: 25.000 - 497.000; Mean: 82.767; Median: 64.000; Stddev: 49.972
Percentiles: 90th: 141.000; 95th: 182.000; 99th: 287.000Count: 5013
Range: 10.000 - 8303.000; Mean: 28.505; Median: 18.000; Stddev: 119.147
Percentiles: 90th: 49.000; 95th: 74.000; 99th: 115.000Where'd the giant increase in the range max come from? Just jittery measurement? Maybe get a lot more data points to smooth that out?
Quoted 10 lines
fs/btrfs/ctree.c +10
-0+static int key_search (struct extent_buffer *b,struct btrfs_key *key, +int level,int *prev_cmp,int *slot) +{ +char *kaddr =NULL ; +unsigned long map_start =0 ; +unsigned long map_len =0 ; +unsigned long offset; +struct btrfs_disk_key *k =NULL ; +struct btrfs_disk_key unaligned; +int err;fs/btrfs/ctree.c done: · line 2462
Quoted 10 lines
fs/btrfs/ctree.c +8
-0+ +if (*prev_cmp !=0 ) { + *prev_cmp =bin_search (b, key, level, slot); +return *prev_cmp; + } + *slot =0 ; + +return 0 ;So this is the actual work done by the function.
fs/btrfs/ctree.c done: · line 2448
Quoted 5 lines
fs/btrfs/ctree.c +5
-0+ +if (level ==0 ) + offset = offsetof(struct btrfs_leaf , items); +else + offset = offsetof(struct btrfs_node , ptrs);(+10 fragility points for assuming that the key starts each struct instead of using [0].key)
fs/btrfs/ctree.c done: · line 2459
Quoted 11 lines
fs/btrfs/ctree.c +11
-0+ + err =map_private_extent_buffer (b, offset,sizeof (struct btrfs_disk_key ), + &kaddr, &map_start, &map_len); +if (!err) { + k = (struct btrfs_disk_key *)(kaddr + offset - map_start); + }else { +read_extent_buffer (b, &unaligned, offset,sizeof (unaligned)); + k = &unaligned; + } + +ASSERT (comp_keys (k, key) ==0 );All of the rest of the function, including most of the local variables, is overhead for that assertion. We don't actually care about the relative sorted key position of the two keys so we don't need smart field-aware comparisions. We can use a dumb memcmp.
Quoted 3 lines
We can replace all that stuff with two easy
memcmp_extent_buffers()which vanish if ASSERT is a nop.
Actually we can't since we have a cpu key and the keys in the eb are disk keys. So maybe keep what we have here and wrap it completely in CONFIG_BTRFS_ASSERT?
Josef
Quoted 5 lines
Quoted 2 lines
We can replace all that stuff with two easy
memcmp_extent_buffers()which vanish if ASSERT is a nop.Actually we can't since we have a cpu key and the keys in the eb are disk keys. So maybe keep what we have here and wrap it completely in
CONFIG_BTRFS_ASSERT?
I could have sworn that I checked that the input was a disk key.
In that case, then, I'd put all this off in a helper function that's called in the asserts that swabs to a disk key and then does the memcmp. All this fiddly assert junk (which just compares keys!) doesn't belong implemented by hand in this trivial helper.
- z
Quoted 16 lines · Zach Brown
Quoted 14 lines · Filipe David Borba Manana
When the binary search returns 0 (exact match), the target key will necessarily be at slot 0 of all nodes below the current one, so in this case the binary search is not needed because it will always return 0, and we waste time doing it, holding node locks for longer than necessary, etc.
Below follow histograms with the times spent on the current approach of doing a binary search when the previous binary search returned 0, and times for the new approach, which directly picks the first item/child node in the leaf/node.
Count: 5013
Range: 25.000 - 497.000; Mean: 82.767; Median: 64.000; Stddev: 49.972
Percentiles: 90th: 141.000; 95th: 182.000; 99th: 287.000
Quoted 6 lines
Quoted 3 lines
Count: 5013
Range: 10.000 - 8303.000; Mean: 28.505; Median: 18.000; Stddev: 119.147
Percentiles: 90th: 49.000; 95th: 74.000; 99th: 115.000Where'd the giant increase in the range max come from? Just jittery measurement? Maybe get a lot more data points to smooth that out?
Correct, just jittery.
Quoted 18 lines
Quoted 16 lines
fs/btrfs/ctree.c +15
-0+static int key_search (struct extent_buffer *b,struct btrfs_key *key, +int level,int *prev_cmp,int *slot) +{ +char *kaddr =NULL ; +unsigned long map_start =0 ; +unsigned long map_len =0 ; +unsigned long offset; +struct btrfs_disk_key *k =NULL ; +struct btrfs_disk_key unaligned; +int err; + +if (*prev_cmp !=0 ) { + *prev_cmp =bin_search (b, key, level, slot); +return *prev_cmp; + }
Quoted 5 lines
fs/btrfs/ctree.c done: · line 2462
Quoted 3 lines
fs/btrfs/ctree.c +3
-0+ *slot =0 ; + +return 0 ;So this is the actual work done by the function.
Correct. That and the very first if statement in the function.
Quoted 9 lines
fs/btrfs/ctree.c done: · line 2448
Quoted 6 lines
fs/btrfs/ctree.c +5
-0+ +if (level ==0 ) + offset = offsetof(struct btrfs_leaf , items); +else + offset = offsetof(struct btrfs_node , ptrs);(+10 fragility points for assuming that the key starts each struct instead of using [0].key)
Ok. I just copied that from ctree.c:bin_search(). I guess that gives another +10 fragility points.
Thanks for pointing out.
Quoted 30 lines
fs/btrfs/ctree.c done: · line 2459
Quoted 12 lines
fs/btrfs/ctree.c +11
-0+ + err =map_private_extent_buffer (b, offset,sizeof (struct btrfs_disk_key ), + &kaddr, &map_start, &map_len); +if (!err) { + k = (struct btrfs_disk_key *)(kaddr + offset - map_start); + }else { +read_extent_buffer (b, &unaligned, offset,sizeof (unaligned)); + k = &unaligned; + } + +ASSERT (comp_keys (k, key) ==0 );All of the rest of the function, including most of the local variables, is overhead for that assertion. We don't actually care about the relative sorted key position of the two keys so we don't need smart field-aware comparisions. We can use a dumb memcmp.
We can replace all that stuff with two easy
memcmp_extent_buffers()which vanish if ASSERT is a nop.if (level)
ASSERT(!memcmp_extent_buffer(b, key,
offsetof(struct btrfs_node, ptrs[0].key),sizeof(*key)));
else
ASSERT(!memcmp_extent_buffer(b, key,
offsetof(struct btrfs_leaf, items[0].key),sizeof(*key)));
Quoted 1 line
Right?
No, and as Josef just pointed, like that we compare a btrfs_key with a btrfs_disk_key, which is wrong due to endianess differences.
So I'll go for Josef's suggestion in the following mail about wrapping stuff with a CONFIG_BTRFS_ASSERT #ifdef macro.
Quoted 2 lines
- z
Signature · 5 lines
Filipe David Manana, "Reasonable men adapt themselves to the world. Unreasonable men adapt the world to themselves. That's why all progress depends on unreasonable men."
Quoted 11 lines
Quoted 7 lines
fs/btrfs/ctree.c done: · line 2448
Quoted 4 lines
fs/btrfs/ctree.c +4
-0+if (level ==0 ) + offset = offsetof(struct btrfs_leaf , items); +else + offset = offsetof(struct btrfs_node , ptrs);(+10 fragility points for assuming that the key starts each struct instead of using [0].key)
Ok. I just copied that from ctree.c:bin_search(). I guess that gives another +10 fragility points.
Thanks for pointing out.
Yeah. Don't worry, you have quite a way to go before building up personal fragility points that come anywhere near the wealth of fragility points that btrfs has in the bank :).
- z
PATCH v4 1/1 Btrfs: optimize key searches in btrfs_search_slot
In reply to Filipe David Borba MananaWhen the binary search returns 0 (exact match), the target key will necessarily be at slot 0 of all nodes below the current one, so in this case the binary search is not needed because it will always return 0, and we waste time doing it, holding node locks for longer than necessary, etc.
Below follow histograms with the times spent on the current approach of doing a binary search when the previous binary search returned 0, and times for the new approach, which directly picks the first item/child node in the leaf/node.
Current approach:
Count: 5013
Range: 25.000 - 497.000; Mean: 82.767; Median: 64.000; Stddev: 49.972
Percentiles: 90th: 141.000; 95th: 182.000; 99th: 287.000
25.000 - 33.930: 211 ###### 33.930 - 45.927: 277 ######## 45.927 - 62.045: 1834 ##################################################### 62.045 - 83.699: 1203 ################################### 83.699 - 112.789: 609 ################## 112.789 - 151.872: 450 ############# 151.872 - 204.377: 246 ####### 204.377 - 274.917: 124 #### 274.917 - 369.684: 48 # 369.684 - 497.000: 11 |
Approach proposed by this patch:
Count: 5013
Range: 10.000 - 8303.000; Mean: 28.505; Median: 18.000; Stddev: 119.147
Percentiles: 90th: 49.000; 95th: 74.000; 99th: 115.000
10.000 - 20.339: 3160 ##################################################### 20.339 - 40.397: 1131 ################### 40.397 - 79.308: 507 ######### 79.308 - 154.794: 199 ### 154.794 - 301.232: 14 | 301.232 - 585.313: 1 |
585.313 - 8303.000: 1 |
These samples were captured during a run of the btrfs tests 001, 002 and 004 in the xfstests, with a leaf/node size of 4Kb.
---
V2: Simplified code, removed unnecessary code.
V3: Replaced BUG_ON() with the new ASSERT() from Josef.
V4: Addressed latest comments from Zach Brown and Josef Bacik.
Surrounded all code that is used for the assertion with a #ifdef CONFIG_BTRFS_ASSERT ... #endif block. Also changed offset arguments to be more strictly correct.
fs/btrfs/ctree.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-)
fs/btrfs/ctree.c +41 -2
@@ -2426,6 +2426,41 @@ done:return ret; } +static void key_search_validate (struct extent_buffer *b, +struct btrfs_key *key, +int level) +{ +#ifdef CONFIG_BTRFS_ASSERT +struct btrfs_disk_key disk_key; + +btrfs_cpu_key_to_disk (&disk_key, key); + +if (level ==0 ) +ASSERT (!memcmp_extent_buffer (b, &disk_key, + offsetof(struct btrfs_leaf, items[0].key), + sizeof(disk_key))); +else +ASSERT (!memcmp_extent_buffer (b, &disk_key, + offsetof(struct btrfs_node, ptrs[0].key), + sizeof(disk_key))); +#endif +} + +static int key_search (struct extent_buffer *b,struct btrfs_key *key, +int level,int *prev_cmp,int *slot) +{ + +if (*prev_cmp !=0 ) { + *prev_cmp =bin_search (b, key, level, slot); +return *prev_cmp; + } + +key_search_validate (b, key, level); + *slot =0 ; + +return 0 ; +} +/* * look for key in the tree. path is filled in with nodes along the way * if key is found, we return zero and you can find the item in the leaf
@@ -2454,6 +2489,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_rootint write_lock_level =0 ;u8 lowest_level =0 ;int min_write_lock_level; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (lowest_level && ins_len >0 );
@@ -2484,6 +2520,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root min_write_lock_level = write_lock_level; again: + prev_cmp =-1 ;/* * we try very hard to do read locks on the root */
@@ -2584,7 +2621,7 @@ cow_done:if (!cow)btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;
@@ -2719,6 +2756,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key,int level;int lowest_unlock =1 ;u8 lowest_level =0 ; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (p->nodes[0 ] !=NULL );
@@ -2729,6 +2767,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key, } again: + prev_cmp =-1 ; b =get_old_root (root, time_seq); level =btrfs_header_level (b); p->locks[level] =BTRFS_READ_LOCK ;
@@ -2746,7 +2785,7 @@ again:*/ btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;
Signature · 1 line
1.7.9.5
Quoted 19 lines · Filipe David Borba Manana
Count: 5013
Range: 25.000 - 497.000; Mean: 82.767; Median: 64.000; Stddev: 49.972
Percentiles: 90th: 141.000; 95th: 182.000; 99th: 287.00025.000 - 33.930: 211 ###### 33.930 - 45.927: 277 ######## 45.927 - 62.045: 1834 ##################################################### 62.045 - 83.699: 1203 ################################### 83.699 - 112.789: 609 ################## 112.789 - 151.872: 450 ############# 151.872 - 204.377: 246 ####### 204.377 - 274.917: 124 #### 274.917 - 369.684: 48 # 369.684 - 497.000: 11 |Approach proposed by this patch:
Count: 5013
Range: 10.000 - 8303.000; Mean: 28.505; Median: 18.000; Stddev: 119.147
Percentiles: 90th: 49.000; 95th: 74.000; 99th: 115.000
Quoted 7 lines
10.000 - 20.339: 3160 ##################################################### 20.339 - 40.397: 1131 ################### 40.397 - 79.308: 507 ######### 79.308 - 154.794: 199 ### 154.794 - 301.232: 14 | 301.232 - 585.313: 1 |585.313 - 8303.000: 1 |
The statistics do not change from patch to patch+1 but you're doing changes that may affect performance, can you please update them as well?
thanks,
david
Quoted 28 lines · David Sterba
Quoted 19 lines · Filipe David Borba Manana
Count: 5013
Range: 25.000 - 497.000; Mean: 82.767; Median: 64.000; Stddev: 49.972
Percentiles: 90th: 141.000; 95th: 182.000; 99th: 287.00025.000 - 33.930: 211 ###### 33.930 - 45.927: 277 ######## 45.927 - 62.045: 1834 ##################################################### 62.045 - 83.699: 1203 ################################### 83.699 - 112.789: 609 ################## 112.789 - 151.872: 450 ############# 151.872 - 204.377: 246 ####### 204.377 - 274.917: 124 #### 274.917 - 369.684: 48 # 369.684 - 497.000: 11 |Approach proposed by this patch:
Count: 5013
Range: 10.000 - 8303.000; Mean: 28.505; Median: 18.000; Stddev: 119.147
Percentiles: 90th: 49.000; 95th: 74.000; 99th: 115.000Quoted 7 lines
10.000 - 20.339: 3160 ##################################################### 20.339 - 40.397: 1131 ################### 40.397 - 79.308: 507 ######### 79.308 - 154.794: 199 ### 154.794 - 301.232: 14 | 301.232 - 585.313: 1 |585.313 - 8303.000: 1 |
Quoted 2 lines
The statistics do not change from patch to patch+1 but you're doing changes that may affect performance, can you please update them as well?
Sure.
They're actually better now :)
Patch following with updated histograms.
Quoted 3 lines
thanks,
david
Signature · 5 lines
Filipe David Manana, "Reasonable men adapt themselves to the world. Unreasonable men adapt the world to themselves. That's why all progress depends on unreasonable men."
Quoted 2 lines · Filipe David Manana
Sure.
They're actually better now :)
Thanks. The numbers changed in both samples, but the relative difference is still 2x improvement in this particular test.
david
Quoted 6 lines · David Sterba
Quoted 2 lines · Filipe David Manana
Sure.
They're actually better now :)Thanks. The numbers changed in both samples, but the relative difference is still 2x improvement in this particular test.
I tend to favor the percentiles above everything else, and for these last comparison, they're all about 5x better. These times are for a single search node/leaf. The highest the level (where root is highest) an exact match first happens, the better it will be for the overall tree search operation, as more times this optimal code path will be executed.
Quoted 2 lines
david
Signature · 5 lines
Filipe David Manana, "Reasonable men adapt themselves to the world. Unreasonable men adapt the world to themselves. That's why all progress depends on unreasonable men."
PATCH v5 1/1 Btrfs: optimize key searches in btrfs_search_slot
In reply to Filipe David Borba MananaWhen the binary search returns 0 (exact match), the target key will necessarily be at slot 0 of all nodes below the current one, so in this case the binary search is not needed because it will always return 0, and we waste time doing it, holding node locks for longer than necessary, etc.
Below follow histograms with the times spent on the current approach of doing a binary search when the previous binary search returned 0, and times for the new approach, which directly picks the first item/child node in the leaf/node.
Current approach:
Count: 6682
Range: 35.000 - 8370.000; Mean: 85.837; Median: 75.000; Stddev: 106.429
Percentiles: 90th: 124.000; 95th: 145.000; 99th: 206.000
35.000 - 61.080: 1235 ################ 61.080 - 106.053: 4207 ##################################################### 106.053 - 183.606: 1122 ############## 183.606 - 317.341: 111 # 317.341 - 547.959: 6 | 547.959 - 8370.000: 1 |
Approach proposed by this patch:
Count: 6682 Range: 6.000 - 135.000; Mean: 16.690; Median: 16.000; Stddev: 7.160 Percentiles: 90th: 23.000; 95th: 27.000; 99th: 40.000 6.000 - 8.418: 58 # 8.418 - 11.670: 1149 ######################### 11.670 - 16.046: 2418 ##################################################### 16.046 - 21.934: 2098 ############################################## 21.934 - 29.854: 744 ################ 29.854 - 40.511: 154 ### 40.511 - 54.848: 41 # 54.848 - 74.136: 5 | 74.136 - 100.087: 9 | 100.087 - 135.000: 6 |
These samples were captured during a run of the btrfs tests 001, 002 and 004 in the xfstests, with a leaf/node size of 4Kb.
---
V2: Simplified code, removed unnecessary code.
V3: Replaced BUG_ON() with the new ASSERT() from Josef.
V4: Addressed latest comments from Zach Brown and Josef Bacik.
Surrounded all code that is used for the assertion with a #ifdef CONFIG_BTRFS_ASSERT ... #endif block. Also changed offset arguments to be more strictly correct.
V5: Updated histograms to reflect latest version of the code.
fs/btrfs/ctree.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-)
fs/btrfs/ctree.c +40 -2
@@ -2426,6 +2426,40 @@ done:return ret; } +static void key_search_validate (struct extent_buffer *b, +struct btrfs_key *key, +int level) +{ +#ifdef CONFIG_BTRFS_ASSERT +struct btrfs_disk_key disk_key; + +btrfs_cpu_key_to_disk (&disk_key, key); + +if (level ==0 ) +ASSERT (!memcmp_extent_buffer (b, &disk_key, + offsetof(struct btrfs_leaf, items[0].key), + sizeof(disk_key))); +else +ASSERT (!memcmp_extent_buffer (b, &disk_key, + offsetof(struct btrfs_node, ptrs[0].key), + sizeof(disk_key))); +#endif +} + +static int key_search (struct extent_buffer *b,struct btrfs_key *key, +int level,int *prev_cmp,int *slot) +{ +if (*prev_cmp !=0 ) { + *prev_cmp =bin_search (b, key, level, slot); +return *prev_cmp; + } + +key_search_validate (b, key, level); + *slot =0 ; + +return 0 ; +} +/* * look for key in the tree. path is filled in with nodes along the way * if key is found, we return zero and you can find the item in the leaf
@@ -2454,6 +2488,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_rootint write_lock_level =0 ;u8 lowest_level =0 ;int min_write_lock_level; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (lowest_level && ins_len >0 );
@@ -2484,6 +2519,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root min_write_lock_level = write_lock_level; again: + prev_cmp =-1 ;/* * we try very hard to do read locks on the root */
@@ -2584,7 +2620,7 @@ cow_done:if (!cow)btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;
@@ -2719,6 +2755,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key,int level;int lowest_unlock =1 ;u8 lowest_level =0 ; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (p->nodes[0 ] !=NULL );
@@ -2729,6 +2766,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key, } again: + prev_cmp =-1 ; b =get_old_root (root, time_seq); level =btrfs_header_level (b); p->locks[level] =BTRFS_READ_LOCK ;
@@ -2746,7 +2784,7 @@ again:*/ btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;
Signature · 1 line
1.7.9.5
Quoted 73 lines · Filipe David Borba Manana
When the binary search returns 0 (exact match), the target key will necessarily be at slot 0 of all nodes below the current one, so in this case the binary search is not needed because it will always return 0, and we waste time doing it, holding node locks for longer than necessary, etc.
Below follow histograms with the times spent on the current approach of doing a binary search when the previous binary search returned 0, and times for the new approach, which directly picks the first item/child node in the leaf/node.
Current approach:
Count: 6682
Range: 35.000 - 8370.000; Mean: 85.837; Median: 75.000; Stddev: 106.429
Percentiles: 90th: 124.000; 95th: 145.000; 99th: 206.00035.000 - 61.080: 1235 ################ 61.080 - 106.053: 4207 ##################################################### 106.053 - 183.606: 1122 ############## 183.606 - 317.341: 111 # 317.341 - 547.959: 6 | 547.959 - 8370.000: 1 |Approach proposed by this patch:
Count: 6682 Range: 6.000 - 135.000; Mean: 16.690; Median: 16.000; Stddev: 7.160 Percentiles: 90th: 23.000; 95th: 27.000; 99th: 40.000 6.000 - 8.418: 58 # 8.418 - 11.670: 1149 ######################### 11.670 - 16.046: 2418 ##################################################### 16.046 - 21.934: 2098 ############################################## 21.934 - 29.854: 744 ################ 29.854 - 40.511: 154 ### 40.511 - 54.848: 41 # 54.848 - 74.136: 5 | 74.136 - 100.087: 9 | 100.087 - 135.000: 6 |These samples were captured during a run of the btrfs tests 001, 002 and 004 in the xfstests, with a leaf/node size of 4Kb.
Signed-off-by Filipe David Borba Manana <[email protected]>---
V2: Simplified code, removed unnecessary code.
V3: ReplacedBUG_ON()with the newASSERT()from Josef.
V4: Addressed latest comments from Zach Brown and Josef Bacik.
Surrounded all code that is used for the assertion with a #ifdefCONFIG_BTRFS_ASSERT... #endif block. Also changed offset arguments to be more strictly correct.
V5: Updated histograms to reflect latest version of the code.fs/btrfs/ctree.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-)fs/btrfs/ctree.c +9
-0@@ -2426,6 +2426,40 @@ done:return ret; } +static void key_search_validate (struct extent_buffer *b, +struct btrfs_key *key, +int level) +{ +#ifdef CONFIG_BTRFS_ASSERT +struct btrfs_disk_key disk_key; + +btrfs_cpu_key_to_disk (&disk_key, key); +
fs/btrfs/ctree.c done: · line 2447
Quoted 10 lines
fs/btrfs/ctree.c +10
-0+if (level ==0 ) +ASSERT (!memcmp_extent_buffer (b, &disk_key, + offsetof(struct btrfs_leaf, items[0].key), + sizeof(disk_key))); +else +ASSERT (!memcmp_extent_buffer (b, &disk_key, + offsetof(struct btrfs_node, ptrs[0].key), + sizeof(disk_key))); +#endif +}
I think it is better to move #ifdef out of key_search_validate(), and make the function return the check result, then
fs/btrfs/ctree.c done: · line 2457
Quoted 10 lines
fs/btrfs/ctree.c +10
-0+ +static int key_search (struct extent_buffer *b,struct btrfs_key *key, +int level,int *prev_cmp,int *slot) +{ +if (*prev_cmp !=0 ) { + *prev_cmp =bin_search (b, key, level, slot); +return *prev_cmp; + } + +key_search_validate (b, key, level);
ASSERT(key_search_validate(b, key, level));
it can make the compiler happen when CONFIG_BTRFS_ASSERT is not set.
Thanks
Miao
Quoted 59 lines
fs/btrfs/ctree.c +11
-2+ *slot =0 ; + +return 0 ; +} +/* * look for key in the tree. path is filled in with nodes along the way * if key is found, we return zero and you can find the item in the leaf @@ -2454,6 +2488,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_rootint write_lock_level =0 ;u8 lowest_level =0 ;int min_write_lock_level; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (lowest_level && ins_len >0 );@@ -2484,6 +2519,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root min_write_lock_level = write_lock_level; again: + prev_cmp =-1 ;/* * we try very hard to do read locks on the root */ @@ -2584,7 +2620,7 @@ cow_done:if (!cow)btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;@@ -2719,6 +2755,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key,int level;int lowest_unlock =1 ;u8 lowest_level =0 ; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (p->nodes[0 ] !=NULL );@@ -2729,6 +2766,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key, } again: + prev_cmp =-1 ; b =get_old_root (root, time_seq); level =btrfs_header_level (b); p->locks[level] =BTRFS_READ_LOCK ;@@ -2746,7 +2784,7 @@ again:*/ btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;
PATCH v6 1/1 Btrfs: optimize key searches in btrfs_search_slot
In reply to Filipe David Borba MananaWhen the binary search returns 0 (exact match), the target key will necessarily be at slot 0 of all nodes below the current one, so in this case the binary search is not needed because it will always return 0, and we waste time doing it, holding node locks for longer than necessary, etc.
Below follow histograms with the times spent on the current approach of doing a binary search when the previous binary search returned 0, and times for the new approach, which directly picks the first item/child node in the leaf/node.
Current approach:
Count: 6682
Range: 35.000 - 8370.000; Mean: 85.837; Median: 75.000; Stddev: 106.429
Percentiles: 90th: 124.000; 95th: 145.000; 99th: 206.000
35.000 - 61.080: 1235 ################ 61.080 - 106.053: 4207 ##################################################### 106.053 - 183.606: 1122 ############## 183.606 - 317.341: 111 # 317.341 - 547.959: 6 | 547.959 - 8370.000: 1 |
Approach proposed by this patch:
Count: 6682 Range: 6.000 - 135.000; Mean: 16.690; Median: 16.000; Stddev: 7.160 Percentiles: 90th: 23.000; 95th: 27.000; 99th: 40.000 6.000 - 8.418: 58 # 8.418 - 11.670: 1149 ######################### 11.670 - 16.046: 2418 ##################################################### 16.046 - 21.934: 2098 ############################################## 21.934 - 29.854: 744 ################ 29.854 - 40.511: 154 ### 40.511 - 54.848: 41 # 54.848 - 74.136: 5 | 74.136 - 100.087: 9 | 100.087 - 135.000: 6 |
These samples were captured during a run of the btrfs tests 001, 002 and 004 in the xfstests, with a leaf/node size of 4Kb.
---
V2: Simplified code, removed unnecessary code.
V3: Replaced BUG_ON() with the new ASSERT() from Josef.
V4: Addressed latest comments from Zach Brown and Josef Bacik.
Surrounded all code that is used for the assertion with a #ifdef CONFIG_BTRFS_ASSERT ... #endif block. Also changed offset arguments to be more strictly correct.
V5: Updated histograms to reflect latest version of the code.
V6: Use single assert macro and no more #ifdef CONFIG_BTRFS_ASSERT
... #endif logic, as suggested by Miao Xie.
fs/btrfs/ctree.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-)
fs/btrfs/ctree.c +37 -2
@@ -2426,6 +2426,37 @@ done:return ret; } +static int key_search_validate (struct extent_buffer *b, +struct btrfs_key *key, +int level) +{ +struct btrfs_disk_key disk_key; +unsigned long offset; + +btrfs_cpu_key_to_disk (&disk_key, key); + +if (level ==0 ) + offset = offsetof(struct btrfs_leaf, items[0].key); +else + offset = offsetof(struct btrfs_node, ptrs[0].key); + +return !memcmp_extent_buffer (b, &disk_key, offset,sizeof (disk_key)); +} + +static int key_search (struct extent_buffer *b,struct btrfs_key *key, +int level,int *prev_cmp,int *slot) +{ +if (*prev_cmp !=0 ) { + *prev_cmp =bin_search (b, key, level, slot); +return *prev_cmp; + } + +ASSERT (key_search_validate (b, key, level)); + *slot =0 ; + +return 0 ; +} +/* * look for key in the tree. path is filled in with nodes along the way * if key is found, we return zero and you can find the item in the leaf
@@ -2454,6 +2485,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_rootint write_lock_level =0 ;u8 lowest_level =0 ;int min_write_lock_level; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (lowest_level && ins_len >0 );
@@ -2484,6 +2516,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root min_write_lock_level = write_lock_level; again: + prev_cmp =-1 ;/* * we try very hard to do read locks on the root */
@@ -2584,7 +2617,7 @@ cow_done:if (!cow)btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;
@@ -2719,6 +2752,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key,int level;int lowest_unlock =1 ;u8 lowest_level =0 ; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (p->nodes[0 ] !=NULL );
@@ -2729,6 +2763,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key, } again: + prev_cmp =-1 ; b =get_old_root (root, time_seq); level =btrfs_header_level (b); p->locks[level] =BTRFS_READ_LOCK ;
@@ -2746,7 +2781,7 @@ again:*/ btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;
Signature · 1 line
1.7.9.5
Quoted 73 lines · Filipe David Borba Manana
When the binary search returns 0 (exact match), the target key will necessarily be at slot 0 of all nodes below the current one, so in this case the binary search is not needed because it will always return 0, and we waste time doing it, holding node locks for longer than necessary, etc.
Below follow histograms with the times spent on the current approach of doing a binary search when the previous binary search returned 0, and times for the new approach, which directly picks the first item/child node in the leaf/node.
Current approach:
Count: 6682
Range: 35.000 - 8370.000; Mean: 85.837; Median: 75.000; Stddev: 106.429
Percentiles: 90th: 124.000; 95th: 145.000; 99th: 206.00035.000 - 61.080: 1235 ################ 61.080 - 106.053: 4207 ##################################################### 106.053 - 183.606: 1122 ############## 183.606 - 317.341: 111 # 317.341 - 547.959: 6 | 547.959 - 8370.000: 1 |Approach proposed by this patch:
Count: 6682 Range: 6.000 - 135.000; Mean: 16.690; Median: 16.000; Stddev: 7.160 Percentiles: 90th: 23.000; 95th: 27.000; 99th: 40.000 6.000 - 8.418: 58 # 8.418 - 11.670: 1149 ######################### 11.670 - 16.046: 2418 ##################################################### 16.046 - 21.934: 2098 ############################################## 21.934 - 29.854: 744 ################ 29.854 - 40.511: 154 ### 40.511 - 54.848: 41 # 54.848 - 74.136: 5 | 74.136 - 100.087: 9 | 100.087 - 135.000: 6 |These samples were captured during a run of the btrfs tests 001, 002 and 004 in the xfstests, with a leaf/node size of 4Kb.
Signed-off-by Filipe David Borba Manana <[email protected]>Signed-off-by Josef Bacik <[email protected]>---
V2: Simplified code, removed unnecessary code.
V3: ReplacedBUG_ON()with the newASSERT()from Josef.
V4: Addressed latest comments from Zach Brown and Josef Bacik.
Surrounded all code that is used for the assertion with a #ifdefCONFIG_BTRFS_ASSERT... #endif block. Also changed offset arguments to be more strictly correct.
V5: Updated histograms to reflect latest version of the code.
V6: Use single assert macro and no more #ifdefCONFIG_BTRFS_ASSERT
... #endif logic, as suggested by Miao Xie.fs/btrfs/ctree.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-)fs/btrfs/ctree.c +6
-0@@ -2426,6 +2426,37 @@ done:return ret; } +static int key_search_validate (struct extent_buffer *b, +struct btrfs_key *key, +int level) +{ +struct btrfs_disk_key disk_key; +unsigned long offset;
fs/btrfs/ctree.c done: · line 2444
Quoted 10 lines
fs/btrfs/ctree.c +10
-0+ +btrfs_cpu_key_to_disk (&disk_key, key); + +if (level ==0 ) + offset = offsetof(struct btrfs_leaf, items[0].key); +else + offset = offsetof(struct btrfs_node, ptrs[0].key); + +return !memcmp_extent_buffer (b, &disk_key, offset,sizeof (disk_key)); +}
Maybe I didn't explain clearly in the previous mail, what I suggested was to move "#ifdef CONFIG_BTRFS_ASSERT" out of the function, not to remove it. The final code is:
#ifdef CONFIG_BTRFS_ASSERT
static int key_search_validate()
{
}
#endif
static int key_search()
{
...
ASSERT(key_search_validate(b, key, level));
...
}If there is no "#ifdef CONFIG_BTRFS_ASSERT" wrapper around key_search_validate(), the compiler will output the unused function warning if CONFIG_BTRFS_ASSERT is not set.
Thanks
Miao
Quoted 69 lines
fs/btrfs/ctree.c +21
-2+ +static int key_search (struct extent_buffer *b,struct btrfs_key *key, +int level,int *prev_cmp,int *slot) +{ +if (*prev_cmp !=0 ) { + *prev_cmp =bin_search (b, key, level, slot); +return *prev_cmp; + } + +ASSERT (key_search_validate (b, key, level)); + *slot =0 ; + +return 0 ; +} +/* * look for key in the tree. path is filled in with nodes along the way * if key is found, we return zero and you can find the item in the leaf @@ -2454,6 +2485,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_rootint write_lock_level =0 ;u8 lowest_level =0 ;int min_write_lock_level; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (lowest_level && ins_len >0 );@@ -2484,6 +2516,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root min_write_lock_level = write_lock_level; again: + prev_cmp =-1 ;/* * we try very hard to do read locks on the root */ @@ -2584,7 +2617,7 @@ cow_done:if (!cow)btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;@@ -2719,6 +2752,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key,int level;int lowest_unlock =1 ;u8 lowest_level =0 ; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (p->nodes[0 ] !=NULL );@@ -2729,6 +2763,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key, } again: + prev_cmp =-1 ; b =get_old_root (root, time_seq); level =btrfs_header_level (b); p->locks[level] =BTRFS_READ_LOCK ;@@ -2746,7 +2781,7 @@ again:*/ btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;
Quoted 96 lines · Miao Xie
Quoted 73 lines · Filipe David Borba Manana
When the binary search returns 0 (exact match), the target key will necessarily be at slot 0 of all nodes below the current one, so in this case the binary search is not needed because it will always return 0, and we waste time doing it, holding node locks for longer than necessary, etc.
Below follow histograms with the times spent on the current approach of doing a binary search when the previous binary search returned 0, and times for the new approach, which directly picks the first item/child node in the leaf/node.
Current approach:
Count: 6682
Range: 35.000 - 8370.000; Mean: 85.837; Median: 75.000; Stddev: 106.429
Percentiles: 90th: 124.000; 95th: 145.000; 99th: 206.00035.000 - 61.080: 1235 ################ 61.080 - 106.053: 4207 ##################################################### 106.053 - 183.606: 1122 ############## 183.606 - 317.341: 111 # 317.341 - 547.959: 6 | 547.959 - 8370.000: 1 |Approach proposed by this patch:
Count: 6682 Range: 6.000 - 135.000; Mean: 16.690; Median: 16.000; Stddev: 7.160 Percentiles: 90th: 23.000; 95th: 27.000; 99th: 40.000 6.000 - 8.418: 58 # 8.418 - 11.670: 1149 ######################### 11.670 - 16.046: 2418 ##################################################### 16.046 - 21.934: 2098 ############################################## 21.934 - 29.854: 744 ################ 29.854 - 40.511: 154 ### 40.511 - 54.848: 41 # 54.848 - 74.136: 5 | 74.136 - 100.087: 9 | 100.087 - 135.000: 6 |These samples were captured during a run of the btrfs tests 001, 002 and 004 in the xfstests, with a leaf/node size of 4Kb.
Signed-off-by Filipe David Borba Manana <[email protected]>Signed-off-by Josef Bacik <[email protected]>---
V2: Simplified code, removed unnecessary code.
V3: ReplacedBUG_ON()with the newASSERT()from Josef.
V4: Addressed latest comments from Zach Brown and Josef Bacik.
Surrounded all code that is used for the assertion with a #ifdefCONFIG_BTRFS_ASSERT... #endif block. Also changed offset arguments to be more strictly correct.
V5: Updated histograms to reflect latest version of the code.
V6: Use single assert macro and no more #ifdefCONFIG_BTRFS_ASSERT
... #endif logic, as suggested by Miao Xie.fs/btrfs/ctree.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-)fs/btrfs/ctree.c +6
-0@@ -2426,6 +2426,37 @@ done:return ret; } +static int key_search_validate (struct extent_buffer *b, +struct btrfs_key *key, +int level) +{ +struct btrfs_disk_key disk_key; +unsigned long offset;fs/btrfs/ctree.c done: · line 2444
Quoted 10 lines
fs/btrfs/ctree.c +10
-0+ +btrfs_cpu_key_to_disk (&disk_key, key); + +if (level ==0 ) + offset = offsetof(struct btrfs_leaf, items[0].key); +else + offset = offsetof(struct btrfs_node, ptrs[0].key); + +return !memcmp_extent_buffer (b, &disk_key, offset,sizeof (disk_key)); +}Maybe I didn't explain clearly in the previous mail, what I suggested was to move "#ifdef
CONFIG_BTRFS_ASSERT" out of the function, not to remove it. The final code is:#ifdef
CONFIG_BTRFS_ASSERT
static intkey_search_validate()
{
}
#endifstatic int
key_search()
Quoted 8 lines
{ ... ASSERT(key_search_validate(b, key, level)); ... }If there is no "#ifdef
CONFIG_BTRFS_ASSERT" wrapper aroundkey_search_validate(), the compiler will output the unused function warning ifCONFIG_BTRFS_ASSERTis not set.
Ok. I misunderstood what you meant before. If the goal is not to remove the #ifdef #endif, then honestly I'm not seeing what value the suggestion brings in compared to patch v5, as it seems purely a style preference (and highly subjective whether it's better or not). Nevertheless I'm fine with it and hopefully everyone else will be too.
thanks
Quoted 74 lines
Thanks
MiaoQuoted 69 lines
fs/btrfs/ctree.c +21
-2+ +static int key_search (struct extent_buffer *b,struct btrfs_key *key, +int level,int *prev_cmp,int *slot) +{ +if (*prev_cmp !=0 ) { + *prev_cmp =bin_search (b, key, level, slot); +return *prev_cmp; + } + +ASSERT (key_search_validate (b, key, level)); + *slot =0 ; + +return 0 ; +} +/* * look for key in the tree. path is filled in with nodes along the way * if key is found, we return zero and you can find the item in the leaf @@ -2454,6 +2485,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_rootint write_lock_level =0 ;u8 lowest_level =0 ;int min_write_lock_level; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (lowest_level && ins_len >0 );@@ -2484,6 +2516,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root min_write_lock_level = write_lock_level; again: + prev_cmp =-1 ;/* * we try very hard to do read locks on the root */ @@ -2584,7 +2617,7 @@ cow_done:if (!cow)btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;@@ -2719,6 +2752,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key,int level;int lowest_unlock =1 ;u8 lowest_level =0 ; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (p->nodes[0 ] !=NULL );@@ -2729,6 +2763,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key, } again: + prev_cmp =-1 ; b =get_old_root (root, time_seq); level =btrfs_header_level (b); p->locks[level] =BTRFS_READ_LOCK ;@@ -2746,7 +2781,7 @@ again:*/ btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;
Signature · 5 lines
Filipe David Manana, "Reasonable men adapt themselves to the world. Unreasonable men adapt the world to themselves. That's why all progress depends on unreasonable men."
PATCH v7 1/1 Btrfs: optimize key searches in btrfs_search_slot
In reply to Filipe David Borba MananaWhen the binary search returns 0 (exact match), the target key will necessarily be at slot 0 of all nodes below the current one, so in this case the binary search is not needed because it will always return 0, and we waste time doing it, holding node locks for longer than necessary, etc.
Below follow histograms with the times spent on the current approach of doing a binary search when the previous binary search returned 0, and times for the new approach, which directly picks the first item/child node in the leaf/node.
Current approach:
Count: 6682
Range: 35.000 - 8370.000; Mean: 85.837; Median: 75.000; Stddev: 106.429
Percentiles: 90th: 124.000; 95th: 145.000; 99th: 206.000
35.000 - 61.080: 1235 ################ 61.080 - 106.053: 4207 ##################################################### 106.053 - 183.606: 1122 ############## 183.606 - 317.341: 111 # 317.341 - 547.959: 6 | 547.959 - 8370.000: 1 |
Approach proposed by this patch:
Count: 6682 Range: 6.000 - 135.000; Mean: 16.690; Median: 16.000; Stddev: 7.160 Percentiles: 90th: 23.000; 95th: 27.000; 99th: 40.000 6.000 - 8.418: 58 # 8.418 - 11.670: 1149 ######################### 11.670 - 16.046: 2418 ##################################################### 16.046 - 21.934: 2098 ############################################## 21.934 - 29.854: 744 ################ 29.854 - 40.511: 154 ### 40.511 - 54.848: 41 # 54.848 - 74.136: 5 | 74.136 - 100.087: 9 | 100.087 - 135.000: 6 |
These samples were captured during a run of the btrfs tests 001, 002 and 004 in the xfstests, with a leaf/node size of 4Kb.
---
V2: Simplified code, removed unnecessary code.
V3: Replaced BUG_ON() with the new ASSERT() from Josef.
V4: Addressed latest comments from Zach Brown and Josef Bacik.
Surrounded all code that is used for the assertion with a #ifdef CONFIG_BTRFS_ASSERT ... #endif block. Also changed offset arguments to be more strictly correct.
V5: Updated histograms to reflect latest version of the code.
V6: Use single assert macro and no more #ifdef CONFIG_BTRFS_ASSERT
... #endif logic, as suggested by Miao Xie.
V7: Added back the #ifdef ... #endif logic, to avoid compiler
warning about unused function when CONFIG_BTRFS_ASSERT is not enabled.
fs/btrfs/ctree.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-)
fs/btrfs/ctree.c +39 -2
@@ -2426,6 +2426,39 @@ done:return ret; } +#ifdef CONFIG_BTRFS_ASSERT +static int key_search_validate (struct extent_buffer *b, +struct btrfs_key *key, +int level) +{ +struct btrfs_disk_key disk_key; +unsigned long offset; + +btrfs_cpu_key_to_disk (&disk_key, key); + +if (level ==0 ) + offset = offsetof(struct btrfs_leaf, items[0].key); +else + offset = offsetof(struct btrfs_node, ptrs[0].key); + +return !memcmp_extent_buffer (b, &disk_key, offset,sizeof (disk_key)); +} +#endif + +static int key_search (struct extent_buffer *b,struct btrfs_key *key, +int level,int *prev_cmp,int *slot) +{ +if (*prev_cmp !=0 ) { + *prev_cmp =bin_search (b, key, level, slot); +return *prev_cmp; + } + +ASSERT (key_search_validate (b, key, level)); + *slot =0 ; + +return 0 ; +} +/* * look for key in the tree. path is filled in with nodes along the way * if key is found, we return zero and you can find the item in the leaf
@@ -2454,6 +2487,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_rootint write_lock_level =0 ;u8 lowest_level =0 ;int min_write_lock_level; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (lowest_level && ins_len >0 );
@@ -2484,6 +2518,7 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root min_write_lock_level = write_lock_level; again: + prev_cmp =-1 ;/* * we try very hard to do read locks on the root */
@@ -2584,7 +2619,7 @@ cow_done:if (!cow)btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;
@@ -2719,6 +2754,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key,int level;int lowest_unlock =1 ;u8 lowest_level =0 ; +int prev_cmp; lowest_level = p->lowest_level;WARN_ON (p->nodes[0 ] !=NULL );
@@ -2729,6 +2765,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key, } again: + prev_cmp =-1 ; b =get_old_root (root, time_seq); level =btrfs_header_level (b); p->locks[level] =BTRFS_READ_LOCK ;
@@ -2746,7 +2783,7 @@ again:*/ btrfs_unlock_up_safe (p, level +1 ); - ret =bin_search (b, key, level, &slot); + ret =key_search (b, key, level, &prev_cmp, &slot);if (level !=0 ) {int dec =0 ;
Signature · 1 line
1.7.9.5
Quoted 5 lines · Filipe David Borba Manana
fs/btrfs/ctree.c +5
-0+#ifdef CONFIG_BTRFS_ASSERT +static int key_search_validate (struct extent_buffer *b, +struct btrfs_key *key, +int level) +{
...
fs/btrfs/ctree.c done: · line 2456
Quoted 12 lines
fs/btrfs/ctree.c +12
-0+} +#endif + +static int key_search (struct extent_buffer *b,struct btrfs_key *key, +int level,int *prev_cmp,int *slot) +{ +if (*prev_cmp !=0 ) { + *prev_cmp =bin_search (b, key, level, slot); +return *prev_cmp; + } + +ASSERT (key_search_validate (b ,key ,level ));
But what if I want to use key_search_validate out of the context of an ASSERT ? I don't see a reason why the function needs to be under #ifdef BTRFS_ASSERT / #endif at all.
Quoted 4 lines
fs/btrfs/ctree.c +4
-0+ *slot =0 ; + +return 0 ; +}
Quoted 7 lines · David Sterba
Quoted 5 lines · Filipe David Borba Manana
fs/btrfs/ctree.c +5
-0+#ifdef CONFIG_BTRFS_ASSERT +static int key_search_validate (struct extent_buffer *b, +struct btrfs_key *key, +int level) +{...
Quoted 15 lines
fs/btrfs/ctree.c done: · line 2456
Quoted 12 lines
fs/btrfs/ctree.c +12
-0+} +#endif + +static int key_search (struct extent_buffer *b,struct btrfs_key *key, +int level,int *prev_cmp,int *slot) +{ +if (*prev_cmp !=0 ) { + *prev_cmp =bin_search (b, key, level, slot); +return *prev_cmp; + } + +ASSERT (key_search_validate (b ,key ,level ));But what if I want to use
key_search_validateout of the context of an ASSERT ?
Right. But right now nothing else uses it. Shall the need for it come, it's trivial to address.
Quoted 2 lines
I don't see a reason why the function needs to be under #ifdef
BTRFS_ASSERT/ #endif at all.
To avoid the compiler warning, as mentioned before.
Between patch versions v5 to v7, I don't have any strong preference. All have correct, small and simple code.
Quoted 5 lines
Quoted 5 lines
fs/btrfs/ctree.c +4
-0+ *slot =0 ; + +return 0 ; +}
Signature · 5 lines
Filipe David Manana, "Reasonable men adapt themselves to the world. Unreasonable men adapt the world to themselves. That's why all progress depends on unreasonable men."
Quoted 2 lines · Filipe David Manana
Between patch versions v5 to v7, I don't have any strong preference. All have correct, small and simple code.
I'm ok with v7.