From: Gabriel Krisman Bertazi <krisman@collabora.com>
To: Daniel Rosenberg <drosen@google.com>
Cc: Theodore Ts'o <tytso@mit.edu>, Jonathan Corbet <corbet@lwn.net>,
Richard Weinberger <richard@nod.at>,
Andreas Dilger <adilger.kernel@dilger.ca>,
Chao Yu <chao@kernel.org>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
Eric Biggers <ebiggers@kernel.org>,
linux-fscrypt@vger.kernel.org, linux-mtd@lists.infradead.org,
Alexander Viro <viro@zeniv.linux.org.uk>,
linux-fsdevel@vger.kernel.org, Jaegeuk Kim <jaegeuk@kernel.org>,
linux-ext4@vger.kernel.org, kernel-team@android.com
Subject: Re: [PATCH v9 1/4] unicode: Add utf8_casefold_hash
Date: Wed, 24 Jun 2020 01:13:17 -0400 [thread overview]
Message-ID: <87h7v1gi6q.fsf@collabora.com> (raw)
In-Reply-To: <20200624043341.33364-2-drosen@google.com> (Daniel Rosenberg's message of "Tue, 23 Jun 2020 21:33:38 -0700")
Daniel Rosenberg <drosen@google.com> writes:
> This adds a case insensitive hash function to allow taking the hash
> without needing to allocate a casefolded copy of the string.
>
> Signed-off-by: Daniel Rosenberg <drosen@google.com>
> ---
> fs/unicode/utf8-core.c | 23 ++++++++++++++++++++++-
> include/linux/unicode.h | 3 +++
> 2 files changed, 25 insertions(+), 1 deletion(-)
>
> diff --git a/fs/unicode/utf8-core.c b/fs/unicode/utf8-core.c
> index 2a878b739115d..90656b9980720 100644
> --- a/fs/unicode/utf8-core.c
> +++ b/fs/unicode/utf8-core.c
> @@ -6,6 +6,7 @@
> #include <linux/parser.h>
> #include <linux/errno.h>
> #include <linux/unicode.h>
> +#include <linux/stringhash.h>
>
> #include "utf8n.h"
>
> @@ -122,9 +123,29 @@ int utf8_casefold(const struct unicode_map *um, const struct qstr *str,
> }
> return -EINVAL;
> }
> -
> EXPORT_SYMBOL(utf8_casefold);
>
> +int utf8_casefold_hash(const struct unicode_map *um, const void *salt,
> + struct qstr *str)
> +{
> + const struct utf8data *data = utf8nfdicf(um->version);
> + struct utf8cursor cur;
> + int c;
> + unsigned long hash = init_name_hash(salt);
> +
> + if (utf8ncursor(&cur, data, str->name, str->len) < 0)
> + return -EINVAL;
> +
> + while ((c = utf8byte(&cur))) {
> + if (c < 0)
> + return c;
Return -EINVAL here to match other unicode functions, since utf8byte
will return -1 on a binary blob, which doesn't make sense for this.
Other than that, looks good to me.
Reviewed-by: Gabriel Krisman Bertazi <krisman@collabora.com>
> + hash = partial_name_hash((unsigned char)c, hash);
> + }
> + str->hash = end_name_hash(hash);
> + return 0;
> +}
> +EXPORT_SYMBOL(utf8_casefold_hash);
> +
> int utf8_normalize(const struct unicode_map *um, const struct qstr *str,
> unsigned char *dest, size_t dlen)
> {
> diff --git a/include/linux/unicode.h b/include/linux/unicode.h
> index 990aa97d80496..74484d44c7554 100644
> --- a/include/linux/unicode.h
> +++ b/include/linux/unicode.h
> @@ -27,6 +27,9 @@ int utf8_normalize(const struct unicode_map *um, const struct qstr *str,
> int utf8_casefold(const struct unicode_map *um, const struct qstr *str,
> unsigned char *dest, size_t dlen);
>
> +int utf8_casefold_hash(const struct unicode_map *um, const void *salt,
> + struct qstr *str);
> +
> struct unicode_map *utf8_load(const char *version);
> void utf8_unload(struct unicode_map *um);
--
Gabriel Krisman Bertazi
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-06-24 5:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-24 4:33 [PATCH v9 0/4] Prepare for upcoming Casefolding/Encryption patches Daniel Rosenberg
2020-06-24 4:33 ` [PATCH v9 1/4] unicode: Add utf8_casefold_hash Daniel Rosenberg
2020-06-24 5:13 ` Gabriel Krisman Bertazi [this message]
2020-06-24 5:37 ` Eric Biggers
2020-06-24 4:33 ` [PATCH v9 2/4] fs: Add standard casefolding support Daniel Rosenberg
2020-06-24 5:33 ` Gabriel Krisman Bertazi
2020-06-24 5:42 ` Eric Biggers
2020-06-24 5:57 ` Eric Biggers
2020-07-03 1:01 ` Daniel Rosenberg
2020-07-03 19:20 ` Eric Biggers
2020-06-24 4:33 ` [PATCH v9 3/4] f2fs: Use generic " Daniel Rosenberg
2020-06-24 4:33 ` [PATCH v9 4/4] ext4: " Daniel Rosenberg
2020-06-24 5:43 ` Gabriel Krisman Bertazi
2020-07-07 10:44 ` Daniel Rosenberg
2020-06-24 6:04 ` Eric Biggers
2020-06-24 5:34 ` [PATCH v9 0/4] Prepare for upcoming Casefolding/Encryption patches Eric Biggers
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=87h7v1gi6q.fsf@collabora.com \
--to=krisman@collabora.com \
--cc=adilger.kernel@dilger.ca \
--cc=chao@kernel.org \
--cc=corbet@lwn.net \
--cc=drosen@google.com \
--cc=ebiggers@kernel.org \
--cc=jaegeuk@kernel.org \
--cc=kernel-team@android.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=richard@nod.at \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/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;
as well as URLs for NNTP newsgroup(s).