Parameter reduction in compression wrappers
David Sterba
maintainercover Parameter reduction in compression wrappers
I've noticed that some of the parameters passed to compress_pages are redundant and that we can either reuse a parameter for both input and output value (number of pages) or we can infer some value from the existing parameters (the maximum output limit).
There's no functional change, the stack consumption is slightly smaller.
David Sterba (5):
btrfs: merge length input and output parameter in compress_pages
btrfs: merge nr_pages input and output parameter in compress_pages
btrfs: export compression buffer limits in a header
btrfs: use predefined limits for calculating maximum number of pages for compression
btrfs: derive maximum output size in the compression implementation
fs/btrfs/compression.c | 33 ++++++++++++++------------------- fs/btrfs/compression.h | 28 +++++++++++++++++++--------- fs/btrfs/inode.c | 37 +++++++++++++------------------------ fs/btrfs/lzo.c | 10 +++++----- fs/btrfs/zlib.c | 9 +++++---- 5 files changed, 56 insertions(+), 61 deletions(-)
David Sterba
maintainerPATCH 1/5 btrfs: merge length input and output parameter in compress_pages
The length parameter is basically duplicated for input and output in the top level caller of the compress_pages chain. We can simply use one variable for that and reduce stack consumption. The compression implementation will sink the parameter to a local variable so everything works as before.
Signed-off-by David Sterba <[email protected]>
--- fs/btrfs/compression.c | 24 +++++++++++------------- fs/btrfs/compression.h | 5 ++--- fs/btrfs/inode.c | 2 +- fs/btrfs/lzo.c | 4 ++-- fs/btrfs/zlib.c | 3 ++- 5 files changed, 18 insertions(+), 20 deletions(-)
fs/btrfs/compression.c +11 -13
@@ -911,27 +911,25 @@ static void free_workspaces(void) }/* -* given an address space and start/len, compress the bytes. +* Given an address space and start and length, compress the bytes into @pages +* that are allocated on demand. * -* pages are allocated to hold the compressed result and stored -* in 'pages' +* @out_pages is used to return the number of pages allocated. There +* may be pages allocated even if we return an error. * -* out_pages is used to return the number of pages allocated. There -* may be pages allocated even if we return an error -* -* total_in is used to return the number of bytes actually read. It -* may be smaller then len if we had to exit early because we +* @total_in is used to return the number of bytes actually read. It +* may be smaller than the input length if we had to exit early because we * ran out of room in the pages array or because we cross the * max_out threshold. * -* total_out is used to return the total number of compressed bytes +* @total_out is an in/out parameter, must be set to the input length and will +* be also used to return the total number of compressed bytes * -* max_out tells us the max number of bytes that we're allowed to +* @max_out tells us the max number of bytes that we're allowed to * stuff into pages */ int btrfs_compress_pages(int type, struct address_space *mapping, - u64 start, unsigned long len, - struct page **pages, + u64 start, struct page **pages, unsigned long nr_dest_pages, unsigned long *out_pages, unsigned long *total_in,
@@ -944,7 +942,7 @@ int btrfs_compress_pages(int type, struct address_space *mapping, workspace =find_workspace (type); ret = btrfs_compress_op[type-1 ]->compress_pages (workspace, mapping, - start, len, pages, + start, pages, nr_dest_pages, out_pages, total_in, total_out, max_out);
fs/btrfs/compression.h +2 -3
@@ -23,8 +23,7 @@ void btrfs_init_compress(void);void btrfs_exit_compress (void ); int btrfs_compress_pages(int type, struct address_space *mapping, - u64 start, unsigned long len, - struct page **pages, + u64 start, struct page **pages, unsigned long nr_dest_pages, unsigned long *out_pages, unsigned long *total_in,
@@ -59,7 +58,7 @@ struct btrfs_compress_op { int (*compress_pages)(struct list_head *workspace, struct address_space *mapping, - u64 start, unsigned long len, + u64 start, struct page **pages, unsigned long nr_dest_pages, unsigned long *out_pages,
fs/btrfs/inode.c +1 -1
@@ -516,7 +516,7 @@ static noinline void compress_file_range(struct inode *inode, redirty =1 ; ret = btrfs_compress_pages(compress_type, inode->i_mapping, start, - total_compressed, pages, + pages, nr_pages, &nr_pages_ret, &total_in, &total_compressed,
fs/btrfs/lzo.c +2 -2
@@ -86,7 +86,7 @@ static inline size_t read_compress_length(char *buf) static int lzo_compress_pages(struct list_head *ws, struct address_space *mapping, - u64 start, unsigned long len, + u64 start, struct page **pages, unsigned long nr_dest_pages, unsigned long *out_pages,
@@ -102,7 +102,7 @@ static int lzo_compress_pages(struct list_head *ws,struct page *in_page =NULL ;struct page *out_page =NULL ;unsigned long bytes_left; - +unsigned long len = *total_out;size_t in_len;size_t out_len;char *buf;
fs/btrfs/zlib.c +2 -1
@@ -73,7 +73,7 @@ static struct list_head *zlib_alloc_workspace(void) static int zlib_compress_pages(struct list_head *ws, struct address_space *mapping, - u64 start, unsigned long len, + u64 start, struct page **pages, unsigned long nr_dest_pages, unsigned long *out_pages,
@@ -89,6 +89,7 @@ static int zlib_compress_pages(struct list_head *ws,struct page *in_page =NULL ;struct page *out_page =NULL ;unsigned long bytes_left; +unsigned long len = *total_out; *out_pages =0 ; *total_out =0 ;
Signature · 1 line
2.10.1
David Sterba
maintainerPATCH 2/5 btrfs: merge nr_pages input and output parameter in compress_pages
In reply to David SterbaThe parameter saying how many pages can be allocated at maximum can be merged with the output page counter, to save some stack space. The compression implementation will sink the parameter to a local variable so everything works as before.
The nr_pages variables can also be simply merged in compress_file_range into one.
Signed-off-by David Sterba <[email protected]>
--- fs/btrfs/compression.c | 7 +++---- fs/btrfs/compression.h | 2 -- fs/btrfs/inode.c | 13 ++++++------- fs/btrfs/lzo.c | 2 +- fs/btrfs/zlib.c | 2 +- 5 files changed, 11 insertions(+), 15 deletions(-)
fs/btrfs/compression.c +3 -4
@@ -914,8 +914,8 @@ static void free_workspaces(void)* Given an address space and start and length, compress the bytes into @pages * that are allocated on demand. * -* @out_pages is used to return the number of pages allocated. There -* may be pages allocated even if we return an error. +* @out_pages is an in/out parameter, holds maximum number of pages to allocate +* and returns number of actually allocated pages * * @total_in is used to return the number of bytes actually read. It * may be smaller than the input length if we had to exit early because we
@@ -930,7 +930,6 @@ static void free_workspaces(void)*/ int btrfs_compress_pages(int type, struct address_space *mapping, u64 start, struct page **pages, - unsigned long nr_dest_pages, unsigned long *out_pages, unsigned long *total_in, unsigned long *total_out,
@@ -943,7 +942,7 @@ int btrfs_compress_pages(int type, struct address_space *mapping, ret = btrfs_compress_op[type-1 ]->compress_pages (workspace, mapping, start, pages, - nr_dest_pages, out_pages, + out_pages, total_in, total_out, max_out);free_workspace (type, workspace);
fs/btrfs/compression.h +0 -2
@@ -24,7 +24,6 @@ void btrfs_exit_compress(void); int btrfs_compress_pages(int type, struct address_space *mapping, u64 start, struct page **pages, - unsigned long nr_dest_pages, unsigned long *out_pages, unsigned long *total_in, unsigned long *total_out,
@@ -60,7 +59,6 @@ struct btrfs_compress_op {struct address_space *mapping, u64 start, struct page **pages, - unsigned long nr_dest_pages, unsigned long *out_pages, unsigned long *total_in, unsigned long *total_out,
fs/btrfs/inode.c +6 -7
@@ -430,7 +430,6 @@ static noinline void compress_file_range(struct inode *inode,int ret =0 ;struct page **pages =NULL ;unsigned long nr_pages; -unsigned long nr_pages_ret =0 ;unsigned long total_compressed =0 ;unsigned long total_in =0 ;unsigned long max_compressed =SZ_128K ;
@@ -517,7 +516,7 @@ static noinline void compress_file_range(struct inode *inode, ret =btrfs_compress_pages (compress_type, inode->i_mapping, start, pages, - nr_pages, &nr_pages_ret, + &nr_pages, &total_in, &total_compressed, max_compressed);
@@ -525,7 +524,7 @@ static noinline void compress_file_range(struct inode *inode,if (!ret) {unsigned long offset = total_compressed & (PAGE_SIZE -1 ); -struct page *page = pages[nr_pages_ret -1 ]; +struct page *page = pages[nr_pages -1 ];char *kaddr;/* zero the tail end of the last page, we might be
@@ -606,7 +605,7 @@ static noinline void compress_file_range(struct inode *inode,* will submit them to the elevator. */ add_async_extent (async_cow, start, num_bytes, - total_compressed, pages, nr_pages_ret, + total_compressed, pages, nr_pages, compress_type);if (start + num_bytes < end) {
@@ -623,14 +622,14 @@ static noinline void compress_file_range(struct inode *inode,* the compression code ran but failed to make things smaller, * free any pages it allocated and our page pointer array */ -for (i =0 ; i < nr_pages_ret; i++) { +for (i =0 ; i < nr_pages; i++) {WARN_ON (pages[i]->mapping);put_page (pages[i]); }kfree (pages); pages =NULL ; total_compressed =0 ; - nr_pages_ret =0 ; + nr_pages =0 ;/* flag the file so we don't compress in the future */ if (!btrfs_test_opt(fs_info, FORCE_COMPRESS) &&
@@ -659,7 +658,7 @@ static noinline void compress_file_range(struct inode *inode,return ; free_pages_out: -for (i =0 ; i < nr_pages_ret; i++) { +for (i =0 ; i < nr_pages; i++) {WARN_ON (pages[i]->mapping);put_page (pages[i]); }
fs/btrfs/lzo.c +1 -1
@@ -88,7 +88,6 @@ static int lzo_compress_pages(struct list_head *ws,struct address_space *mapping, u64 start, struct page **pages, - unsigned long nr_dest_pages, unsigned long *out_pages, unsigned long *total_in, unsigned long *total_out,
@@ -103,6 +102,7 @@ static int lzo_compress_pages(struct list_head *ws,struct page *out_page =NULL ;unsigned long bytes_left;unsigned long len = *total_out; +unsigned long nr_dest_pages = *out_pages;size_t in_len;size_t out_len;char *buf;
fs/btrfs/zlib.c +1 -1
@@ -75,7 +75,6 @@ static int zlib_compress_pages(struct list_head *ws,struct address_space *mapping, u64 start, struct page **pages, - unsigned long nr_dest_pages, unsigned long *out_pages, unsigned long *total_in, unsigned long *total_out,
@@ -90,6 +89,7 @@ static int zlib_compress_pages(struct list_head *ws,struct page *out_page =NULL ;unsigned long bytes_left;unsigned long len = *total_out; +unsigned long nr_dest_pages = *out_pages; *out_pages =0 ; *total_out =0 ;
Signature · 1 line
2.10.1
David Sterba
maintainerPATCH 3/5 btrfs: export compression buffer limits in a header
In reply to David SterbaMove the buffer limit definitions out of compress_file_range.
Signed-off-by David Sterba <[email protected]>
--- fs/btrfs/compression.h | 15 +++++++++++++++ fs/btrfs/inode.c | 10 ---------- 2 files changed, 15 insertions(+), 10 deletions(-)
fs/btrfs/compression.h +15 -0
@@ -19,6 +19,21 @@#ifndef __BTRFS_COMPRESSION_#define __BTRFS_COMPRESSION_ +/* +* We want to make sure that amount of RAM required to uncompress an extent is +* reasonable, so we limit the total size in ram of a compressed extent to +* 128k. This is a crucial number because it also controls how easily we can +* spread reads across cpus for decompression. +* +* We also want to make sure the amount of IO required to do a random read is +* reasonably small, so we limit the size of a compressed extent to 128k. +*/ + +/* Maximum length of compressed data stored on disk */ +#define BTRFS_MAX_COMPRESSED (SZ_128K) +/* Maximum size of data before compression */ +#define BTRFS_MAX_UNCOMPRESSED (SZ_128K) +void btrfs_init_compress (void );void btrfs_exit_compress (void );
fs/btrfs/inode.c +0 -10
@@ -470,16 +470,6 @@ static noinline void compress_file_range(struct inode *inode, (start > 0 || end + 1 < BTRFS_I(inode)->disk_i_size)) goto cleanup_and_bail_uncompressed; -/* we want to make sure that amount of ram required to uncompress -* an extent is reasonable, so we limit the total size in ram -* of a compressed extent to 128k. This is a crucial number -* because it also controls how easily we can spread reads across -* cpus for decompression. -* -* We also want to make sure the amount of IO required to do -* a random read is reasonably small, so we limit the size of -* a compressed extent to 128k. -*/ total_compressed =min (total_compressed, max_uncompressed); num_bytes =ALIGN (end - start +1 , blocksize); num_bytes =max (blocksize, num_bytes);
Signature · 1 line
2.10.1
Re: [PATCH 3/5] btrfs: export compression buffer limits in a header
Quoted 2 lines · David Sterba
Move the buffer limit definitions out of
compress_file_range.
Nice one.
No longer need to dig the codes to know the 128K limit now.
Reviewed-by Qu Wenruo <[email protected]>
Thanks,
Qu
Quoted 54 lines
Signed-off-by David Sterba <[email protected]>--- fs/btrfs/compression.h | 15 +++++++++++++++ fs/btrfs/inode.c | 10 ---------- 2 files changed, 15 insertions(+), 10 deletions(-)fs/btrfs/compression.h +15
-0@@ -19,6 +19,21 @@#ifndef __BTRFS_COMPRESSION_#define __BTRFS_COMPRESSION_ +/* +* We want to make sure that amount of RAM required to uncompress an extent is +* reasonable, so we limit the total size in ram of a compressed extent to +* 128k. This is a crucial number because it also controls how easily we can +* spread reads across cpus for decompression. +* +* We also want to make sure the amount of IO required to do a random read is +* reasonably small, so we limit the size of a compressed extent to 128k. +*/ + +/* Maximum length of compressed data stored on disk */ +#define BTRFS_MAX_COMPRESSED (SZ_128K) +/* Maximum size of data before compression */ +#define BTRFS_MAX_UNCOMPRESSED (SZ_128K) +void btrfs_init_compress (void );void btrfs_exit_compress (void );fs/btrfs/inode.c +0
-10@@ -470,16 +470,6 @@ static noinline void compress_file_range(struct inode *inode, (start > 0 || end + 1 < BTRFS_I(inode)->disk_i_size)) goto cleanup_and_bail_uncompressed; -/* we want to make sure that amount of ram required to uncompress -* an extent is reasonable, so we limit the total size in ram -* of a compressed extent to 128k. This is a crucial number -* because it also controls how easily we can spread reads across -* cpus for decompression. -* -* We also want to make sure the amount of IO required to do -* a random read is reasonably small, so we limit the size of -* a compressed extent to 128k. -*/ total_compressed =min (total_compressed, max_uncompressed); num_bytes =ALIGN (end - start +1 , blocksize); num_bytes =max (blocksize, num_bytes);
David Sterba
maintainerPATCH 4/5 btrfs: use predefined limits for calculating maximum number of pages for compression
In reply to David SterbaSigned-off-by David Sterba <[email protected]>
--- fs/btrfs/inode.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
fs/btrfs/inode.c +6 -5
@@ -432,8 +432,6 @@ static noinline void compress_file_range(struct inode *inode,unsigned long nr_pages;unsigned long total_compressed =0 ;unsigned long total_in =0 ; -unsigned long max_compressed =SZ_128K ; -unsigned long max_uncompressed =SZ_128K ;int i;int will_compress;int compress_type = fs_info->compress_type;
@@ -445,7 +443,9 @@ static noinline void compress_file_range(struct inode *inode, again: will_compress =0 ; nr_pages = (end >>PAGE_SHIFT ) - (start >>PAGE_SHIFT ) +1 ; - nr_pages = min_t(unsigned long, nr_pages, SZ_128K / PAGE_SIZE); +BUILD_BUG_ON ((BTRFS_MAX_COMPRESSED %PAGE_SIZE ) !=0 ); + nr_pages = min_t(unsigned long, nr_pages, +BTRFS_MAX_COMPRESSED /PAGE_SIZE );/* * we don't want to send crud past the end of i_size through
@@ -470,7 +470,8 @@ static noinline void compress_file_range(struct inode *inode, (start > 0 || end + 1 < BTRFS_I(inode)->disk_i_size)) goto cleanup_and_bail_uncompressed; - total_compressed =min (total_compressed, max_uncompressed); + total_compressed = min_t(unsigned long, total_compressed, +BTRFS_MAX_UNCOMPRESSED ); num_bytes =ALIGN (end - start +1 , blocksize); num_bytes =max (blocksize, num_bytes); total_in =0 ;
@@ -509,7 +510,7 @@ static noinline void compress_file_range(struct inode *inode, &nr_pages, &total_in, &total_compressed, - max_compressed); + BTRFS_MAX_COMPRESSED);if (!ret) { unsigned long offset = total_compressed &
Signature · 1 line
2.10.1
David Sterba
maintainerPATCH 5/5 btrfs: derive maximum output size in the compression implementation
In reply to David SterbaThe value of max_out can be calculated from the parameters passed to the compressors, which is number of pages and the page size, and we don't have to needlessly pass it around.
Signed-off-by David Sterba <[email protected]>
--- fs/btrfs/compression.c | 6 ++---- fs/btrfs/compression.h | 6 ++---- fs/btrfs/inode.c | 3 +-- fs/btrfs/lzo.c | 4 ++-- fs/btrfs/zlib.c | 4 ++-- 5 files changed, 9 insertions(+), 14 deletions(-)
fs/btrfs/compression.c +2 -4
@@ -932,8 +932,7 @@ int btrfs_compress_pages(int type, struct address_space *mapping, u64 start, struct page **pages, unsigned long *out_pages, unsigned long *total_in, - unsigned long *total_out, - unsigned long max_out) + unsigned long *total_out) { struct list_head *workspace;int ret;
@@ -943,8 +942,7 @@ int btrfs_compress_pages(int type, struct address_space *mapping, ret = btrfs_compress_op[type-1 ]->compress_pages (workspace, mapping, start, pages, out_pages, - total_in, total_out, - max_out); + total_in, total_out);free_workspace (type, workspace);return ret; }
fs/btrfs/compression.h +2 -4
@@ -41,8 +41,7 @@ int btrfs_compress_pages(int type, struct address_space *mapping, u64 start, struct page **pages, unsigned long *out_pages, unsigned long *total_in, - unsigned long *total_out, - unsigned long max_out); + unsigned long *total_out);int btrfs_decompress (int type,unsigned char *data_in,struct page *dest_page,unsigned long start_byte,size_t srclen,size_t destlen); int btrfs_decompress_buf2page(char *buf, unsigned long buf_start,
@@ -76,8 +75,7 @@ struct btrfs_compress_op {struct page **pages, unsigned long *out_pages, unsigned long *total_in, - unsigned long *total_out, - unsigned long max_out); + unsigned long *total_out); int (*decompress_bio)(struct list_head *workspace, struct page **pages_in,
fs/btrfs/inode.c +1 -2
@@ -509,8 +509,7 @@ static noinline void compress_file_range(struct inode *inode, pages, &nr_pages, &total_in, - &total_compressed, - BTRFS_MAX_COMPRESSED); + &total_compressed);if (!ret) { unsigned long offset = total_compressed &
fs/btrfs/lzo.c +2 -2
@@ -90,8 +90,7 @@ static int lzo_compress_pages(struct list_head *ws,struct page **pages, unsigned long *out_pages, unsigned long *total_in, - unsigned long *total_out, - unsigned long max_out) + unsigned long *total_out) { struct workspace *workspace = list_entry(ws, struct workspace, list);int ret =0 ;
@@ -103,6 +102,7 @@ static int lzo_compress_pages(struct list_head *ws,unsigned long bytes_left;unsigned long len = *total_out;unsigned long nr_dest_pages = *out_pages; +const unsigned long max_out = nr_dest_pages *PAGE_SIZE ;size_t in_len;size_t out_len;char *buf;
fs/btrfs/zlib.c +2 -2
@@ -77,8 +77,7 @@ static int zlib_compress_pages(struct list_head *ws,struct page **pages, unsigned long *out_pages, unsigned long *total_in, - unsigned long *total_out, - unsigned long max_out) + unsigned long *total_out) { struct workspace *workspace = list_entry(ws, struct workspace, list);int ret;
@@ -90,6 +89,7 @@ static int zlib_compress_pages(struct list_head *ws,unsigned long bytes_left;unsigned long len = *total_out;unsigned long nr_dest_pages = *out_pages; +const unsigned long max_out = nr_dest_pages *PAGE_SIZE ; *out_pages =0 ; *total_out =0 ;
Signature · 1 line
2.10.1