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.
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Dennis Zhou <dennis@kernel.org>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
btrfs_cleanup_workspace_manager(&heuristic_wsm);
}
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)
}
static void heuristic_put_workspace(struct list_head *ws)
-static struct list_head *alloc_heuristic_ws(void)
+static struct list_head *alloc_heuristic_ws(unsigned int level)
{
struct heuristic_ws *ws;
{
struct heuristic_ws *ws;
* Preallocate one workspace for each compression type so we can
* guarantee forward progress in the worst case
*/
* 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");
if (IS_ERR(workspace)) {
pr_warn(
"BTRFS: cannot preallocate compression workspace, will try later\n");
* Preallocation makes a forward progress guarantees and we do not return
* errors.
*/
* 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();
{
struct list_head *workspace;
int cpus = num_online_cpus();
* context of btrfs_compress_bio/btrfs_compress_pages
*/
nofs_flag = memalloc_nofs_save();
* 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)) {
memalloc_nofs_restore(nofs_flag);
if (IS_ERR(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);
unsigned long *total_out)
{
int type = btrfs_compress_type(type_level);
unsigned long *total_out)
{
int type = btrfs_compress_type(type_level);
+ int level = btrfs_compress_level(type_level);
struct list_head *workspace;
int ret;
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,
ret = btrfs_compress_op[type]->compress_pages(workspace, mapping,
start, pages,
out_pages,
int ret;
int type = cb->compress_type;
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);
ret = btrfs_compress_op[type]->decompress_bio(workspace, cb);
put_workspace(type, workspace);
struct list_head *workspace;
int ret;
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);
ret = btrfs_compress_op[type]->decompress(workspace, data_in,
dest_page, start_byte,
srclen, destlen);
put_workspace(type, workspace);
put_workspace(type, workspace);
*/
int btrfs_compress_heuristic(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;
struct heuristic_ws *ws;
u32 i;
u8 byte;
void btrfs_init_workspace_manager(struct workspace_manager *wsm,
const struct btrfs_compress_op *ops);
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);
void btrfs_put_workspace(struct workspace_manager *wsm, struct list_head *ws);
void btrfs_cleanup_workspace_manager(struct workspace_manager *wsm);
void (*cleanup_workspace_manager)(void);
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);
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);
void (*free_workspace)(struct list_head *workspace);
btrfs_cleanup_workspace_manager(&wsm);
}
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)
}
static void lzo_put_workspace(struct list_head *ws)
-static struct list_head *lzo_alloc_workspace(void)
+static struct list_head *lzo_alloc_workspace(unsigned int level)
{
struct workspace *workspace;
{
struct workspace *workspace;
btrfs_cleanup_workspace_manager(&wsm);
}
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)
}
static void zlib_put_workspace(struct list_head *ws)
-static struct list_head *zlib_alloc_workspace(void)
+static struct list_head *zlib_alloc_workspace(unsigned int level)
{
struct workspace *workspace;
int workspacesize;
{
struct workspace *workspace;
int workspacesize;
workspacesize = max(zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL),
zlib_inflate_workspacesize());
workspace->strm.workspace = kvmalloc(workspacesize, GFP_KERNEL);
workspacesize = max(zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL),
zlib_inflate_workspacesize());
workspace->strm.workspace = kvmalloc(workspacesize, GFP_KERNEL);
+ workspace->level = level;
workspace->buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
if (!workspace->strm.workspace || !workspace->buf)
goto fail;
workspace->buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
if (!workspace->strm.workspace || !workspace->buf)
goto fail;
btrfs_cleanup_workspace_manager(&wsm);
}
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)
}
static void zstd_put_workspace(struct list_head *ws)
-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);
{
ZSTD_parameters params =
zstd_get_btrfs_parameters(ZSTD_BTRFS_MAX_INPUT);