* [PATCH v2 0/3] erofs-utils: introduce xattr name bloom filter
@ 2023-07-05 7:10 Jingbo Xu
2023-07-05 7:10 ` [PATCH v2 1/3] erofs-utils: add xxh32 library Jingbo Xu
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jingbo Xu @ 2023-07-05 7:10 UTC (permalink / raw)
To: hsiangkao, chao, huyue2, linux-erofs; +Cc: alexl
changes since RFC:
- the number of hash functions is 1, and now it's implemented as:
xxh32(name, strlen(name), EROFS_XATTR_FILTER_SEED + index),
where the constant magic number EROFS_XATTR_FILTER_SEED [*] is used to
give a better spread for the mapping. (Alexander Larsson)
- fix the value of EROFS_FEATURE_COMPAT_XATTR_FILTER; rename
EROFS_XATTR_BLOOM_* to EROFS_XATTR_FILTER_* (Gao Xiang)
RFC: https://lore.kernel.org/all/20230621083939.128961-1-jefflexu@linux.alibaba.com/
The xattr bloom filter feature is used to boost the negative xattr
lookup.
Refer to the kernel patch set [*] for more details.
[*] https://lore.kernel.org/all/20230705070427.92579-1-jefflexu@linux.alibaba.com/
Jingbo Xu (3):
erofs-utils: add xxh32 library
erofs-utils: update on-disk format for xattr name filter
erofs-utils: mkfs: enable xattr name filter
include/erofs/config.h | 1 +
include/erofs/internal.h | 1 +
include/erofs/xxhash.h | 35 +++++++++++++++++
include/erofs_fs.h | 10 ++++-
lib/Makefile.am | 3 +-
lib/xattr.c | 74 ++++++++++++++++++++++++++--------
lib/xxhash.c | 85 ++++++++++++++++++++++++++++++++++++++++
mkfs/main.c | 6 +++
8 files changed, 197 insertions(+), 18 deletions(-)
create mode 100644 include/erofs/xxhash.h
create mode 100644 lib/xxhash.c
--
2.19.1.6.gb485710b
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 1/3] erofs-utils: add xxh32 library 2023-07-05 7:10 [PATCH v2 0/3] erofs-utils: introduce xattr name bloom filter Jingbo Xu @ 2023-07-05 7:10 ` Jingbo Xu 2023-07-05 7:29 ` Gao Xiang 2023-07-05 7:10 ` [PATCH v2 2/3] erofs-utils: update on-disk format for xattr name filter Jingbo Xu 2023-07-05 7:10 ` [PATCH v2 3/3] erofs-utils: mkfs: enable " Jingbo Xu 2 siblings, 1 reply; 6+ messages in thread From: Jingbo Xu @ 2023-07-05 7:10 UTC (permalink / raw) To: hsiangkao, chao, huyue2, linux-erofs; +Cc: alexl Add xxh32 library which could be used by following xattr bloom filter feature. Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com> --- include/erofs/xxhash.h | 35 +++++++++++++++++ lib/Makefile.am | 3 +- lib/xxhash.c | 85 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 include/erofs/xxhash.h create mode 100644 lib/xxhash.c diff --git a/include/erofs/xxhash.h b/include/erofs/xxhash.h new file mode 100644 index 0000000..fd9384e --- /dev/null +++ b/include/erofs/xxhash.h @@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __EROFS_XXHASH_H +#define __EROFS_XXHASH_H + +#ifdef __cplusplus +extern "C" +{ +#endif + +#include "defs.h" + +/* + * Copied from + * https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git + * xxHash - Extremely Fast Hash algorithm + */ + +/** + * xxh32() - calculate the 32-bit hash of the input with a given seed. + * + * @input: The data to hash. + * @length: The length of the data to hash. + * @seed: The seed can be used to alter the result predictably. + * + * Speed on Core 2 Duo @ 3 GHz (single thread, SMHasher benchmark) : 5.4 GB/s + * + * Return: The 32-bit hash of the data. + */ +uint32_t xxh32(const void *input, size_t length, uint32_t seed); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/lib/Makefile.am b/lib/Makefile.am index faa7311..a049af6 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -23,13 +23,14 @@ noinst_HEADERS = $(top_srcdir)/include/erofs_fs.h \ $(top_srcdir)/include/erofs/xattr.h \ $(top_srcdir)/include/erofs/compress_hints.h \ $(top_srcdir)/include/erofs/fragments.h \ + $(top_srcdir)/include/erofs/xxhash.h \ $(top_srcdir)/lib/liberofs_private.h noinst_HEADERS += compressor.h liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \ namei.c data.c compress.c compressor.c zmap.c decompress.c \ compress_hints.c hashmap.c sha256.c blobchunk.c dir.c \ - fragments.c rb_tree.c dedupe.c + fragments.c rb_tree.c dedupe.c xxhash.c liberofs_la_CFLAGS = -Wall -I$(top_srcdir)/include if ENABLE_LZ4 diff --git a/lib/xxhash.c b/lib/xxhash.c new file mode 100644 index 0000000..e5f511c --- /dev/null +++ b/lib/xxhash.c @@ -0,0 +1,85 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copied from + * https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git + * xxHash - Extremely Fast Hash algorithm + */ +#include "erofs/xxhash.h" + +/*-************************************* + * Macros + **************************************/ +#define xxh_rotl32(x, r) ((x << r) | (x >> (32 - r))) + +/*-************************************* + * Constants + **************************************/ +static const uint32_t PRIME32_1 = 2654435761U; +static const uint32_t PRIME32_2 = 2246822519U; +static const uint32_t PRIME32_3 = 3266489917U; +static const uint32_t PRIME32_4 = 668265263U; +static const uint32_t PRIME32_5 = 374761393U; + +/*-*************************** + * Simple Hash Functions + ****************************/ +static uint32_t xxh32_round(uint32_t seed, const uint32_t input) +{ + seed += input * PRIME32_2; + seed = xxh_rotl32(seed, 13); + seed *= PRIME32_1; + return seed; +} + +uint32_t xxh32(const void *input, const size_t len, const uint32_t seed) +{ + const uint8_t *p = (const uint8_t *)input; + const uint8_t *b_end = p + len; + uint32_t h32; + + if (len >= 16) { + const uint8_t *const limit = b_end - 16; + uint32_t v1 = seed + PRIME32_1 + PRIME32_2; + uint32_t v2 = seed + PRIME32_2; + uint32_t v3 = seed + 0; + uint32_t v4 = seed - PRIME32_1; + + do { + v1 = xxh32_round(v1, get_unaligned_le32(p)); + p += 4; + v2 = xxh32_round(v2, get_unaligned_le32(p)); + p += 4; + v3 = xxh32_round(v3, get_unaligned_le32(p)); + p += 4; + v4 = xxh32_round(v4, get_unaligned_le32(p)); + p += 4; + } while (p <= limit); + + h32 = xxh_rotl32(v1, 1) + xxh_rotl32(v2, 7) + + xxh_rotl32(v3, 12) + xxh_rotl32(v4, 18); + } else { + h32 = seed + PRIME32_5; + } + + h32 += (uint32_t)len; + + while (p + 4 <= b_end) { + h32 += get_unaligned_le32(p) * PRIME32_3; + h32 = xxh_rotl32(h32, 17) * PRIME32_4; + p += 4; + } + + while (p < b_end) { + h32 += (*p) * PRIME32_5; + h32 = xxh_rotl32(h32, 11) * PRIME32_1; + p++; + } + + h32 ^= h32 >> 15; + h32 *= PRIME32_2; + h32 ^= h32 >> 13; + h32 *= PRIME32_3; + h32 ^= h32 >> 16; + + return h32; +} -- 2.19.1.6.gb485710b ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/3] erofs-utils: add xxh32 library 2023-07-05 7:10 ` [PATCH v2 1/3] erofs-utils: add xxh32 library Jingbo Xu @ 2023-07-05 7:29 ` Gao Xiang 2023-07-12 11:58 ` Jingbo Xu 0 siblings, 1 reply; 6+ messages in thread From: Gao Xiang @ 2023-07-05 7:29 UTC (permalink / raw) To: Jingbo Xu, chao, huyue2, linux-erofs; +Cc: alexl On 2023/7/5 15:10, Jingbo Xu wrote: > Add xxh32 library which could be used by following xattr bloom filter > feature. > > Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com> I'd suggest using the original xxhash library instead of copying an simplified implementation here since we don't touch the implementation. https://rpmfind.net/linux/rpm2html/search.php?query=xxhash Thanks, Gao Xiang ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/3] erofs-utils: add xxh32 library 2023-07-05 7:29 ` Gao Xiang @ 2023-07-12 11:58 ` Jingbo Xu 0 siblings, 0 replies; 6+ messages in thread From: Jingbo Xu @ 2023-07-12 11:58 UTC (permalink / raw) To: Gao Xiang, chao, huyue2, linux-erofs; +Cc: alexl On 7/5/23 3:29 PM, Gao Xiang wrote: > > > On 2023/7/5 15:10, Jingbo Xu wrote: >> Add xxh32 library which could be used by following xattr bloom filter >> feature. >> >> Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com> > > I'd suggest using the original xxhash library instead of copying an > simplified implementation here since we don't touch the implementation. > > https://rpmfind.net/linux/rpm2html/search.php?query=xxhash Yeah. I think xxhash-devel is available in most distributions. XXH32() could be used directly here and configure.ac needs to be updated to reflect the package dependency. As I'm not quite familiar with autoconf/automake, later in v3 I will still attach the self-implemented xxh32() in erofs-utils. Maybe later we could change to use libxxhash directly. -- Thanks, Jingbo ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/3] erofs-utils: update on-disk format for xattr name filter 2023-07-05 7:10 [PATCH v2 0/3] erofs-utils: introduce xattr name bloom filter Jingbo Xu 2023-07-05 7:10 ` [PATCH v2 1/3] erofs-utils: add xxh32 library Jingbo Xu @ 2023-07-05 7:10 ` Jingbo Xu 2023-07-05 7:10 ` [PATCH v2 3/3] erofs-utils: mkfs: enable " Jingbo Xu 2 siblings, 0 replies; 6+ messages in thread From: Jingbo Xu @ 2023-07-05 7:10 UTC (permalink / raw) To: hsiangkao, chao, huyue2, linux-erofs; +Cc: alexl The xattr name bloom filter feature is going to be introduced to speed up the negative xattr lookup, e.g. system.posix_acl_[access|default] lookup when running "ls -lR" workload. The number of common used extended attributes (n) is approximately 30. trusted.overlay.opaque trusted.overlay.redirect trusted.overlay.origin trusted.overlay.impure trusted.overlay.nlink trusted.overlay.upper trusted.overlay.metacopy trusted.overlay.protattr user.overlay.opaque user.overlay.redirect user.overlay.origin user.overlay.impure user.overlay.nlink user.overlay.upper user.overlay.metacopy user.overlay.protattr security.evm security.ima security.selinux security.SMACK64 security.SMACK64IPIN security.SMACK64IPOUT security.SMACK64EXEC security.SMACK64TRANSMUTE security.SMACK64MMAP security.apparmor security.capability system.posix_acl_access system.posix_acl_default user.mime_type Given the number of bits of the bloom filter (m) is 32, the optimal value for the number of the hash functions (k) is 1 (ln2 * m/n = 0.74). The single hash function is implemented as: xxh32(name, strlen(name), EROFS_XATTR_FILTER_SEED + index) where index represents the index of corresponding predefined short name prefix, while name represents the name string after stripping the above predefined name prefix. The constant magic number EROFS_XATTR_FILTER_SEED, i.e. 0x25BBE08F, is used to give a better spread when mapping these 30 extended attributes into 32-bit bloom filter as: bit 0: security.ima bit 1: bit 2: trusted.overlay.nlink bit 3: bit 4: user.overlay.nlink bit 5: trusted.overlay.upper bit 6: user.overlay.origin bit 7: trusted.overlay.protattr bit 8: security.apparmor bit 9: user.overlay.protattr bit 10: user.overlay.opaque bit 11: security.selinux bit 12: security.SMACK64TRANSMUTE bit 13: security.SMACK64 bit 14: security.SMACK64MMAP bit 15: user.overlay.impure bit 16: security.SMACK64IPIN bit 17: trusted.overlay.redirect bit 18: trusted.overlay.origin bit 19: security.SMACK64IPOUT bit 20: trusted.overlay.opaque bit 21: system.posix_acl_default bit 22: bit 23: user.mime_type bit 24: trusted.overlay.impure bit 25: security.SMACK64EXEC bit 26: user.overlay.redirect bit 27: user.overlay.upper bit 28: security.evm bit 29: security.capability bit 30: system.posix_acl_access bit 31: trusted.overlay.metacopy, user.overlay.metacopy The h_name_filter field is introduced to the on-disk per-inode xattr header to place the corresponding xattr name filter, where bit value 1 indicates non-existence for compatibility. This feature is indicated by EROFS_FEATURE_COMPAT_XATTR_FILTER compatible feature bit. Suggested-by: Alexander Larsson <alexl@redhat.com> Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com> --- include/erofs_fs.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/erofs_fs.h b/include/erofs_fs.h index 3697882..1ffaaef 100644 --- a/include/erofs_fs.h +++ b/include/erofs_fs.h @@ -14,6 +14,7 @@ #define EROFS_FEATURE_COMPAT_SB_CHKSUM 0x00000001 #define EROFS_FEATURE_COMPAT_MTIME 0x00000002 +#define EROFS_FEATURE_COMPAT_XATTR_FILTER 0x00000004 /* * Any bits that aren't in EROFS_ALL_FEATURE_INCOMPAT should @@ -201,7 +202,7 @@ struct erofs_inode_extended { * for read-only fs, no need to introduce h_refcount */ struct erofs_xattr_ibody_header { - __le32 h_reserved; + __le32 h_name_filter; /* bit value 1 indicates not-present */ __u8 h_shared_count; __u8 h_reserved2[7]; __le32 h_shared_xattrs[0]; /* shared xattr id array */ @@ -222,6 +223,13 @@ struct erofs_xattr_ibody_header { #define EROFS_XATTR_LONG_PREFIX 0x80 #define EROFS_XATTR_LONG_PREFIX_MASK 0x7f +#define EROFS_XATTR_NAME_LEN_MAX UCHAR_MAX + +#define EROFS_XATTR_FILTER_BITS 32 +#define EROFS_XATTR_FILTER_MASK (EROFS_XATTR_FILTER_BITS - 1) +#define EROFS_XATTR_FILTER_DEFAULT UINT32_MAX +#define EROFS_XATTR_FILTER_SEED 0x25BBE08F + /* xattr entry (for both inline & shared xattrs) */ struct erofs_xattr_entry { __u8 e_name_len; /* length of name */ -- 2.19.1.6.gb485710b ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/3] erofs-utils: mkfs: enable xattr name filter 2023-07-05 7:10 [PATCH v2 0/3] erofs-utils: introduce xattr name bloom filter Jingbo Xu 2023-07-05 7:10 ` [PATCH v2 1/3] erofs-utils: add xxh32 library Jingbo Xu 2023-07-05 7:10 ` [PATCH v2 2/3] erofs-utils: update on-disk format for xattr name filter Jingbo Xu @ 2023-07-05 7:10 ` Jingbo Xu 2 siblings, 0 replies; 6+ messages in thread From: Jingbo Xu @ 2023-07-05 7:10 UTC (permalink / raw) To: hsiangkao, chao, huyue2, linux-erofs; +Cc: alexl Introduce "--xattr-filter" option to enable the xattr name bloom filter feature. Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com> --- include/erofs/config.h | 1 + include/erofs/internal.h | 1 + lib/xattr.c | 74 +++++++++++++++++++++++++++++++--------- mkfs/main.c | 6 ++++ 4 files changed, 66 insertions(+), 16 deletions(-) diff --git a/include/erofs/config.h b/include/erofs/config.h index 8f52d2c..2803f37 100644 --- a/include/erofs/config.h +++ b/include/erofs/config.h @@ -53,6 +53,7 @@ struct erofs_configure { bool c_ignore_mtime; bool c_showprogress; bool c_extra_ea_name_prefixes; + bool c_xattr_filter; #ifdef HAVE_LIBSELINUX struct selabel_handle *sehnd; diff --git a/include/erofs/internal.h b/include/erofs/internal.h index ab964d4..1d7ef73 100644 --- a/include/erofs/internal.h +++ b/include/erofs/internal.h @@ -133,6 +133,7 @@ EROFS_FEATURE_FUNCS(fragments, incompat, INCOMPAT_FRAGMENTS) EROFS_FEATURE_FUNCS(dedupe, incompat, INCOMPAT_DEDUPE) EROFS_FEATURE_FUNCS(xattr_prefixes, incompat, INCOMPAT_XATTR_PREFIXES) EROFS_FEATURE_FUNCS(sb_chksum, compat, COMPAT_SB_CHKSUM) +EROFS_FEATURE_FUNCS(xattr_filter, compat, COMPAT_XATTR_FILTER) #define EROFS_I_EA_INITED (1 << 0) #define EROFS_I_Z_INITED (1 << 1) diff --git a/lib/xattr.c b/lib/xattr.c index 7d7dc54..c9126c6 100644 --- a/lib/xattr.c +++ b/lib/xattr.c @@ -18,6 +18,7 @@ #include "erofs/cache.h" #include "erofs/io.h" #include "erofs/fragments.h" +#include "erofs/xxhash.h" #include "liberofs_private.h" #define EA_HASHTABLE_BITS 16 @@ -26,6 +27,7 @@ struct xattr_item { struct xattr_item *next_shared_xattr; const char *kvbuf; unsigned int hash[2], len[2], count; + unsigned int name_filter_bit; int shared_xattr_id; u8 prefix; struct hlist_node node; @@ -101,7 +103,8 @@ static unsigned int put_xattritem(struct xattr_item *item) } static struct xattr_item *get_xattritem(u8 prefix, char *kvbuf, - unsigned int len[2]) + unsigned int len[2], + unsigned int name_filter_bit) { struct xattr_item *item; unsigned int hash[2], hkey; @@ -133,40 +136,59 @@ static struct xattr_item *get_xattritem(u8 prefix, char *kvbuf, item->hash[1] = hash[1]; item->shared_xattr_id = -1; item->prefix = prefix; + item->name_filter_bit = name_filter_bit; hash_add(ea_hashtable, &item->node, hkey); return item; } -static bool match_prefix(const char *key, u8 *index, u16 *len) +static unsigned int erofs_xattr_calc_name_filter_bit(u8 prefix, const char *key, + unsigned int len) +{ + if (!cfg.c_xattr_filter) + return 0; + return xxh32(key, len, EROFS_XATTR_FILTER_SEED + prefix) & + EROFS_XATTR_FILTER_MASK; +} + +static bool match_short_prefix(const char *key, u8 *index, u16 *len) { struct xattr_prefix *p; - struct ea_type_node *tnode; - list_for_each_entry(tnode, &ea_name_prefixes, list) { - p = &tnode->type; + for (p = xattr_types; p < xattr_types + ARRAY_SIZE(xattr_types); ++p) { if (p->prefix && !strncmp(p->prefix, key, p->prefix_len)) { *len = p->prefix_len; - *index = tnode->index; + *index = p - xattr_types; return true; } } - for (p = xattr_types; p < xattr_types + ARRAY_SIZE(xattr_types); ++p) { + return false; +} + +static bool match_prefix(const char *key, u8 *index, u16 *len) +{ + struct xattr_prefix *p; + struct ea_type_node *tnode; + + list_for_each_entry(tnode, &ea_name_prefixes, list) { + p = &tnode->type; if (p->prefix && !strncmp(p->prefix, key, p->prefix_len)) { *len = p->prefix_len; - *index = p - xattr_types; + *index = tnode->index; return true; } } - return false; + + return match_short_prefix(key, index, len); } static struct xattr_item *parse_one_xattr(const char *path, const char *key, unsigned int keylen) { ssize_t ret; - u8 prefix; - u16 prefixlen; + u8 prefix, o_prefix; + u16 prefixlen, o_prefixlen; unsigned int len[2]; + unsigned int bit = 0; char *kvbuf; erofs_dbg("parse xattr [%s] of %s", path, key); @@ -176,6 +198,13 @@ static struct xattr_item *parse_one_xattr(const char *path, const char *key, DBG_BUGON(keylen < prefixlen); + if (cfg.c_xattr_filter) { + if (!match_short_prefix(key, &o_prefix, &o_prefixlen)) + return ERR_PTR(-ENODATA); + bit = erofs_xattr_calc_name_filter_bit(o_prefix, + key + o_prefixlen, keylen - o_prefixlen); + } + /* determine length of the value */ #ifdef HAVE_LGETXATTR ret = lgetxattr(path, key, NULL, 0); @@ -216,7 +245,7 @@ static struct xattr_item *parse_one_xattr(const char *path, const char *key, len[1] = ret; } } - return get_xattritem(prefix, kvbuf, len); + return get_xattritem(prefix, kvbuf, len, bit); } static struct xattr_item *erofs_get_selabel_xattr(const char *srcpath, @@ -226,7 +255,7 @@ static struct xattr_item *erofs_get_selabel_xattr(const char *srcpath, if (cfg.sehnd) { char *secontext; int ret; - unsigned int len[2]; + unsigned int bit, len[2]; char *kvbuf, *fspath; if (cfg.mount_point) @@ -260,7 +289,8 @@ static struct xattr_item *erofs_get_selabel_xattr(const char *srcpath, } sprintf(kvbuf, "selinux%s", secontext); freecon(secontext); - return get_xattritem(EROFS_XATTR_INDEX_SECURITY, kvbuf, len); + bit = erofs_xattr_calc_name_filter_bit(EROFS_XATTR_INDEX_SECURITY, "selinux", len[0]); + return get_xattritem(EROFS_XATTR_INDEX_SECURITY, kvbuf, len, bit); } #endif return NULL; @@ -408,7 +438,7 @@ static int erofs_droid_xattr_set_caps(struct erofs_inode *inode) { const u64 capabilities = inode->capabilities; char *kvbuf; - unsigned int len[2]; + unsigned int bit, len[2]; struct vfs_cap_data caps; struct xattr_item *item; @@ -430,7 +460,8 @@ static int erofs_droid_xattr_set_caps(struct erofs_inode *inode) caps.data[1].inheritable = 0; memcpy(kvbuf + len[0], &caps, len[1]); - item = get_xattritem(EROFS_XATTR_INDEX_SECURITY, kvbuf, len); + bit = erofs_xattr_calc_name_filter_bit(EROFS_XATTR_INDEX_SECURITY, "capability", len[0]); + item = get_xattritem(EROFS_XATTR_INDEX_SECURITY, kvbuf, len, bit); if (IS_ERR(item)) return PTR_ERR(item); if (!item) @@ -754,6 +785,17 @@ char *erofs_export_xattr_ibody(struct list_head *ixattrs, unsigned int size) header = (struct erofs_xattr_ibody_header *)buf; header->h_shared_count = 0; + if (cfg.c_xattr_filter) { + u32 name_filter = 0; + + list_for_each_entry_safe(node, n, ixattrs, list) { + struct xattr_item *const item = node->item; + name_filter |= 1UL << item->name_filter_bit; + } + name_filter = EROFS_XATTR_FILTER_DEFAULT & ~name_filter; + header->h_name_filter = cpu_to_le32(name_filter); + } + p = sizeof(struct erofs_xattr_ibody_header); list_for_each_entry_safe(node, n, ixattrs, list) { struct xattr_item *const item = node->item; diff --git a/mkfs/main.c b/mkfs/main.c index ac208e5..84d4414 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -58,6 +58,7 @@ static struct option long_options[] = { {"gid-offset", required_argument, NULL, 17}, {"mount-point", required_argument, NULL, 512}, {"xattr-prefix", required_argument, NULL, 19}, + {"xattr-filter", no_argument, NULL, 20}, #ifdef WITH_ANDROID {"product-out", required_argument, NULL, 513}, {"fs-config-file", required_argument, NULL, 514}, @@ -118,6 +119,7 @@ static void usage(void) " --random-algorithms randomize per-file algorithms (debugging only)\n" #endif " --xattr-prefix=X X=extra xattr name prefix\n" + " --xattr-filter enable xattr name bloom filter\n" " --mount-point=X X=prefix of target fs path (default: /)\n" #ifdef WITH_ANDROID "\nwith following android-specific options:\n" @@ -482,6 +484,10 @@ static int mkfs_parse_options_cfg(int argc, char *argv[]) } cfg.c_extra_ea_name_prefixes = true; break; + case 20: + cfg.c_xattr_filter = true; + erofs_sb_set_xattr_filter(); + break; case 1: usage(); exit(0); -- 2.19.1.6.gb485710b ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-07-12 11:58 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-07-05 7:10 [PATCH v2 0/3] erofs-utils: introduce xattr name bloom filter Jingbo Xu 2023-07-05 7:10 ` [PATCH v2 1/3] erofs-utils: add xxh32 library Jingbo Xu 2023-07-05 7:29 ` Gao Xiang 2023-07-12 11:58 ` Jingbo Xu 2023-07-05 7:10 ` [PATCH v2 2/3] erofs-utils: update on-disk format for xattr name filter Jingbo Xu 2023-07-05 7:10 ` [PATCH v2 3/3] erofs-utils: mkfs: enable " Jingbo Xu
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.