btrfs: speed up btrfs_set_token_##bits helpers

The set/get token helpers either use the cached address in the token or
unconditionally call map_private_extent_buffer to get the address of
page containing the requested offset plus the mapping start and length.
Depending on the return value, the fast path uses unaligned put to write
data within a page, or fall back to write_extent_buffer that can handle
writes spanning more pages.

This is all wasteful. We know the number of bytes to write, 1/2/4/8 and
can find out the page. Then simply check if it's contained or the
fallback is needed. The token address is updated to the page, or the on
the next index, expecting that the next write will use that.

This saves one function call to map_private_extent_buffer and several
unnecessary temporary variables.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/struct-funcs.c b/fs/btrfs/struct-funcs.c
index f8a0357..67dfd12 100644 (file)
--- a/fs/btrfs/struct-funcs.c
+++ b/fs/btrfs/struct-funcs.c
@@ -106,38 +106,30 @@ void btrfs_set_token_##bits(struct btrfs_map_token *token,                \
                            const void *ptr, unsigned long off,         \
                            u##bits val)                                \
 {                                                                      \
-       unsigned long part_offset = (unsigned long)ptr;                 \
-       unsigned long offset = part_offset + off;                       \
-       void *p;                                                        \
-       int err;                                                        \
-       char *kaddr;                                                    \
-       unsigned long map_start;                                        \
-       unsigned long map_len;                                          \
-       int size = sizeof(u##bits);                                     \
+       const unsigned long member_offset = (unsigned long)ptr + off;   \
+       const unsigned long idx = member_offset >> PAGE_SHIFT;          \
+       const unsigned long oip = offset_in_page(member_offset);        \
+       const int size = sizeof(u##bits);                               \
+       __le##bits leres;                                               \
                                                                        \
        ASSERT(token);                                                  \
        ASSERT(token->kaddr);                                           \
        ASSERT(check_setget_bounds(token->eb, ptr, off, size));         \
-       if (token->offset <= offset &&                                  \
-          (token->offset + PAGE_SIZE >= offset + size)) {      \
-               kaddr = token->kaddr;                                   \
-               p = kaddr + part_offset - token->offset;                \
-               put_unaligned_le##bits(val, p + off);                   \
+       if (token->offset <= member_offset &&                           \
+           member_offset + size <= token->offset + PAGE_SIZE) {        \
+               put_unaligned_le##bits(val, token->kaddr + oip);        \
                return;                                                 \
        }                                                               \
-       err = map_private_extent_buffer(token->eb, offset, size,        \
-                       &kaddr, &map_start, &map_len);                  \
-       if (err) {                                                      \
-               __le##bits val2;                                        \
-                                                                       \
-               val2 = cpu_to_le##bits(val);                            \
-               write_extent_buffer(token->eb, &val2, offset, size);    \
+       if (oip + size <= PAGE_SIZE) {                                  \
+               token->kaddr = page_address(token->eb->pages[idx]);     \
+               token->offset = idx << PAGE_SHIFT;                      \
+               put_unaligned_le##bits(val, token->kaddr + oip);        \
                return;                                                 \
        }                                                               \
-       p = kaddr + part_offset - map_start;                            \
-       put_unaligned_le##bits(val, p + off);                           \
-       token->kaddr = kaddr;                                           \
-       token->offset = map_start;                                      \
+       token->kaddr = page_address(token->eb->pages[idx + 1]);         \
+       token->offset = (idx + 1) << PAGE_SHIFT;                        \
+       leres = cpu_to_le##bits(val);                                   \
+       write_extent_buffer(token->eb, &leres, member_offset, size);    \
 }                                                                      \
 void btrfs_set_##bits(struct extent_buffer *eb, void *ptr,             \
                      unsigned long off, u##bits val)                   \