dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Btrfs: rewrite BTRFS_SETGET_FUNCS 

BTRFS_SETGET_FUNCS macro is used to generate btrfs_set_foo() and
btrfs_foo() functions, which read and write specific fields in the
extent buffer.

The total number of set/get functions is ~200, but in fact we only
need 8 functions: 2 for u8 field, 2 for u16, 2 for u32 and 2 for u64.

It results in redunction of ~37K bytes.

   text    data     bss     dec     hex filename
 629661   12489     216  642366   9cd3e fs/btrfs/btrfs.o.orig
 592637   12489     216  605342   93c9e fs/btrfs/btrfs.o

Signed-off-by: Li Zefan <lizefan@huawei.com>
This commit is contained in:
Li Zefan 2012-07-09 20:22:35 -06:00 committed by Chris Mason
parent 293f7e0740
commit 18077bb413
2 changed files with 146 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
fs/btrfs/ctree.h
View File

@ -1623,13 +1623,54 @@ static inline void btrfs_init_map_token (struct btrfs_map_token *token)
offsetof(type, member), \ offsetof(type, member), \
sizeof(((type *)0)->member))) sizeof(((type *)0)->member)))
#ifndef BTRFS_SETGET_FUNCS #define DECLARE_BTRFS_SETGET_BITS(bits) \
u##bits btrfs_get_token_##bits(struct extent_buffer *eb, void *ptr, \
unsigned long off, \
struct btrfs_map_token *token); \
void btrfs_set_token_##bits(struct extent_buffer *eb, void *ptr, \
unsigned long off, u##bits val, \
struct btrfs_map_token *token); \
static inline u##bits btrfs_get_##bits(struct extent_buffer *eb, void *ptr, \
unsigned long off) \
{ \
return btrfs_get_token_##bits(eb, ptr, off, NULL); \
} \
static inline void btrfs_set_##bits(struct extent_buffer *eb, void *ptr, \
unsigned long off, u##bits val) \
{ \
btrfs_set_token_##bits(eb, ptr, off, val, NULL); \
}
DECLARE_BTRFS_SETGET_BITS(8)
DECLARE_BTRFS_SETGET_BITS(16)
DECLARE_BTRFS_SETGET_BITS(32)
DECLARE_BTRFS_SETGET_BITS(64)
#define BTRFS_SETGET_FUNCS(name, type, member, bits) \ #define BTRFS_SETGET_FUNCS(name, type, member, bits) \
u##bits btrfs_##name(struct extent_buffer *eb, type *s); \ static inline u##bits btrfs_##name(struct extent_buffer *eb, type *s) \
u##bits btrfs_token_##name(struct extent_buffer *eb, type *s, struct btrfs_map_token *token); \ { \
void btrfs_set_token_##name(struct extent_buffer *eb, type *s, u##bits val, struct btrfs_map_token *token);\ BUILD_BUG_ON(sizeof(u##bits) != sizeof(((type *)0))->member); \
void btrfs_set_##name(struct extent_buffer *eb, type *s, u##bits val); return btrfs_get_##bits(eb, s, offsetof(type, member)); \
#endif } \
static inline void btrfs_set_##name(struct extent_buffer *eb, type *s, \
u##bits val) \
{ \
BUILD_BUG_ON(sizeof(u##bits) != sizeof(((type *)0))->member); \
btrfs_set_##bits(eb, s, offsetof(type, member), val); \
} \
static inline u##bits btrfs_token_##name(struct extent_buffer *eb, type *s, \
struct btrfs_map_token *token) \
{ \
BUILD_BUG_ON(sizeof(u##bits) != sizeof(((type *)0))->member); \
return btrfs_get_token_##bits(eb, s, offsetof(type, member), token); \
} \
static inline void btrfs_set_token_##name(struct extent_buffer *eb, \
type *s, u##bits val, \
struct btrfs_map_token *token) \
{ \
BUILD_BUG_ON(sizeof(u##bits) != sizeof(((type *)0))->member); \
btrfs_set_token_##bits(eb, s, offsetof(type, member), val, token); \
}
#define BTRFS_SETGET_HEADER_FUNCS(name, type, member, bits) \ #define BTRFS_SETGET_HEADER_FUNCS(name, type, member, bits) \
static inline u##bits btrfs_##name(struct extent_buffer *eb) \ static inline u##bits btrfs_##name(struct extent_buffer *eb) \

196
fs/btrfs/struct-funcs.c
View File

@ -17,15 +17,27 @@
*/ */
#include <linux/highmem.h> #include <linux/highmem.h>
#include <asm/unaligned.h>
/* this is some deeply nasty code. ctree.h has a different #include "ctree.h"
* definition for this BTRFS_SETGET_FUNCS macro, behind a #ifndef
static inline u8 get_unaligned_le8(const void *p)
{
return *(u8 *)p;
}
static inline void put_unaligned_le8(u8 val, void *p)
{
*(u8 *)p = val;
}
/*
* this is some deeply nasty code.
* *
* The end result is that anyone who #includes ctree.h gets a * The end result is that anyone who #includes ctree.h gets a
* declaration for the btrfs_set_foo functions and btrfs_foo functions * declaration for the btrfs_set_foo functions and btrfs_foo functions,
* * which are wappers of btrfs_set_token_#bits functions and
* This file declares the macros and then #includes ctree.h, which results * btrfs_get_token_#bits functions, which are defined in this file.
* in cpp creating the function here based on the template below.
* *
* These setget functions do all the extent_buffer related mapping * These setget functions do all the extent_buffer related mapping
* required to efficiently read and write specific fields in the extent * required to efficiently read and write specific fields in the extent
@ -33,103 +45,93 @@
* an unsigned long offset into the extent buffer which has been * an unsigned long offset into the extent buffer which has been
* cast to a specific type. This gives us all the gcc type checking. * cast to a specific type. This gives us all the gcc type checking.
* *
* The extent buffer api is used to do all the kmapping and page * The extent buffer api is used to do the page spanning work required to
* spanning work required to get extent buffers in highmem and have * have a metadata blocksize different from the page size.
* a metadata blocksize different from the page size.
*
* The macro starts with a simple function prototype declaration so that
* sparse won't complain about it being static.
*/ */
#define BTRFS_SETGET_FUNCS(name, type, member, bits) \ #define DEFINE_BTRFS_SETGET_BITS(bits) \
u##bits btrfs_##name(struct extent_buffer *eb, type *s); \ u##bits btrfs_get_token_##bits(struct extent_buffer *eb, void *ptr, \
void btrfs_set_##name(struct extent_buffer *eb, type *s, u##bits val); \ unsigned long off, \
void btrfs_set_token_##name(struct extent_buffer *eb, type *s, u##bits val, struct btrfs_map_token *token); \ struct btrfs_map_token *token) \
u##bits btrfs_token_##name(struct extent_buffer *eb, \
type *s, struct btrfs_map_token *token) \
{ \ { \
unsigned long part_offset = (unsigned long)s; \ unsigned long part_offset = (unsigned long)ptr; \
unsigned long offset = part_offset + offsetof(type, member); \ unsigned long offset = part_offset + off; \
type *p; \ void *p; \
int err; \ int err; \
char *kaddr; \ char *kaddr; \
unsigned long map_start; \ unsigned long map_start; \
unsigned long map_len; \ unsigned long map_len; \
unsigned long mem_len = sizeof(((type *)0)->member); \ int size = sizeof(u##bits); \
u##bits res; \ u##bits res; \
if (token && token->kaddr && token->offset <= offset && \ \
token->eb == eb && \ if (token && token->kaddr && token->offset <= offset && \
(token->offset + PAGE_CACHE_SIZE >= offset + mem_len)) { \ token->eb == eb && \
kaddr = token->kaddr; \ (token->offset + PAGE_CACHE_SIZE >= offset + size)) { \
p = (type *)(kaddr + part_offset - token->offset); \ kaddr = token->kaddr; \
res = le##bits##_to_cpu(p->member); \ p = kaddr + part_offset - token->offset; \
return res; \ res = get_unaligned_le##bits(p + off); \
} \ return res; \
err = map_private_extent_buffer(eb, offset, \ } \
mem_len, \ err = map_private_extent_buffer(eb, offset, size, \
&kaddr, &map_start, &map_len); \ &kaddr, &map_start, &map_len); \
if (err) { \ if (err) { \
__le##bits leres; \ __le##bits leres; \
read_eb_member(eb, s, type, member, &leres); \ \
return le##bits##_to_cpu(leres); \ read_extent_buffer(eb, &leres, offset, size); \
} \ return le##bits##_to_cpu(leres); \
p = (type *)(kaddr + part_offset - map_start); \ } \
res = le##bits##_to_cpu(p->member); \ p = kaddr + part_offset - map_start; \
if (token) { \ res = get_unaligned_le##bits(p + off); \
token->kaddr = kaddr; \ if (token) { \
token->offset = map_start; \ token->kaddr = kaddr; \
token->eb = eb; \ token->offset = map_start; \
} \ token->eb = eb; \
return res; \ } \
return res; \
} \ } \
void btrfs_set_token_##name(struct extent_buffer *eb, \ void btrfs_set_token_##bits(struct extent_buffer *eb, \
type *s, u##bits val, struct btrfs_map_token *token) \ void *ptr, unsigned long off, u##bits val, \
struct btrfs_map_token *token) \
{ \ { \
unsigned long part_offset = (unsigned long)s; \ unsigned long part_offset = (unsigned long)ptr; \
unsigned long offset = part_offset + offsetof(type, member); \ unsigned long offset = part_offset + off; \
type *p; \ void *p; \
int err; \ int err; \
char *kaddr; \ char *kaddr; \
unsigned long map_start; \ unsigned long map_start; \
unsigned long map_len; \ unsigned long map_len; \
unsigned long mem_len = sizeof(((type *)0)->member); \ int size = sizeof(u##bits); \
if (token && token->kaddr && token->offset <= offset && \ \
token->eb == eb && \ if (token && token->kaddr && token->offset <= offset && \
(token->offset + PAGE_CACHE_SIZE >= offset + mem_len)) { \ token->eb == eb && \
kaddr = token->kaddr; \ (token->offset + PAGE_CACHE_SIZE >= offset + size)) { \
p = (type *)(kaddr + part_offset - token->offset); \ kaddr = token->kaddr; \
p->member = cpu_to_le##bits(val); \ p = kaddr + part_offset - token->offset; \
return; \ put_unaligned_le##bits(val, p + off); \
} \ return; \
err = map_private_extent_buffer(eb, offset, \ } \
mem_len, \ err = map_private_extent_buffer(eb, offset, size, \
&kaddr, &map_start, &map_len); \ &kaddr, &map_start, &map_len); \
if (err) { \ if (err) { \
__le##bits val2; \ __le##bits val2; \
val2 = cpu_to_le##bits(val); \ \
write_eb_member(eb, s, type, member, &val2); \ val2 = cpu_to_le##bits(val); \
return; \ write_extent_buffer(eb, &val2, offset, size); \
} \ return; \
p = (type *)(kaddr + part_offset - map_start); \ } \
p->member = cpu_to_le##bits(val); \ p = kaddr + part_offset - map_start; \
if (token) { \ put_unaligned_le##bits(val, p + off); \
token->kaddr = kaddr; \ if (token) { \
token->offset = map_start; \ token->kaddr = kaddr; \
token->eb = eb; \ token->offset = map_start; \
} \ token->eb = eb; \
} \ } \
void btrfs_set_##name(struct extent_buffer *eb, \ }
type *s, u##bits val) \
{ \
btrfs_set_token_##name(eb, s, val, NULL); \
} \
u##bits btrfs_##name(struct extent_buffer *eb, \
type *s) \
{ \
return btrfs_token_##name(eb, s, NULL); \
} \
#include "ctree.h" DEFINE_BTRFS_SETGET_BITS(8)
DEFINE_BTRFS_SETGET_BITS(16)
DEFINE_BTRFS_SETGET_BITS(32)
DEFINE_BTRFS_SETGET_BITS(64)
void btrfs_node_key(struct extent_buffer *eb, void btrfs_node_key(struct extent_buffer *eb,
struct btrfs_disk_key *disk_key, int nr) struct btrfs_disk_key *disk_key, int nr)