Commit d20f395f authored by David Sterba's avatar David Sterba

btrfs: compression: export alloc/free/get/put callbacks of all algos

The indirect calls will be replaced by a switch in compression.c.
(Switch is faster than indirect calls with when Spectre mitigations are
enabled).
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 2510307e
...@@ -36,6 +36,10 @@ int zlib_decompress_bio(struct list_head *ws, struct compressed_bio *cb); ...@@ -36,6 +36,10 @@ int zlib_decompress_bio(struct list_head *ws, struct compressed_bio *cb);
int zlib_decompress(struct list_head *ws, unsigned char *data_in, int zlib_decompress(struct list_head *ws, unsigned char *data_in,
struct page *dest_page, unsigned long start_byte, size_t srclen, struct page *dest_page, unsigned long start_byte, size_t srclen,
size_t destlen); size_t destlen);
struct list_head *zlib_alloc_workspace(unsigned int level);
void zlib_free_workspace(struct list_head *ws);
struct list_head *zlib_get_workspace(unsigned int level);
void zlib_put_workspace(struct list_head *ws);
int lzo_compress_pages(struct list_head *ws, struct address_space *mapping, int lzo_compress_pages(struct list_head *ws, struct address_space *mapping,
u64 start, struct page **pages, unsigned long *out_pages, u64 start, struct page **pages, unsigned long *out_pages,
...@@ -44,6 +48,10 @@ int lzo_decompress_bio(struct list_head *ws, struct compressed_bio *cb); ...@@ -44,6 +48,10 @@ int lzo_decompress_bio(struct list_head *ws, struct compressed_bio *cb);
int lzo_decompress(struct list_head *ws, unsigned char *data_in, int lzo_decompress(struct list_head *ws, unsigned char *data_in,
struct page *dest_page, unsigned long start_byte, size_t srclen, struct page *dest_page, unsigned long start_byte, size_t srclen,
size_t destlen); size_t destlen);
struct list_head *lzo_alloc_workspace(unsigned int level);
void lzo_free_workspace(struct list_head *ws);
struct list_head *lzo_get_workspace(unsigned int level);
void lzo_put_workspace(struct list_head *ws);
int zstd_compress_pages(struct list_head *ws, struct address_space *mapping, int zstd_compress_pages(struct list_head *ws, struct address_space *mapping,
u64 start, struct page **pages, unsigned long *out_pages, u64 start, struct page **pages, unsigned long *out_pages,
...@@ -54,6 +62,10 @@ int zstd_decompress(struct list_head *ws, unsigned char *data_in, ...@@ -54,6 +62,10 @@ int zstd_decompress(struct list_head *ws, unsigned char *data_in,
size_t destlen); size_t destlen);
void zstd_init_workspace_manager(void); void zstd_init_workspace_manager(void);
void zstd_cleanup_workspace_manager(void); void zstd_cleanup_workspace_manager(void);
struct list_head *zstd_alloc_workspace(unsigned int level);
void zstd_free_workspace(struct list_head *ws);
struct list_head *zstd_get_workspace(unsigned int level);
void zstd_put_workspace(struct list_head *ws);
static const char* const btrfs_compress_types[] = { "", "zlib", "lzo", "zstd" }; static const char* const btrfs_compress_types[] = { "", "zlib", "lzo", "zstd" };
......
...@@ -63,17 +63,17 @@ struct workspace { ...@@ -63,17 +63,17 @@ struct workspace {
static struct workspace_manager wsm; static struct workspace_manager wsm;
static struct list_head *lzo_get_workspace(unsigned int level) struct list_head *lzo_get_workspace(unsigned int level)
{ {
return btrfs_get_workspace(&wsm, level); return btrfs_get_workspace(&wsm, level);
} }
static void lzo_put_workspace(struct list_head *ws) void lzo_put_workspace(struct list_head *ws)
{ {
btrfs_put_workspace(&wsm, ws); btrfs_put_workspace(&wsm, ws);
} }
static void lzo_free_workspace(struct list_head *ws) void lzo_free_workspace(struct list_head *ws)
{ {
struct workspace *workspace = list_entry(ws, struct workspace, list); struct workspace *workspace = list_entry(ws, struct workspace, list);
...@@ -83,7 +83,7 @@ static void lzo_free_workspace(struct list_head *ws) ...@@ -83,7 +83,7 @@ static void lzo_free_workspace(struct list_head *ws)
kfree(workspace); kfree(workspace);
} }
static struct list_head *lzo_alloc_workspace(unsigned int level) struct list_head *lzo_alloc_workspace(unsigned int level)
{ {
struct workspace *workspace; struct workspace *workspace;
......
...@@ -29,7 +29,7 @@ struct workspace { ...@@ -29,7 +29,7 @@ struct workspace {
static struct workspace_manager wsm; static struct workspace_manager wsm;
static struct list_head *zlib_get_workspace(unsigned int level) struct list_head *zlib_get_workspace(unsigned int level)
{ {
struct list_head *ws = btrfs_get_workspace(&wsm, level); struct list_head *ws = btrfs_get_workspace(&wsm, level);
struct workspace *workspace = list_entry(ws, struct workspace, list); struct workspace *workspace = list_entry(ws, struct workspace, list);
...@@ -39,12 +39,12 @@ static struct list_head *zlib_get_workspace(unsigned int level) ...@@ -39,12 +39,12 @@ static struct list_head *zlib_get_workspace(unsigned int level)
return ws; return ws;
} }
static void zlib_put_workspace(struct list_head *ws) void zlib_put_workspace(struct list_head *ws)
{ {
btrfs_put_workspace(&wsm, ws); btrfs_put_workspace(&wsm, ws);
} }
static void zlib_free_workspace(struct list_head *ws) void zlib_free_workspace(struct list_head *ws)
{ {
struct workspace *workspace = list_entry(ws, struct workspace, list); struct workspace *workspace = list_entry(ws, struct workspace, list);
...@@ -53,7 +53,7 @@ static void zlib_free_workspace(struct list_head *ws) ...@@ -53,7 +53,7 @@ static void zlib_free_workspace(struct list_head *ws)
kfree(workspace); kfree(workspace);
} }
static struct list_head *zlib_alloc_workspace(unsigned int level) struct list_head *zlib_alloc_workspace(unsigned int level)
{ {
struct workspace *workspace; struct workspace *workspace;
int workspacesize; int workspacesize;
......
...@@ -91,9 +91,8 @@ static inline struct workspace *list_to_workspace(struct list_head *list) ...@@ -91,9 +91,8 @@ static inline struct workspace *list_to_workspace(struct list_head *list)
return container_of(list, struct workspace, list); return container_of(list, struct workspace, list);
} }
static void zstd_free_workspace(struct list_head *ws); void zstd_free_workspace(struct list_head *ws);
static struct list_head *zstd_alloc_workspace(unsigned int level); struct list_head *zstd_alloc_workspace(unsigned int level);
/* /*
* zstd_reclaim_timer_fn - reclaim timer * zstd_reclaim_timer_fn - reclaim timer
* @t: timer * @t: timer
...@@ -261,7 +260,7 @@ static struct list_head *zstd_find_workspace(unsigned int level) ...@@ -261,7 +260,7 @@ static struct list_head *zstd_find_workspace(unsigned int level)
* attempt to allocate a new workspace. If we fail to allocate one due to * attempt to allocate a new workspace. If we fail to allocate one due to
* memory pressure, go to sleep waiting for the max level workspace to free up. * memory pressure, go to sleep waiting for the max level workspace to free up.
*/ */
static struct list_head *zstd_get_workspace(unsigned int level) struct list_head *zstd_get_workspace(unsigned int level)
{ {
struct list_head *ws; struct list_head *ws;
unsigned int nofs_flag; unsigned int nofs_flag;
...@@ -302,7 +301,7 @@ static struct list_head *zstd_get_workspace(unsigned int level) ...@@ -302,7 +301,7 @@ static struct list_head *zstd_get_workspace(unsigned int level)
* isn't set, it is also set here. Only the max level workspace tries and wakes * isn't set, it is also set here. Only the max level workspace tries and wakes
* up waiting workspaces. * up waiting workspaces.
*/ */
static void zstd_put_workspace(struct list_head *ws) void zstd_put_workspace(struct list_head *ws)
{ {
struct workspace *workspace = list_to_workspace(ws); struct workspace *workspace = list_to_workspace(ws);
...@@ -332,7 +331,7 @@ static void zstd_put_workspace(struct list_head *ws) ...@@ -332,7 +331,7 @@ static void zstd_put_workspace(struct list_head *ws)
cond_wake_up(&wsm.wait); cond_wake_up(&wsm.wait);
} }
static void zstd_free_workspace(struct list_head *ws) void zstd_free_workspace(struct list_head *ws)
{ {
struct workspace *workspace = list_entry(ws, struct workspace, list); struct workspace *workspace = list_entry(ws, struct workspace, list);
...@@ -341,7 +340,7 @@ static void zstd_free_workspace(struct list_head *ws) ...@@ -341,7 +340,7 @@ static void zstd_free_workspace(struct list_head *ws)
kfree(workspace); kfree(workspace);
} }
static struct list_head *zstd_alloc_workspace(unsigned int level) struct list_head *zstd_alloc_workspace(unsigned int level)
{ {
struct workspace *workspace; struct workspace *workspace;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment