btrfs: compression: allocate heuristic buckets with workspace

Avoid allocating the heuristic buckets separately from the workspace,
the lifetime is the same.

The new size of struct heuristic_ws is 2112.  SLUB merges same/similar
sized structures for the named caches, so there's a chance such size
already exists on the system, like below:

  $ grep 2112 /proc/slabinfo
  sighand_cache        593   1335   2112   15   8

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Rosen Penev 2026-07-03 15:45:57 -07:00 committed by David Sterba
parent 01c2f41fc4
commit f6c02cd048

View File

@ -651,9 +651,9 @@ struct heuristic_ws {
u8 *sample;
u32 sample_size;
/* Buckets store counters for each byte value */
struct bucket_item *bucket;
struct bucket_item bucket[BUCKET_SIZE];
/* Sorting buffer */
struct bucket_item *bucket_b;
struct bucket_item bucket_b[BUCKET_SIZE];
struct list_head list;
};
@ -664,8 +664,6 @@ static void free_heuristic_ws(struct list_head *ws)
workspace = list_entry(ws, struct heuristic_ws, list);
kvfree(workspace->sample);
kfree(workspace->bucket);
kfree(workspace->bucket_b);
kfree(workspace);
}
@ -681,14 +679,6 @@ static struct list_head *alloc_heuristic_ws(struct btrfs_fs_info *fs_info)
if (!ws->sample)
goto fail;
ws->bucket = kzalloc_objs(*ws->bucket, BUCKET_SIZE);
if (!ws->bucket)
goto fail;
ws->bucket_b = kzalloc_objs(*ws->bucket_b, BUCKET_SIZE);
if (!ws->bucket_b)
goto fail;
INIT_LIST_HEAD(&ws->list);
return &ws->list;
fail: