Linux-BTRFS Archive on lore.kernel.org
 help / color / Atom feed
From: Nikolay Borisov <nborisov@suse.com>
To: Dennis Zhou <dennis@kernel.org>, David Sterba <dsterba@suse.com>,
	Josef Bacik <josef@toxicpanda.com>, Chris Mason <clm@fb.com>,
	Omar Sandoval <osandov@osandov.com>,
	Nick Terrell <terrelln@fb.com>
Cc: kernel-team@fb.com, linux-btrfs@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH 08/11] btrfs: plumb level through the compression interface
Date: Tue, 29 Jan 2019 10:08:57 +0200
Message-ID: <ebc38878-5311-ac46-7384-560dd4dd24cb@suse.com> (raw)
In-Reply-To: <20190128212437.11597-9-dennis@kernel.org>



On 28.01.19 г. 23:24 ч., Dennis Zhou wrote:
> Zlib compression supports multiple levels, but doesn't require changing
> in how a workspace itself is created and managed. Zstd introduces a
> different memory requirement such that higher levels of compression
> require more memory. This requires changes in how the alloc()/get()
> methods work for zstd. This pach plumbs compression level through the
> interface as a parameter in preparation for zstd compression levels.
> This gives the compression types opportunity to create/manage based on
> the compression level.
> 
> Signed-off-by: Dennis Zhou <dennis@kernel.org>

Reviewed-by: Nikolay Borisov <nborisov@suse.com>

> ---
>  fs/btrfs/compression.c | 31 ++++++++++++++++---------------
>  fs/btrfs/compression.h |  7 ++++---
>  fs/btrfs/lzo.c         |  6 +++---
>  fs/btrfs/zlib.c        |  7 ++++---
>  fs/btrfs/zstd.c        |  6 +++---
>  5 files changed, 30 insertions(+), 27 deletions(-)
> 
> diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
> index ab694760ffdb..e509071eaa69 100644
> --- a/fs/btrfs/compression.c
> +++ b/fs/btrfs/compression.c
> @@ -744,9 +744,9 @@ static void heuristic_cleanup_workspace_manager(void)
>  	btrfs_cleanup_workspace_manager(&heuristic_wsm);
>  }
>  
> -static struct list_head *heuristic_get_workspace(void)
> +static struct list_head *heuristic_get_workspace(unsigned int level)
>  {
> -	return btrfs_get_workspace(&heuristic_wsm);
> +	return btrfs_get_workspace(&heuristic_wsm, level);
>  }
>  
>  static void heuristic_put_workspace(struct list_head *ws)
> @@ -766,7 +766,7 @@ static void free_heuristic_ws(struct list_head *ws)
>  	kfree(workspace);
>  }
>  
> -static struct list_head *alloc_heuristic_ws(void)
> +static struct list_head *alloc_heuristic_ws(unsigned int level)
>  {
>  	struct heuristic_ws *ws;
>  
> @@ -825,7 +825,7 @@ void btrfs_init_workspace_manager(struct workspace_manager *wsm,
>  	 * Preallocate one workspace for each compression type so
>  	 * we can guarantee forward progress in the worst case
>  	 */
> -	workspace = wsm->ops->alloc_workspace();
> +	workspace = wsm->ops->alloc_workspace(0);
>  	if (IS_ERR(workspace)) {
>  		pr_warn("BTRFS: cannot preallocate compression workspace, will try later\n");
>  	} else {
> @@ -853,7 +853,8 @@ void btrfs_cleanup_workspace_manager(struct workspace_manager *wsman)
>   * Preallocation makes a forward progress guarantees and we do not return
>   * errors.
>   */
> -struct list_head *btrfs_get_workspace(struct workspace_manager *wsm)
> +struct list_head *btrfs_get_workspace(struct workspace_manager *wsm,
> +				      unsigned int level)
>  {
>  	struct list_head *workspace;
>  	int cpus = num_online_cpus();
> @@ -899,7 +900,7 @@ struct list_head *btrfs_get_workspace(struct workspace_manager *wsm)
>  	 * context of btrfs_compress_bio/btrfs_compress_pages
>  	 */
>  	nofs_flag = memalloc_nofs_save();
> -	workspace = wsm->ops->alloc_workspace();
> +	workspace = wsm->ops->alloc_workspace(level);
>  	memalloc_nofs_restore(nofs_flag);
>  
>  	if (IS_ERR(workspace)) {
> @@ -930,9 +931,9 @@ struct list_head *btrfs_get_workspace(struct workspace_manager *wsm)
>  	return workspace;
>  }
>  
> -static struct list_head *get_workspace(int type)
> +static struct list_head *get_workspace(int type, int level)
>  {
> -	return btrfs_compress_op[type]->get_workspace();
> +	return btrfs_compress_op[type]->get_workspace(level);
>  }
>  
>  /*
> @@ -1003,12 +1004,13 @@ int btrfs_compress_pages(unsigned int type_level, struct address_space *mapping,
>  			 unsigned long *total_out)
>  {
>  	int type = BTRFS_COMPRESS_TYPE(type_level);
> +	int level = BTRFS_COMPRESS_LEVEL(type_level);
>  	struct list_head *workspace;
>  	int ret;
>  
> -	workspace = get_workspace(type);
> +	workspace = get_workspace(type, level);
>  
> -	btrfs_compress_op[type]->set_level(workspace, type_level);
> +	btrfs_compress_op[type]->set_level(workspace, level);
>  	ret = btrfs_compress_op[type]->compress_pages(workspace, mapping,
>  						      start, pages,
>  						      out_pages,
> @@ -1037,7 +1039,7 @@ static int btrfs_decompress_bio(struct compressed_bio *cb)
>  	int ret;
>  	int type = cb->compress_type;
>  
> -	workspace = get_workspace(type);
> +	workspace = get_workspace(type, 0);
>  	ret = btrfs_compress_op[type]->decompress_bio(workspace, cb);
>  	put_workspace(type, workspace);
>  
> @@ -1055,13 +1057,12 @@ int btrfs_decompress(int type, unsigned char *data_in, struct page *dest_page,
>  	struct list_head *workspace;
>  	int ret;
>  
> -	workspace = get_workspace(type);
> -
> +	workspace = get_workspace(type, 0);
>  	ret = btrfs_compress_op[type]->decompress(workspace, data_in,
>  						  dest_page, start_byte,
>  						  srclen, destlen);
> -
>  	put_workspace(type, workspace);
> +
>  	return ret;
>  }
>  
> @@ -1489,7 +1490,7 @@ static void heuristic_collect_sample(struct inode *inode, u64 start, u64 end,
>   */
>  int btrfs_compress_heuristic(struct inode *inode, u64 start, u64 end)
>  {
> -	struct list_head *ws_list = get_workspace(0);
> +	struct list_head *ws_list = get_workspace(0, 0);
>  	struct heuristic_ws *ws;
>  	u32 i;
>  	u8 byte;
> diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h
> index 05342ad081d6..e3627139bc5c 100644
> --- a/fs/btrfs/compression.h
> +++ b/fs/btrfs/compression.h
> @@ -114,7 +114,8 @@ struct workspace_manager {
>  
>  void btrfs_init_workspace_manager(struct workspace_manager *wsm,
>  				  const struct btrfs_compress_op *ops);
> -struct list_head *btrfs_get_workspace(struct workspace_manager *wsm);
> +struct list_head *btrfs_get_workspace(struct workspace_manager *wsm,
> +				      unsigned int level);
>  void btrfs_put_workspace(struct workspace_manager *wsm, struct list_head *ws);
>  void btrfs_cleanup_workspace_manager(struct workspace_manager *wsm);
>  
> @@ -123,11 +124,11 @@ struct btrfs_compress_op {
>  
>  	void (*cleanup_workspace_manager)(void);
>  
> -	struct list_head *(*get_workspace)(void);
> +	struct list_head *(*get_workspace)(unsigned int level);
>  
>  	void (*put_workspace)(struct list_head *ws);
>  
> -	struct list_head *(*alloc_workspace)(void);
> +	struct list_head *(*alloc_workspace)(unsigned int level);
>  
>  	void (*free_workspace)(struct list_head *workspace);
>  
> diff --git a/fs/btrfs/lzo.c b/fs/btrfs/lzo.c
> index f0837b2c8e94..f132af45a924 100644
> --- a/fs/btrfs/lzo.c
> +++ b/fs/btrfs/lzo.c
> @@ -73,9 +73,9 @@ static void lzo_cleanup_workspace_manager(void)
>  	btrfs_cleanup_workspace_manager(&wsm);
>  }
>  
> -static struct list_head *lzo_get_workspace(void)
> +static struct list_head *lzo_get_workspace(unsigned int level)
>  {
> -	return btrfs_get_workspace(&wsm);
> +	return btrfs_get_workspace(&wsm, level);
>  }
>  
>  static void lzo_put_workspace(struct list_head *ws)
> @@ -93,7 +93,7 @@ static void lzo_free_workspace(struct list_head *ws)
>  	kfree(workspace);
>  }
>  
> -static struct list_head *lzo_alloc_workspace(void)
> +static struct list_head *lzo_alloc_workspace(unsigned int level)
>  {
>  	struct workspace *workspace;
>  
> diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c
> index 04687bf692e3..e2173d0c4fd3 100644
> --- a/fs/btrfs/zlib.c
> +++ b/fs/btrfs/zlib.c
> @@ -39,9 +39,9 @@ static void zlib_cleanup_workspace_manager(void)
>  	btrfs_cleanup_workspace_manager(&wsm);
>  }
>  
> -static struct list_head *zlib_get_workspace(void)
> +static struct list_head *zlib_get_workspace(unsigned int level)
>  {
> -	return btrfs_get_workspace(&wsm);
> +	return btrfs_get_workspace(&wsm, level);
>  }
>  
>  static void zlib_put_workspace(struct list_head *ws)
> @@ -58,7 +58,7 @@ static void zlib_free_workspace(struct list_head *ws)
>  	kfree(workspace);
>  }
>  
> -static struct list_head *zlib_alloc_workspace(void)
> +static struct list_head *zlib_alloc_workspace(unsigned int level)
>  {
>  	struct workspace *workspace;
>  	int workspacesize;
> @@ -71,6 +71,7 @@ static struct list_head *zlib_alloc_workspace(void)
>  			zlib_inflate_workspacesize());
>  	workspace->strm.workspace = kvmalloc(workspacesize, GFP_KERNEL);
>  	workspace->buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
> +	workspace->level = level;
>  	if (!workspace->strm.workspace || !workspace->buf)
>  		goto fail;
>  
> diff --git a/fs/btrfs/zstd.c b/fs/btrfs/zstd.c
> index b06eaf171be7..404101864220 100644
> --- a/fs/btrfs/zstd.c
> +++ b/fs/btrfs/zstd.c
> @@ -53,9 +53,9 @@ static void zstd_cleanup_workspace_manager(void)
>  	btrfs_cleanup_workspace_manager(&wsm);
>  }
>  
> -static struct list_head *zstd_get_workspace(void)
> +static struct list_head *zstd_get_workspace(unsigned int level)
>  {
> -	return btrfs_get_workspace(&wsm);
> +	return btrfs_get_workspace(&wsm, level);
>  }
>  
>  static void zstd_put_workspace(struct list_head *ws)
> @@ -72,7 +72,7 @@ static void zstd_free_workspace(struct list_head *ws)
>  	kfree(workspace);
>  }
>  
> -static struct list_head *zstd_alloc_workspace(void)
> +static struct list_head *zstd_alloc_workspace(unsigned int level)
>  {
>  	ZSTD_parameters params =
>  			zstd_get_btrfs_parameters(ZSTD_BTRFS_MAX_INPUT);
> 

  reply index

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-28 21:24 [PATCH 00/11] btrfs: add zstd compression level support Dennis Zhou
2019-01-28 21:24 ` [PATCH 01/11] btrfs: add macros for compression type and level Dennis Zhou
2019-01-29  7:26   ` Nikolay Borisov
2019-01-29 17:57   ` Josef Bacik
2019-01-29 22:30   ` Omar Sandoval
2019-01-31 16:00   ` David Sterba
2019-01-31 16:17     ` Dennis Zhou
2019-01-28 21:24 ` [PATCH 02/11] btrfs: rename workspaces_list to workspace_manager Dennis Zhou
2019-01-29  7:27   ` Nikolay Borisov
2019-01-29 17:58   ` Josef Bacik
2019-01-28 21:24 ` [PATCH 03/11] btrfs: manage heuristic workspace as index 0 Dennis Zhou
2019-01-29  7:53   ` Nikolay Borisov
2019-01-29 22:43     ` Dennis Zhou
2019-01-29 18:02   ` Josef Bacik
2019-01-31 16:10   ` David Sterba
2019-01-28 21:24 ` [PATCH 04/11] btrfs: unify compression ops with workspace_manager Dennis Zhou
2019-01-29  7:54   ` Nikolay Borisov
2019-01-29 18:03   ` Josef Bacik
2019-01-28 21:24 ` [PATCH 05/11] btrfs: add helper methods for workspace manager init and cleanup Dennis Zhou
2019-01-29  7:58   ` Nikolay Borisov
2019-01-29 18:04   ` Josef Bacik
2019-01-28 21:24 ` [PATCH 06/11] btrfs: add compression interface in (get/put)_workspace() Dennis Zhou
2019-01-29 18:06   ` Josef Bacik
2019-01-28 21:24 ` [PATCH 07/11] btrfs: move to fn pointers for get/put workspaces Dennis Zhou
2019-01-29  8:22   ` Nikolay Borisov
2019-01-29 23:35     ` Dennis Zhou
2019-01-29 18:17   ` Josef Bacik
2019-01-29 18:44     ` Josef Bacik
2019-01-28 21:24 ` [PATCH 08/11] btrfs: plumb level through the compression interface Dennis Zhou
2019-01-29  8:08   ` Nikolay Borisov [this message]
2019-01-29 18:17   ` Josef Bacik
2019-01-28 21:24 ` [PATCH 09/11] btrfs: change set_level() to bound the level passed in Dennis Zhou
2019-01-29  8:14   ` Nikolay Borisov
2019-01-30 22:06     ` Dennis Zhou
2019-01-28 21:24 ` [PATCH 10/11] btrfs: zstd use the passed through level instead of default Dennis Zhou
2019-01-29  8:15   ` Nikolay Borisov
2019-01-28 21:24 ` [PATCH 11/11] btrfs: add zstd compression level support Dennis Zhou
2019-01-29  7:25   ` Nikolay Borisov
2019-01-29 22:50     ` Dennis Zhou
2019-01-31 18:10   ` David Sterba
2019-01-31 18:13   ` David Sterba
2019-01-29 17:18 ` [PATCH 00/11] " David Sterba
2019-01-29 21:12   ` Nick Terrell
2019-01-30 17:40   ` Dennis Zhou
2019-01-31 14:04     ` David Sterba
2019-01-31 15:56       ` Dennis Zhou

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ebc38878-5311-ac46-7384-560dd4dd24cb@suse.com \
    --to=nborisov@suse.com \
    --cc=clm@fb.com \
    --cc=dennis@kernel.org \
    --cc=dsterba@suse.com \
    --cc=josef@toxicpanda.com \
    --cc=kernel-team@fb.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=osandov@osandov.com \
    --cc=terrelln@fb.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-BTRFS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-btrfs/0 linux-btrfs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-btrfs linux-btrfs/ https://lore.kernel.org/linux-btrfs \
		linux-btrfs@vger.kernel.org linux-btrfs@archiver.kernel.org
	public-inbox-index linux-btrfs


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-btrfs


AGPL code for this site: git clone https://public-inbox.org/ public-inbox