mirror of
https://github.com/torvalds/linux.git
synced 2024-12-25 20:32:22 +00:00
b16671e8f4
When large bucket feature was added, BCH_FEATURE_INCOMPAT_LARGE_BUCKET
was introduced into the incompat feature set. It used bucket_size_hi
(which was added at the tail of struct cache_sb_disk) to extend current
16bit bucket size to 32bit with existing bucket_size in struct
cache_sb_disk.
This is not a good idea, there are two obvious problems,
- Bucket size is always value power of 2, if store log2(bucket size) in
existing bucket_size of struct cache_sb_disk, it is unnecessary to add
bucket_size_hi.
- Macro csum_set() assumes d[SB_JOURNAL_BUCKETS] is the last member in
struct cache_sb_disk, bucket_size_hi was added after d[] which makes
csum_set calculate an unexpected super block checksum.
To fix the above problems, this patch introduces a new incompat feature
bit BCH_FEATURE_INCOMPAT_LOG_LARGE_BUCKET_SIZE, when this bit is set, it
means bucket_size in struct cache_sb_disk stores the order of power-of-2
bucket size value. When user specifies a bucket size larger than 32768
sectors, BCH_FEATURE_INCOMPAT_LOG_LARGE_BUCKET_SIZE will be set to
incompat feature set, and bucket_size stores log2(bucket size) more
than store the real bucket size value.
The obsoleted BCH_FEATURE_INCOMPAT_LARGE_BUCKET won't be used anymore,
it is renamed to BCH_FEATURE_INCOMPAT_OBSO_LARGE_BUCKET and still only
recognized by kernel driver for legacy compatible purpose. The previous
bucket_size_hi is renmaed to obso_bucket_size_hi in struct cache_sb_disk
and not used in bcache-tools anymore.
For cache device created with BCH_FEATURE_INCOMPAT_LARGE_BUCKET feature,
bcache-tools and kernel driver still recognize the feature string and
display it as "obso_large_bucket".
With this change, the unnecessary extra space extend of bcache on-disk
super block can be avoided, and csum_set() may generate expected check
sum as well.
Fixes: ffa4703275 ("bcache: add bucket_size_hi into struct cache_sb_disk for large bucket")
Signed-off-by: Coly Li <colyli@suse.de>
Cc: stable@vger.kernel.org # 5.9+
Signed-off-by: Jens Axboe <axboe@kernel.dk>
107 lines
3.2 KiB
C
107 lines
3.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
|
#ifndef _BCACHE_FEATURES_H
|
|
#define _BCACHE_FEATURES_H
|
|
|
|
#include <linux/bcache.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/types.h>
|
|
|
|
#define BCH_FEATURE_COMPAT 0
|
|
#define BCH_FEATURE_RO_COMPAT 1
|
|
#define BCH_FEATURE_INCOMPAT 2
|
|
#define BCH_FEATURE_TYPE_MASK 0x03
|
|
|
|
/* Feature set definition */
|
|
/* Incompat feature set */
|
|
/* 32bit bucket size, obsoleted */
|
|
#define BCH_FEATURE_INCOMPAT_OBSO_LARGE_BUCKET 0x0001
|
|
/* real bucket size is (1 << bucket_size) */
|
|
#define BCH_FEATURE_INCOMPAT_LOG_LARGE_BUCKET_SIZE 0x0002
|
|
|
|
#define BCH_FEATURE_COMPAT_SUPP 0
|
|
#define BCH_FEATURE_RO_COMPAT_SUPP 0
|
|
#define BCH_FEATURE_INCOMPAT_SUPP (BCH_FEATURE_INCOMPAT_OBSO_LARGE_BUCKET| \
|
|
BCH_FEATURE_INCOMPAT_LOG_LARGE_BUCKET_SIZE)
|
|
|
|
#define BCH_HAS_COMPAT_FEATURE(sb, mask) \
|
|
((sb)->feature_compat & (mask))
|
|
#define BCH_HAS_RO_COMPAT_FEATURE(sb, mask) \
|
|
((sb)->feature_ro_compat & (mask))
|
|
#define BCH_HAS_INCOMPAT_FEATURE(sb, mask) \
|
|
((sb)->feature_incompat & (mask))
|
|
|
|
#define BCH_FEATURE_COMPAT_FUNCS(name, flagname) \
|
|
static inline int bch_has_feature_##name(struct cache_sb *sb) \
|
|
{ \
|
|
return (((sb)->feature_compat & \
|
|
BCH##_FEATURE_COMPAT_##flagname) != 0); \
|
|
} \
|
|
static inline void bch_set_feature_##name(struct cache_sb *sb) \
|
|
{ \
|
|
(sb)->feature_compat |= \
|
|
BCH##_FEATURE_COMPAT_##flagname; \
|
|
} \
|
|
static inline void bch_clear_feature_##name(struct cache_sb *sb) \
|
|
{ \
|
|
(sb)->feature_compat &= \
|
|
~BCH##_FEATURE_COMPAT_##flagname; \
|
|
}
|
|
|
|
#define BCH_FEATURE_RO_COMPAT_FUNCS(name, flagname) \
|
|
static inline int bch_has_feature_##name(struct cache_sb *sb) \
|
|
{ \
|
|
return (((sb)->feature_ro_compat & \
|
|
BCH##_FEATURE_RO_COMPAT_##flagname) != 0); \
|
|
} \
|
|
static inline void bch_set_feature_##name(struct cache_sb *sb) \
|
|
{ \
|
|
(sb)->feature_ro_compat |= \
|
|
BCH##_FEATURE_RO_COMPAT_##flagname; \
|
|
} \
|
|
static inline void bch_clear_feature_##name(struct cache_sb *sb) \
|
|
{ \
|
|
(sb)->feature_ro_compat &= \
|
|
~BCH##_FEATURE_RO_COMPAT_##flagname; \
|
|
}
|
|
|
|
#define BCH_FEATURE_INCOMPAT_FUNCS(name, flagname) \
|
|
static inline int bch_has_feature_##name(struct cache_sb *sb) \
|
|
{ \
|
|
return (((sb)->feature_incompat & \
|
|
BCH##_FEATURE_INCOMPAT_##flagname) != 0); \
|
|
} \
|
|
static inline void bch_set_feature_##name(struct cache_sb *sb) \
|
|
{ \
|
|
(sb)->feature_incompat |= \
|
|
BCH##_FEATURE_INCOMPAT_##flagname; \
|
|
} \
|
|
static inline void bch_clear_feature_##name(struct cache_sb *sb) \
|
|
{ \
|
|
(sb)->feature_incompat &= \
|
|
~BCH##_FEATURE_INCOMPAT_##flagname; \
|
|
}
|
|
|
|
BCH_FEATURE_INCOMPAT_FUNCS(obso_large_bucket, OBSO_LARGE_BUCKET);
|
|
BCH_FEATURE_INCOMPAT_FUNCS(large_bucket, LOG_LARGE_BUCKET_SIZE);
|
|
|
|
static inline bool bch_has_unknown_compat_features(struct cache_sb *sb)
|
|
{
|
|
return ((sb->feature_compat & ~BCH_FEATURE_COMPAT_SUPP) != 0);
|
|
}
|
|
|
|
static inline bool bch_has_unknown_ro_compat_features(struct cache_sb *sb)
|
|
{
|
|
return ((sb->feature_ro_compat & ~BCH_FEATURE_RO_COMPAT_SUPP) != 0);
|
|
}
|
|
|
|
static inline bool bch_has_unknown_incompat_features(struct cache_sb *sb)
|
|
{
|
|
return ((sb->feature_incompat & ~BCH_FEATURE_INCOMPAT_SUPP) != 0);
|
|
}
|
|
|
|
int bch_print_cache_set_feature_compat(struct cache_set *c, char *buf, int size);
|
|
int bch_print_cache_set_feature_ro_compat(struct cache_set *c, char *buf, int size);
|
|
int bch_print_cache_set_feature_incompat(struct cache_set *c, char *buf, int size);
|
|
|
|
#endif
|