From: Jingbo Xu <jefflexu@linux.alibaba.com>
To: hsiangkao@linux.alibaba.com, linux-erofs@lists.ozlabs.org
Subject: [PATCH v7 3/3] erofs-utils: mkfs: enable xattr name filter
Date: Tue, 29 Aug 2023 22:55:04 +0800 [thread overview]
Message-ID: <20230829145504.93567-4-jefflexu@linux.alibaba.com> (raw)
In-Reply-To: <20230829145504.93567-1-jefflexu@linux.alibaba.com>
Introduce "-Exattr-name-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 | 65 ++++++++++++++++++++++++++++++++++++++++
mkfs/main.c | 7 +++++
4 files changed, 74 insertions(+)
diff --git a/include/erofs/config.h b/include/erofs/config.h
index 8f52d2c..c51f0cd 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_name_filter;
#ifdef HAVE_LIBSELINUX
struct selabel_handle *sehnd;
diff --git a/include/erofs/internal.h b/include/erofs/internal.h
index 3e73eef..382024a 100644
--- a/include/erofs/internal.h
+++ b/include/erofs/internal.h
@@ -139,6 +139,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 46a301a..95f73a7 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
@@ -783,6 +784,65 @@ out:
return ret;
}
+
+static int erofs_xattr_filter_hashbit(struct xattr_item *item)
+{
+ u8 prefix = item->prefix;
+ const char *key = item->kvbuf;
+ unsigned int len = item->len[0];
+ char *name = NULL;
+ uint32_t hashbit;
+
+ if (prefix & EROFS_XATTR_LONG_PREFIX) {
+ struct ea_type_node *tnode;
+ u16 prefix_len;
+ int ret;
+
+ list_for_each_entry(tnode, &ea_name_prefixes, list) {
+ if (tnode->index == item->prefix) {
+ ret = asprintf(&name, "%s%.*s",
+ tnode->type.prefix, len, key);
+ if (ret < 0)
+ return -ENOMEM;
+ break;
+ }
+ }
+ if (!name)
+ return -ENOENT;
+
+ if (!match_base_prefix(name, &prefix, &prefix_len)) {
+ free(name);
+ return -ENOENT;
+ }
+ key = name + prefix_len;
+ len = strlen(key);
+ }
+
+ hashbit = xxh32(key, len, EROFS_XATTR_FILTER_SEED + prefix) &
+ (EROFS_XATTR_FILTER_BITS - 1);
+ if (name)
+ free(name);
+ return hashbit;
+}
+
+static u32 erofs_xattr_filter_map(struct list_head *ixattrs)
+{
+ struct inode_xattr_node *node, *n;
+ u32 name_filter;
+ int hashbit;
+
+ name_filter = 0;
+ list_for_each_entry_safe(node, n, ixattrs, list) {
+ hashbit = erofs_xattr_filter_hashbit(node->item);
+ if (hashbit < 0) {
+ erofs_warn("fallback to xattr filter disabled");
+ return 0;
+ }
+ name_filter |= (1UL << hashbit);
+ }
+ return EROFS_XATTR_FILTER_DEFAULT & ~name_filter;
+}
+
char *erofs_export_xattr_ibody(struct list_head *ixattrs, unsigned int size)
{
struct inode_xattr_node *node, *n;
@@ -797,6 +857,11 @@ 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_name_filter) {
+ header->h_name_filter =
+ cpu_to_le32(erofs_xattr_filter_map(ixattrs));
+ }
+
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 c03a7a8..fad80b1 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -245,6 +245,13 @@ handle_fragment:
return -EINVAL;
cfg.c_dedupe = true;
}
+
+ if (MATCH_EXTENTED_OPT("xattr-name-filter", token, keylen)) {
+ if (vallen)
+ return -EINVAL;
+ cfg.c_xattr_name_filter = true;
+ erofs_sb_set_xattr_filter(&sbi);
+ }
}
return 0;
}
--
2.19.1.6.gb485710b
next prev parent reply other threads:[~2023-08-29 14:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-29 14:55 [PATCH v7 0/3] erofs-utils: introduce xattr name bloom filter Jingbo Xu
2023-08-29 14:55 ` [PATCH v7 1/3] erofs-utils: add xxh32 library Jingbo Xu
2023-08-29 14:55 ` [PATCH v7 2/3] erofs-utils: update on-disk format for xattr name filter Jingbo Xu
2023-08-29 14:55 ` Jingbo Xu [this message]
2023-08-29 18:07 ` [PATCH v7 0/3] erofs-utils: introduce xattr name bloom filter Gao Xiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230829145504.93567-4-jefflexu@linux.alibaba.com \
--to=jefflexu@linux.alibaba.com \
--cc=hsiangkao@linux.alibaba.com \
--cc=linux-erofs@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox