From nobody Sun Feb 8 05:59:08 2026 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6AFB739AEB; Wed, 20 Mar 2024 08:46:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924396; cv=none; b=gQ8ZJanOJ8AUgmGziySHQIBzpmofEO7WjOkGljeZwHaJUvZQaMRwmZfFqZ0w23zuuDRLu2q8wTOmC0Pzocc9zyrWbivXU3pxN8a2jW1dCPGI3SyoLYANEm8nwZhInj1xt1sXnWYizzuagzv1OMQ90lc9vRgMgCcsVGAE/VwCWag= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924396; c=relaxed/simple; bh=sSDn7Wfq2OSR5HgXKxsXhUQl5lGRaJDd9ojoG3UQPDU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=c8BNajEXDRMeZWNUw0uPyrKqFtDsHHJmaKHhINrnzpRh+Ps+J/tPUVLuw6fcRFJHBXIsFNvOuZmSyMYAE4Y3R55oHNmG+IkIR62xyDcQKdYbqFuQLwx8Iya56jGlrWzhcvAd2GMuGRMpBDPebU8IIUlIP/Wn6m9RrEOecS/S8Oo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=F0cOw+RD; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="F0cOw+RD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1710924392; bh=sSDn7Wfq2OSR5HgXKxsXhUQl5lGRaJDd9ojoG3UQPDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F0cOw+RDNpHzFlrAomGhWGeSE/cMmKNV2x+hCNGs2lPaez/i0SIqmyq3nlb/6L8w8 0K2lKVz8WVDddt72oI+mj5pjgOBpWpPLA1Za9VvBcFUVh5Srvv4DYrO26YrIVpcY0+ IYWKRqMtbkMA7WL6rd37V4sOUFmDEUuD0dbB4NGsbBrkadpi3HHEHidkaKK9Ps1nqq vJIg4E8n6mVz4AgvV02YOsq3GGD3QVs46HmtOjKIFH1g3vopsW3BIiLqgHlTecj92d tFlhVlAQmX1ixKatIO2ZImiGD+5f1iUwSAW7jJSQC7S2p+wa0D6OdyUEBVKxwBAYoz fi+iktceTvSFw== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 1766F37813C4; Wed, 20 Mar 2024 08:46:29 +0000 (UTC) From: Eugen Hristev To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, jaegeuk@kernel.org, chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@collabora.com, eugen.hristev@collabora.com, viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, krisman@suse.de, Gabriel Krisman Bertazi Subject: [PATCH v14 1/9] ext4: Simplify the handling of cached insensitive names Date: Wed, 20 Mar 2024 10:46:14 +0200 Message-Id: <20240320084622.46643-2-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240320084622.46643-1-eugen.hristev@collabora.com> References: <20240320084622.46643-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Gabriel Krisman Bertazi Keeping it as qstr avoids the unnecessary conversion in ext4_match Signed-off-by: Gabriel Krisman Bertazi [eugen.hristev@collabora.com: port to 6.8-rc3] Signed-off-by: Eugen Hristev --- fs/ext4/ext4.h | 2 +- fs/ext4/namei.c | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index a5d784872303..4061d11b9763 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2506,7 +2506,7 @@ struct ext4_filename { struct fscrypt_str crypto_buf; #endif #if IS_ENABLED(CONFIG_UNICODE) - struct fscrypt_str cf_name; + struct qstr cf_name; #endif }; =20 diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 5e4f65c14dfb..b96983a4c185 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1445,7 +1445,8 @@ static int ext4_ci_compare(const struct inode *parent= , const struct qstr *name, int ext4_fname_setup_ci_filename(struct inode *dir, const struct qstr *ina= me, struct ext4_filename *name) { - struct fscrypt_str *cf_name =3D &name->cf_name; + struct qstr *cf_name =3D &name->cf_name; + unsigned char *buf; struct dx_hash_info *hinfo =3D &name->hinfo; int len; =20 @@ -1455,18 +1456,18 @@ int ext4_fname_setup_ci_filename(struct inode *dir,= const struct qstr *iname, return 0; } =20 - cf_name->name =3D kmalloc(EXT4_NAME_LEN, GFP_NOFS); - if (!cf_name->name) + buf =3D kmalloc(EXT4_NAME_LEN, GFP_NOFS); + if (!buf) return -ENOMEM; =20 - len =3D utf8_casefold(dir->i_sb->s_encoding, - iname, cf_name->name, - EXT4_NAME_LEN); + len =3D utf8_casefold(dir->i_sb->s_encoding, iname, buf, EXT4_NAME_LEN); if (len <=3D 0) { - kfree(cf_name->name); - cf_name->name =3D NULL; + kfree(buf); + buf =3D NULL; } + cf_name->name =3D buf; cf_name->len =3D (unsigned) len; + if (!IS_ENCRYPTED(dir)) return 0; =20 @@ -1503,8 +1504,6 @@ static bool ext4_match(struct inode *parent, if (IS_CASEFOLDED(parent) && (!IS_ENCRYPTED(parent) || fscrypt_has_encryption_key(parent))) { if (fname->cf_name.name) { - struct qstr cf =3D {.name =3D fname->cf_name.name, - .len =3D fname->cf_name.len}; if (IS_ENCRYPTED(parent)) { if (fname->hinfo.hash !=3D EXT4_DIRENT_HASH(de) || fname->hinfo.minor_hash !=3D @@ -1513,8 +1512,8 @@ static bool ext4_match(struct inode *parent, return false; } } - return !ext4_ci_compare(parent, &cf, de->name, - de->name_len, true); + return !ext4_ci_compare(parent, &fname->cf_name, + de->name, de->name_len, true); } return !ext4_ci_compare(parent, fname->usr_fname, de->name, de->name_len, false); --=20 2.34.1 From nobody Sun Feb 8 05:59:08 2026 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE3AA3BB36; Wed, 20 Mar 2024 08:46:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924399; cv=none; b=Naj0p9oObWdn1OMFMW2qUIspHHREg2EwqY08MP5jA3VfrA8EqnK1CFXa7XH/DChNeUDVQRUy7YWIQFj7MiLBhWMsNzQT0N2XidQuLUDfX3RqxDzqWaLI+b+caKnrQGEww2kf5ztR34LWlRKm3xRLozbr2H7AFnB6h1hz4SQjT4M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924399; c=relaxed/simple; bh=xSyEV4LtFGP/kO7x7ObAfwPN8BqJBTpWs53KUvMRUNM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nSXmQmdRRBulTMz7gdaJDGRj+fZD5eCMdnnLbeEes9FbrA0CLglBf0xYPfHZdxzPg9tOqRREeeg7x6GnkHF8eWgX7mRyP6RMUaR3xqi89MRoZrd8MHkfY4M2XDHjhk28rexMbB1ZQUJSrTGzsBBZkqtH9UQtONHxNUE5cmN8MSg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=l2sZrfgm; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="l2sZrfgm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1710924396; bh=xSyEV4LtFGP/kO7x7ObAfwPN8BqJBTpWs53KUvMRUNM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l2sZrfgmTDB4lit83fQi7OLxm0I3RBVAVktEAeYfV+WK0BjFRViTdPrtGxnRySb61 3k8Dv0fuoRSGda30H++pT52hlsoiIktASBQ1uc8UPHmkbaOecww8L37/Ix9kVxxAW6 kzTeBCsdWicp2Hv4BrHEZ4p68zS89k9Fo/wP+NIwpgQtff5VfTfevmpbeSkC96TYLY jIMGcM9tiJ3e1eKxYhnAQfG49/vQAeeeIVrwjRcuc8mYE/ca7U+wOYVGUMS6lMrbS6 i7Z8eqRU2r6yE4vI7/vC9BxjYtoXsLwhlwozP3burTtk1q04NCK4aMhvFadtm6gLfS Bsap7zHEIlF3g== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 1126437820F9; Wed, 20 Mar 2024 08:46:32 +0000 (UTC) From: Eugen Hristev To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, jaegeuk@kernel.org, chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@collabora.com, eugen.hristev@collabora.com, viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, krisman@suse.de, Gabriel Krisman Bertazi Subject: [PATCH v14 2/9] f2fs: Simplify the handling of cached insensitive names Date: Wed, 20 Mar 2024 10:46:15 +0200 Message-Id: <20240320084622.46643-3-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240320084622.46643-1-eugen.hristev@collabora.com> References: <20240320084622.46643-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Gabriel Krisman Bertazi Keeping it as qstr avoids the unnecessary conversion in f2fs_match Signed-off-by: Gabriel Krisman Bertazi [eugen.hristev@collabora.com: port to 6.8-rc3 and minor changes] Signed-off-by: Eugen Hristev --- fs/f2fs/dir.c | 53 ++++++++++++++++++++++++++-------------------- fs/f2fs/f2fs.h | 16 +++++++++++++- fs/f2fs/recovery.c | 5 +---- 3 files changed, 46 insertions(+), 28 deletions(-) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 042593aed1ec..3b454f355f15 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -42,35 +42,49 @@ static unsigned int bucket_blocks(unsigned int level) return 4; } =20 +#if IS_ENABLED(CONFIG_UNICODE) /* If @dir is casefolded, initialize @fname->cf_name from @fname->usr_fnam= e. */ int f2fs_init_casefolded_name(const struct inode *dir, struct f2fs_filename *fname) { -#if IS_ENABLED(CONFIG_UNICODE) struct super_block *sb =3D dir->i_sb; + unsigned char *buf; + int len; =20 if (IS_CASEFOLDED(dir) && !is_dot_dotdot(fname->usr_fname->name, fname->usr_fname->len)) { - fname->cf_name.name =3D f2fs_kmem_cache_alloc(f2fs_cf_name_slab, - GFP_NOFS, false, F2FS_SB(sb)); - if (!fname->cf_name.name) + buf =3D f2fs_kmem_cache_alloc(f2fs_cf_name_slab, + GFP_NOFS, false, F2FS_SB(sb)); + if (!buf) return -ENOMEM; - fname->cf_name.len =3D utf8_casefold(sb->s_encoding, - fname->usr_fname, - fname->cf_name.name, - F2FS_NAME_LEN); - if ((int)fname->cf_name.len <=3D 0) { - kmem_cache_free(f2fs_cf_name_slab, fname->cf_name.name); - fname->cf_name.name =3D NULL; + + len =3D utf8_casefold(sb->s_encoding, fname->usr_fname, + buf, F2FS_NAME_LEN); + if (len <=3D 0) { + kmem_cache_free(f2fs_cf_name_slab, buf); if (sb_has_strict_encoding(sb)) return -EINVAL; /* fall back to treating name as opaque byte sequence */ + return 0; } + fname->cf_name.name =3D buf; + fname->cf_name.len =3D len; } -#endif + return 0; } =20 +void f2fs_free_casefolded_name(struct f2fs_filename *fname) +{ + unsigned char *buf =3D (unsigned char *)fname->cf_name.name; + + if (buf) { + kmem_cache_free(f2fs_cf_name_slab, buf); + fname->cf_name.name =3D NULL; + } +} +#endif /* CONFIG_UNICODE */ + static int __f2fs_setup_filename(const struct inode *dir, const struct fscrypt_name *crypt_name, struct f2fs_filename *fname) @@ -142,12 +156,7 @@ void f2fs_free_filename(struct f2fs_filename *fname) kfree(fname->crypto_buf.name); fname->crypto_buf.name =3D NULL; #endif -#if IS_ENABLED(CONFIG_UNICODE) - if (fname->cf_name.name) { - kmem_cache_free(f2fs_cf_name_slab, fname->cf_name.name); - fname->cf_name.name =3D NULL; - } -#endif + f2fs_free_casefolded_name(fname); } =20 static unsigned long dir_block_index(unsigned int level, @@ -235,11 +244,9 @@ static inline int f2fs_match_name(const struct inode *= dir, struct fscrypt_name f; =20 #if IS_ENABLED(CONFIG_UNICODE) - if (fname->cf_name.name) { - struct qstr cf =3D FSTR_TO_QSTR(&fname->cf_name); - - return f2fs_match_ci_name(dir, &cf, de_name, de_name_len); - } + if (fname->cf_name.name) + return f2fs_match_ci_name(dir, &fname->cf_name, + de_name, de_name_len); #endif f.usr_fname =3D fname->usr_fname; f.disk_name =3D fname->disk_name; diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 65294e3b0bef..4f68c58718fb 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -524,7 +524,7 @@ struct f2fs_filename { * internal operation where usr_fname is also NULL. In all these cases * we fall back to treating the name as an opaque byte sequence. */ - struct fscrypt_str cf_name; + struct qstr cf_name; #endif }; =20 @@ -3528,8 +3528,22 @@ int f2fs_get_tmpfile(struct mnt_idmap *idmap, struct= inode *dir, /* * dir.c */ +#if IS_ENABLED(CONFIG_UNICODE) int f2fs_init_casefolded_name(const struct inode *dir, struct f2fs_filename *fname); +void f2fs_free_casefolded_name(struct f2fs_filename *fname); +#else +static inline int f2fs_init_casefolded_name(const struct inode *dir, + struct f2fs_filename *fname) +{ + return 0; +} + +static inline void f2fs_free_casefolded_name(struct f2fs_filename *fname) +{ +} +#endif /* CONFIG_UNICODE */ + int f2fs_setup_filename(struct inode *dir, const struct qstr *iname, int lookup, struct f2fs_filename *fname); int f2fs_prepare_lookup(struct inode *dir, struct dentry *dentry, diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c index d0f24ccbd1ac..7e53abf6d216 100644 --- a/fs/f2fs/recovery.c +++ b/fs/f2fs/recovery.c @@ -153,11 +153,8 @@ static int init_recovered_filename(const struct inode = *dir, if (err) return err; f2fs_hash_filename(dir, fname); -#if IS_ENABLED(CONFIG_UNICODE) /* Case-sensitive match is fine for recovery */ - kmem_cache_free(f2fs_cf_name_slab, fname->cf_name.name); - fname->cf_name.name =3D NULL; -#endif + f2fs_free_casefolded_name(fname); } else { f2fs_hash_filename(dir, fname); } --=20 2.34.1 From nobody Sun Feb 8 05:59:08 2026 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE1823C478; Wed, 20 Mar 2024 08:46:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924402; cv=none; b=eI5qeScySf6Y/vveT/YrLNFQPfY47Fuqa76bZ6pWlAJiL0DCHPwGp6vG1h2co3x9p9lbaLprT7M0l1b/B7pwy7QFlMdd6abKdXLRnl+C8V2N//9klPDE7mz08OTlhALbdhL4QBu/2s6JssbqNFZSLLN5BhIdvlKVP1YCbWp9yBc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924402; c=relaxed/simple; bh=upTn9VDPH4ATj696dO2v0HAAxcgXeQncdfgIxpTDi8A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OIVfclPp0u0pBGWCdBAU+kDIJ1Kbi5N1pB/27dXOikc5O50Fu22X28R52s0lhMmjfmz+xYQB67ksydYP8DpZ3nZy8eO+DMSFfz9TaJcMbBVIEqFjMCUGFBXXN1sdcVLwJDLkXIDdOmFbeFRS2nBVFLXj7RwH0ayvXCicl4AWyAU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=YpZDw3q0; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="YpZDw3q0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1710924399; bh=upTn9VDPH4ATj696dO2v0HAAxcgXeQncdfgIxpTDi8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YpZDw3q0AHiyQxFxxxMOsYIEu8hpNzrcUOaLhtnYdCnBBfYVOvA6OV9ibmNLIVtZu R4n3tihSPplRzkMbNlfSontLgp4QYbciXCy7VS+q05+/VjX4DeDTzp4nKklAy3TT/g XfCPn6SAyMlWnNjYf1j2xtlenI4am+/A3YNawid4++6JzTgfe4/8ivQj1wXp5xSN8+ YNahRfjAtYaPUxf24TmD6fOIdDgI+/GbvSAp4d8s5QdvZjwvO4x9JdQkUikjpRWNpA zKpczlMRu09COAVX/Yp103lnxoLP1cwKH1V7315vsD6g+4uneaUMrw0Hhr/XT3Y2AR aiOsIoDhlsnMQ== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 925F737820EE; Wed, 20 Mar 2024 08:46:36 +0000 (UTC) From: Eugen Hristev To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, jaegeuk@kernel.org, chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@collabora.com, eugen.hristev@collabora.com, viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, krisman@suse.de, Gabriel Krisman Bertazi Subject: [PATCH v14 3/9] libfs: Introduce case-insensitive string comparison helper Date: Wed, 20 Mar 2024 10:46:16 +0200 Message-Id: <20240320084622.46643-4-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240320084622.46643-1-eugen.hristev@collabora.com> References: <20240320084622.46643-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Gabriel Krisman Bertazi generic_ci_match can be used by case-insensitive filesystems to compare strings under lookup with dirents in a case-insensitive way. This function is currently reimplemented by each filesystem supporting casefolding, so this reduces code duplication in filesystem-specific code. Signed-off-by: Gabriel Krisman Bertazi [eugen.hristev@collabora.com: rework to first test the exact match] Signed-off-by: Eugen Hristev --- fs/libfs.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ include/linux/fs.h | 4 +++ 2 files changed, 81 insertions(+) diff --git a/fs/libfs.c b/fs/libfs.c index c297953db948..711eecc125bd 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -1776,6 +1776,83 @@ static const struct dentry_operations generic_ci_den= try_ops =3D { .d_revalidate =3D fscrypt_d_revalidate, #endif }; + +/** + * generic_ci_match() - Match a name (case-insensitively) with a dirent. + * This is a filesystem helper for comparison with directory entries. + * generic_ci_d_compare should be used in VFS' ->d_compare instead. + * + * @parent: Inode of the parent of the dirent under comparison + * @name: name under lookup. + * @folded_name: Optional pre-folded name under lookup + * @de_name: Dirent name. + * @de_name_len: dirent name length. + * + * Test whether a case-insensitive directory entry matches the filename + * being searched. If @folded_name is provided, it is used instead of + * recalculating the casefold of @name. + * + * Return: > 0 if the directory entry matches, 0 if it doesn't match, or + * < 0 on error. + */ +int generic_ci_match(const struct inode *parent, + const struct qstr *name, + const struct qstr *folded_name, + const u8 *de_name, u32 de_name_len) +{ + const struct super_block *sb =3D parent->i_sb; + const struct unicode_map *um =3D sb->s_encoding; + struct fscrypt_str decrypted_name =3D FSTR_INIT(NULL, de_name_len); + struct qstr dirent =3D QSTR_INIT(de_name, de_name_len); + int res =3D 0, match =3D 0; + + if (IS_ENCRYPTED(parent)) { + const struct fscrypt_str encrypted_name =3D + FSTR_INIT((u8 *) de_name, de_name_len); + + if (WARN_ON_ONCE(!fscrypt_has_encryption_key(parent))) + return -EINVAL; + + decrypted_name.name =3D kmalloc(de_name_len, GFP_KERNEL); + if (!decrypted_name.name) + return -ENOMEM; + res =3D fscrypt_fname_disk_to_usr(parent, 0, 0, &encrypted_name, + &decrypted_name); + if (res < 0) + goto out; + dirent.name =3D decrypted_name.name; + dirent.len =3D decrypted_name.len; + } + + /* + * Attempt a case-sensitive match first. It is cheaper and + * should cover most lookups, including all the sane + * applications that expect a case-sensitive filesystem. + */ + if (folded_name->name) { + if (dirent.len =3D=3D folded_name->len && + !memcmp(folded_name->name, dirent.name, dirent.len)) { + match =3D 1; + goto out; + } + res =3D utf8_strncasecmp_folded(um, folded_name, &dirent); + } else { + if (dirent.len =3D=3D name->len && + !memcmp(name->name, dirent.name, dirent.len) && + (!sb_has_strict_encoding(sb) || !utf8_validate(um, name))) { + match =3D 1; + goto out; + } + res =3D utf8_strncasecmp(um, name, &dirent); + } + +out: + kfree(decrypted_name.name); + if (res < 0) + return res; + return (match || !res); +} +EXPORT_SYMBOL(generic_ci_match); #endif =20 #ifdef CONFIG_FS_ENCRYPTION diff --git a/include/linux/fs.h b/include/linux/fs.h index ff1338109b54..690b37e1db95 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3281,6 +3281,10 @@ extern int generic_file_fsync(struct file *, loff_t,= loff_t, int); extern int generic_check_addressable(unsigned, u64); =20 extern void generic_set_sb_d_ops(struct super_block *sb); +extern int generic_ci_match(const struct inode *parent, + const struct qstr *name, + const struct qstr *folded_name, + const u8 *de_name, u32 de_name_len); =20 static inline bool sb_has_encoding(const struct super_block *sb) { --=20 2.34.1 From nobody Sun Feb 8 05:59:08 2026 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CB0463D57A; Wed, 20 Mar 2024 08:46:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924405; cv=none; b=Ssa9d22yEAvzjpCCA5QWXx7yn7xSnDz6JXvjKO6cYhnnMsSzXUfYc8RGQveFTtG0NinowWxwEVdVbjm1KJa+q+yUsGYDjV5sruQECaPLcZWFkeK7RSP3uRK5i1p0a2onUGtvt88THspzQDHBc82vC4mrjJXu8eNU6o2N1VjEKgA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924405; c=relaxed/simple; bh=swtZ6BKu+FGmiqRjglGL90hSAB3JlB+upSuAXL/TJpA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nCByvms61q3LjcyEqWfWKk2YyBLUy5zUR4y2Yaj2edAxGyE4l32XaMqvD4nQF+F9WBgFzrHrQ/Tk7vtv0J98EflDi/40Z4RT7CEMzHL4LXZaI0VkZ5VoCh/8zKCRas7ffoGMEwlG7d51BUg89KrZ0DM+Od/bHXkS8LaAbAPx850= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=T6T2i4Y5; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="T6T2i4Y5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1710924402; bh=swtZ6BKu+FGmiqRjglGL90hSAB3JlB+upSuAXL/TJpA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T6T2i4Y5qwjtficiWom7ZT8GuQjm3nHTHKUpmxoUhXQaqCY3wbIJD8xdG7J1fK2lX U9j32SPQ3BSrGjUjLSIyamSYPSzgO7Xgop7D77IpaYak3lK5z5WcuQ6YxuPXe9+luR qjAOmI6Z6vl74J4/XskhhgIn+Nq5rVJdVRBkquiShpjEapD/8myfNQy8UZGAduI5yl HGlhcijFdT3S+tkfZmtGrBeKu5Vs40o0fCaB9/5WOCXY7byQpS3f5lIwMC5ZzSAaXr h3ang+mn1uld1RW/V+5u37V49aA1FyxasYMicZf6H/zBdsAoR0GvWndGGV5mewBM1o HT+K0PpjxyCPQ== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 94FFE3782110; Wed, 20 Mar 2024 08:46:39 +0000 (UTC) From: Eugen Hristev To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, jaegeuk@kernel.org, chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@collabora.com, eugen.hristev@collabora.com, viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, krisman@suse.de, Gabriel Krisman Bertazi Subject: [PATCH v14 4/9] ext4: Reuse generic_ci_match for ci comparisons Date: Wed, 20 Mar 2024 10:46:17 +0200 Message-Id: <20240320084622.46643-5-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240320084622.46643-1-eugen.hristev@collabora.com> References: <20240320084622.46643-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Gabriel Krisman Bertazi Instead of reimplementing ext4_match_ci, use the new libfs helper. It also adds a comment explaining why fname->cf_name.name must be checked prior to the encryption hash optimization, because that tripped me before. Signed-off-by: Gabriel Krisman Bertazi Signed-off-by: Eugen Hristev --- fs/ext4/namei.c | 91 +++++++++++++++---------------------------------- 1 file changed, 27 insertions(+), 64 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index b96983a4c185..2d0ee232fbe7 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1390,58 +1390,6 @@ static void dx_insert_block(struct dx_frame *frame, = u32 hash, ext4_lblk_t block) } =20 #if IS_ENABLED(CONFIG_UNICODE) -/* - * Test whether a case-insensitive directory entry matches the filename - * being searched for. If quick is set, assume the name being looked up - * is already in the casefolded form. - * - * Returns: 0 if the directory entry matches, more than 0 if it - * doesn't match or less than zero on error. - */ -static int ext4_ci_compare(const struct inode *parent, const struct qstr *= name, - u8 *de_name, size_t de_name_len, bool quick) -{ - const struct super_block *sb =3D parent->i_sb; - const struct unicode_map *um =3D sb->s_encoding; - struct fscrypt_str decrypted_name =3D FSTR_INIT(NULL, de_name_len); - struct qstr entry =3D QSTR_INIT(de_name, de_name_len); - int ret; - - if (IS_ENCRYPTED(parent)) { - const struct fscrypt_str encrypted_name =3D - FSTR_INIT(de_name, de_name_len); - - decrypted_name.name =3D kmalloc(de_name_len, GFP_KERNEL); - if (!decrypted_name.name) - return -ENOMEM; - ret =3D fscrypt_fname_disk_to_usr(parent, 0, 0, &encrypted_name, - &decrypted_name); - if (ret < 0) - goto out; - entry.name =3D decrypted_name.name; - entry.len =3D decrypted_name.len; - } - - if (quick) - ret =3D utf8_strncasecmp_folded(um, name, &entry); - else - ret =3D utf8_strncasecmp(um, name, &entry); - if (ret < 0) { - /* Handle invalid character sequence as either an error - * or as an opaque byte sequence. - */ - if (sb_has_strict_encoding(sb)) - ret =3D -EINVAL; - else if (name->len !=3D entry.len) - ret =3D 1; - else - ret =3D !!memcmp(name->name, entry.name, entry.len); - } -out: - kfree(decrypted_name.name); - return ret; -} - int ext4_fname_setup_ci_filename(struct inode *dir, const struct qstr *ina= me, struct ext4_filename *name) { @@ -1503,20 +1451,35 @@ static bool ext4_match(struct inode *parent, #if IS_ENABLED(CONFIG_UNICODE) if (IS_CASEFOLDED(parent) && (!IS_ENCRYPTED(parent) || fscrypt_has_encryption_key(parent))) { - if (fname->cf_name.name) { - if (IS_ENCRYPTED(parent)) { - if (fname->hinfo.hash !=3D EXT4_DIRENT_HASH(de) || - fname->hinfo.minor_hash !=3D - EXT4_DIRENT_MINOR_HASH(de)) { + int ret; =20 - return false; - } - } - return !ext4_ci_compare(parent, &fname->cf_name, - de->name, de->name_len, true); + /* + * Just checking IS_ENCRYPTED(parent) below is not + * sufficient to decide whether one can use the hash for + * skipping the string comparison, because the key might + * have been added right after + * ext4_fname_setup_ci_filename(). In this case, a hash + * mismatch will be a false negative. Therefore, make + * sure cf_name was properly initialized before + * considering the calculated hash. + */ + if (IS_ENCRYPTED(parent) && fname->cf_name.name && + (fname->hinfo.hash !=3D EXT4_DIRENT_HASH(de) || + fname->hinfo.minor_hash !=3D EXT4_DIRENT_MINOR_HASH(de))) + return false; + + ret =3D generic_ci_match(parent, fname->usr_fname, + &fname->cf_name, de->name, + de->name_len); + if (ret < 0) { + /* + * Treat comparison errors as not a match. The + * only case where it happens is on a disk + * corruption or ENOMEM. + */ + return false; } - return !ext4_ci_compare(parent, fname->usr_fname, de->name, - de->name_len, false); + return ret; } #endif =20 --=20 2.34.1 From nobody Sun Feb 8 05:59:08 2026 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CA98B3F8DA; Wed, 20 Mar 2024 08:46:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924408; cv=none; b=ZREXia3BOdaSlSkDSIq4ueiqtn5yF4rFhcplaamK6D9s+4O4LU6jM66CWWNFeYnAVA1MGcP+cOzjOm8nPAMgtbB+lZC3eUiOG3KJJ88c3eUA3eR6VtiN5LmPsdxsio8O3LBRbdqIPw0pEpm+yN6w4rCUDnLmB3wZCdSbLmW0rNM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924408; c=relaxed/simple; bh=aRA2g6rcldGcm0eggJ+qgCaUO+InE396o0stDobGMYQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NqaaG9UhM/yO9+87tS+yLkH41dNN0A/q6ll7yMbaWvs15HPe1jE4e6ayc21MhAF/5Fvg+xY/d/g6apizX7NyJC1PYaP9RuYw3VaFTcrlNPam5E8944WlU+z5mDkhLio9U4bUZg6BraWzXC2/2DUgP68/4T+TdaxdMfuKWiJhWHg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=k+LLYn/3; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="k+LLYn/3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1710924405; bh=aRA2g6rcldGcm0eggJ+qgCaUO+InE396o0stDobGMYQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k+LLYn/3MpX7d9pDJViQCEbDLW/2QCcV1fn32DUGD7HoeDENZKW+jpXLkXjIo9wmt tuD7VPv85Ya5lP78jxBVdpa1/MBf9SYIh0SPhgzP71NkDPVIXb3gMOtcgHYJGmaNRW 6zqGDVhsRrzkxYwpVNemaGYCbM4pas8pJSrxrHsTx1icvpjg/hKWeHYGPS0GYzE2Se S9qWqDa0VXvXXFYGDZkT/I9H4xmI4O74QvNlvfylOKbqYGZhvlFZGuBMjP1kemoJGG GCq5viYvwAF+lz6tdcpdcgPUb6n7FxwoAaVnHKVtJips1oaImv9LOk8FurWuixPtj/ NHxh/NrW8rRJA== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 8CBDF3782111; Wed, 20 Mar 2024 08:46:42 +0000 (UTC) From: Eugen Hristev To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, jaegeuk@kernel.org, chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@collabora.com, eugen.hristev@collabora.com, viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, krisman@suse.de, Gabriel Krisman Bertazi Subject: [PATCH v14 5/9] f2fs: Reuse generic_ci_match for ci comparisons Date: Wed, 20 Mar 2024 10:46:18 +0200 Message-Id: <20240320084622.46643-6-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240320084622.46643-1-eugen.hristev@collabora.com> References: <20240320084622.46643-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Gabriel Krisman Bertazi Now that ci_match is part of libfs, make f2fs reuse it instead of having a different implementation. Signed-off-by: Gabriel Krisman Bertazi Signed-off-by: Eugen Hristev --- fs/f2fs/dir.c | 58 ++++----------------------------------------------- 1 file changed, 4 insertions(+), 54 deletions(-) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 3b454f355f15..88b0045d0c4f 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -185,58 +185,6 @@ static struct f2fs_dir_entry *find_in_block(struct ino= de *dir, return f2fs_find_target_dentry(&d, fname, max_slots); } =20 -#if IS_ENABLED(CONFIG_UNICODE) -/* - * Test whether a case-insensitive directory entry matches the filename - * being searched for. - * - * Returns 1 for a match, 0 for no match, and -errno on an error. - */ -static int f2fs_match_ci_name(const struct inode *dir, const struct qstr *= name, - const u8 *de_name, u32 de_name_len) -{ - const struct super_block *sb =3D dir->i_sb; - const struct unicode_map *um =3D sb->s_encoding; - struct fscrypt_str decrypted_name =3D FSTR_INIT(NULL, de_name_len); - struct qstr entry =3D QSTR_INIT(de_name, de_name_len); - int res; - - if (IS_ENCRYPTED(dir)) { - const struct fscrypt_str encrypted_name =3D - FSTR_INIT((u8 *)de_name, de_name_len); - - if (WARN_ON_ONCE(!fscrypt_has_encryption_key(dir))) - return -EINVAL; - - decrypted_name.name =3D kmalloc(de_name_len, GFP_KERNEL); - if (!decrypted_name.name) - return -ENOMEM; - res =3D fscrypt_fname_disk_to_usr(dir, 0, 0, &encrypted_name, - &decrypted_name); - if (res < 0) - goto out; - entry.name =3D decrypted_name.name; - entry.len =3D decrypted_name.len; - } - - res =3D utf8_strncasecmp_folded(um, name, &entry); - /* - * In strict mode, ignore invalid names. In non-strict mode, - * fall back to treating them as opaque byte sequences. - */ - if (res < 0 && !sb_has_strict_encoding(sb)) { - res =3D name->len =3D=3D entry.len && - memcmp(name->name, entry.name, name->len) =3D=3D 0; - } else { - /* utf8_strncasecmp_folded returns 0 on match */ - res =3D (res =3D=3D 0); - } -out: - kfree(decrypted_name.name); - return res; -} -#endif /* CONFIG_UNICODE */ - static inline int f2fs_match_name(const struct inode *dir, const struct f2fs_filename *fname, const u8 *de_name, u32 de_name_len) @@ -245,8 +193,10 @@ static inline int f2fs_match_name(const struct inode *= dir, =20 #if IS_ENABLED(CONFIG_UNICODE) if (fname->cf_name.name) - return f2fs_match_ci_name(dir, &fname->cf_name, - de_name, de_name_len); + return generic_ci_match(dir, fname->usr_fname, + &fname->cf_name, + de_name, de_name_len); + #endif f.usr_fname =3D fname->usr_fname; f.disk_name =3D fname->disk_name; --=20 2.34.1 From nobody Sun Feb 8 05:59:08 2026 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7B063FBAC; Wed, 20 Mar 2024 08:46:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924411; cv=none; b=pixk0gyg4KWj3FV1jp5/7KmeK3/L67LPMoppDnaloxUe3lqr/eZsiYR9kL7KjRiEWsza3NgBtedlsAPcCG+WqzqzxiKf4zvfPDuAFyQVPztjoysjYtKedfGrE7DKX/SaCLL7Abaftfm0SjG68eDx7wzknVH/noPsGj2Oqy4UBiU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924411; c=relaxed/simple; bh=3qqbmy6OIcOoO07cO28FmCqjE206p+74Pkl9CCe0L8Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KjJhseK9G54z+G/cAfg5wJNiTSP2yVIOcT8R+C1lV1jSXoWhq5T9Fa3vU990D+WB3IDf8fIUDtYuKxamu3b0Ur2DwUow3lot7XTqhUNa2IHfgHVJwyvMLUqf917wgQd91smG9WQJJZDatKHwID7hKqfUs9xQXbIl/tDiczw7jL4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=IkkfhwIe; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="IkkfhwIe" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1710924408; bh=3qqbmy6OIcOoO07cO28FmCqjE206p+74Pkl9CCe0L8Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IkkfhwIeSaNG/P79So6eYu9Puo24dBKVe3t707OodSS65lR0wEVnqdVXdj0oRRKfD gLoVSBT8nKKqBAEH/o5ps7vhhgU9p5wxWroVsA37UgN9QRCoYnljzimLhUfEY7AYUw PO9HQw8PjKRwNCqXA5gsYz25lmTIMzr9Z79mTJnGSbA5ntynZxuQgSzcRc/Vdug8B1 8mEHMQafqWZUXdtOGKl890JB2nG3bCd23x33g7jkf4WInrU7HTo2qed8F3WAOE4KvC eLKmS6TMfGKGaoTP2huPQ4nXHZpQl3GabtT4oGHpSWNrgEBPU/MvbFFMRP3Qs6YM9Y 5uKCOejh6xHFA== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 90BED37813C4; Wed, 20 Mar 2024 08:46:45 +0000 (UTC) From: Eugen Hristev To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, jaegeuk@kernel.org, chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@collabora.com, eugen.hristev@collabora.com, viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, krisman@suse.de, Gabriel Krisman Bertazi Subject: [PATCH v14 6/9] ext4: Log error when lookup of encoded dentry fails Date: Wed, 20 Mar 2024 10:46:19 +0200 Message-Id: <20240320084622.46643-7-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240320084622.46643-1-eugen.hristev@collabora.com> References: <20240320084622.46643-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Gabriel Krisman Bertazi If the volume is in strict mode, ext4_ci_compare can report a broken encoding name. This will not trigger on a bad lookup, which is caught earlier, only if the actual disk name is bad. Signed-off-by: Gabriel Krisman Bertazi Signed-off-by: Eugen Hristev --- fs/ext4/namei.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 2d0ee232fbe7..3268cf45d9db 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1477,6 +1477,9 @@ static bool ext4_match(struct inode *parent, * only case where it happens is on a disk * corruption or ENOMEM. */ + if (ret =3D=3D -EINVAL) + EXT4_ERROR_INODE(parent, + "Directory contains filename that is invalid UTF-8"); return false; } return ret; --=20 2.34.1 From nobody Sun Feb 8 05:59:08 2026 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 432A54086C; Wed, 20 Mar 2024 08:46:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924413; cv=none; b=lTBI6J7qss1FrxvM/wgjwbXFkg53yrNmpLDN4QvdqWxxpSK8Vu4PF7MDp6q6AFNwq6apit2NzpROTQYHo7pH15Hd/GlzZ39kZUAf926BydyglhH5nQqfNXBjSG77Zx2pmIRbIfzM721EYPiN7KwmA4imIoxQriCfSR3aQQn6lBg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924413; c=relaxed/simple; bh=2Udo3G7fQC2cxqRuvgN0N9z0lkRknXjSVOSfuivtoKo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=G62BrxNxsTVs2jdc3bU/3xZxvbW/DTThecN97CDtfdFqrtdXONacNB4O9Sw+xtkTsbJXZwRJRsVkDDBAgk1Qw6zHCVMz/2W5j37ejn0BUZV9+HoV4PS9A25e32rRH6sQ1JtVJZp1++tAdxLk1yC3/C4sDrK/8fZtOlIHvzjwNM0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=Kh/iR63U; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="Kh/iR63U" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1710924410; bh=2Udo3G7fQC2cxqRuvgN0N9z0lkRknXjSVOSfuivtoKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kh/iR63UC8ZHS0o2V423ngKRDPAMlLMkAT8Paiad4gxqnzpqRU4zW5zSa/jecd1FU SYFFgw01m/Z2sR4ppPva+YH4+dVtXfnb+/Oo0aMh557KlmDlyZUcDozc1LH/OOid1E lUv+1cg4wvdGjIoVSmuWxPJxFsQuVC7OiRyTNe1tzg5ypCMwz7UTSXhEJjgbEJu/2g iIfjW6cF8GLQnU5gdPa3B9mUCnMOjZXvT3VhLHLS+YEwl2p8cYRcp3bimhJpSFeHbI plLtUvP+khbz6zrhCYMMqIig/MX8JRsDQu2qaH9xZzjwzbIYSUuDbPloV9SLHxI0iL J0kkvsXCv+AKg== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 82D4137820FC; Wed, 20 Mar 2024 08:46:48 +0000 (UTC) From: Eugen Hristev To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, jaegeuk@kernel.org, chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@collabora.com, eugen.hristev@collabora.com, viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, krisman@suse.de Subject: [PATCH v14 7/9] f2fs: Log error when lookup of encoded dentry fails Date: Wed, 20 Mar 2024 10:46:20 +0200 Message-Id: <20240320084622.46643-8-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240320084622.46643-1-eugen.hristev@collabora.com> References: <20240320084622.46643-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If the volume is in strict mode, generi c_ci_compare can report a broken encoding name. This will not trigger on a bad lookup, which is caught earlier, only if the actual disk name is bad. Suggested-by: Gabriel Krisman Bertazi Signed-off-by: Eugen Hristev --- fs/f2fs/dir.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 88b0045d0c4f..3b0003e8767a 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -192,11 +192,22 @@ static inline int f2fs_match_name(const struct inode = *dir, struct fscrypt_name f; =20 #if IS_ENABLED(CONFIG_UNICODE) - if (fname->cf_name.name) - return generic_ci_match(dir, fname->usr_fname, - &fname->cf_name, - de_name, de_name_len); - + if (fname->cf_name.name) { + int ret =3D generic_ci_match(dir, fname->usr_fname, + &fname->cf_name, + de_name, de_name_len); + if (ret < 0) { + /* + * Treat comparison errors as not a match. The + * only case where it happens is on a disk + * corruption or ENOMEM. + */ + if (ret =3D=3D -EINVAL) + f2fs_warn(F2FS_SB(dir->i_sb), + "Directory contains filename that is invalid UTF-8"); + } + return ret; + } #endif f.usr_fname =3D fname->usr_fname; f.disk_name =3D fname->disk_name; --=20 2.34.1 From nobody Sun Feb 8 05:59:08 2026 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F3A142059; Wed, 20 Mar 2024 08:46:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924417; cv=none; b=Sau5IPQEHo9aOy8UmPXWYJfH5F6A+B8Si04HbFV1iiCinC7/yJ9VKNsTU9Veq+lIPi+LrNn8B0WubwxwpS1EI3HlB6i65ACwzFuTTf3vN0ZrRlGbjLEy6ZmNGfO2K/5pSay0CQLlmpasm3G1f9y8r15Kom37pwp/hiiFutZRH8o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924417; c=relaxed/simple; bh=R1/+HaF4cG0WpYkql7KCqL1uI+mSGR4QJb8GzGhRh2s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bibsVwAFSY/4nRDD7lq4gZh0c/ANZnsx3IQZW3xbs4mM7OBlhvZ2aFc7c14V8XU8hqPRjCQGvx6zm7IdiqP9zuKRCzMiVOno6v3q4Jlkp6NUeoLnqBcVzrnGZuj50GTcfQ+xAR08oh3SQ65PTDegKvUTB34sUZD2L39SqJ5zln4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=zS2Kk3jf; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="zS2Kk3jf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1710924413; bh=R1/+HaF4cG0WpYkql7KCqL1uI+mSGR4QJb8GzGhRh2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zS2Kk3jfTvk3qzn3wJRM0w7ukFVVwDm8VQ+66By0s2V1eSoNj7yRIcepUn8OS9qtn AFIXJM7zgkpw8DM9aEMUjoTHmlIiaUn1FSc2/o3Y4BQbFI0tUv5usCC7XaKUb2Pagc 3joFoipVte903quL2oy4f8u0svSbcjw93lkBWVumK0QAVYKRtWId+n/uISRXZsXhs8 88LAuOIuj/HS2yhJ1znM7HlZZOsYTjB168l9D9axdFfJZ/gGwOraFO0arOCoPBn7Ll KSFlJhISum/B/hfQhviVpH53BIb3ZutsK0AOCICq5pT2Sg8swnE4WmeWXmPvaYPrue xoat+W3UTkQBA== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 4F98437820EE; Wed, 20 Mar 2024 08:46:51 +0000 (UTC) From: Eugen Hristev To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, jaegeuk@kernel.org, chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@collabora.com, eugen.hristev@collabora.com, viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, krisman@suse.de, Gabriel Krisman Bertazi Subject: [PATCH v14 8/9] ext4: Move CONFIG_UNICODE defguards into the code flow Date: Wed, 20 Mar 2024 10:46:21 +0200 Message-Id: <20240320084622.46643-9-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240320084622.46643-1-eugen.hristev@collabora.com> References: <20240320084622.46643-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Gabriel Krisman Bertazi Instead of a bunch of ifdefs, make the unicode built checks part of the code flow where possible, as requested by Torvalds. Signed-off-by: Gabriel Krisman Bertazi [eugen.hristev@collabora.com: port to 6.8-rc3] Signed-off-by: Eugen Hristev --- fs/ext4/crypto.c | 19 +++---------------- fs/ext4/ext4.h | 33 +++++++++++++++++++++------------ fs/ext4/namei.c | 14 +++++--------- fs/ext4/super.c | 4 +--- 4 files changed, 30 insertions(+), 40 deletions(-) diff --git a/fs/ext4/crypto.c b/fs/ext4/crypto.c index 7ae0b61258a7..1d2f8b79529c 100644 --- a/fs/ext4/crypto.c +++ b/fs/ext4/crypto.c @@ -31,12 +31,7 @@ int ext4_fname_setup_filename(struct inode *dir, const s= truct qstr *iname, =20 ext4_fname_from_fscrypt_name(fname, &name); =20 -#if IS_ENABLED(CONFIG_UNICODE) - err =3D ext4_fname_setup_ci_filename(dir, iname, fname); - if (err) - ext4_fname_free_filename(fname); -#endif - return err; + return ext4_fname_setup_ci_filename(dir, iname, fname); } =20 int ext4_fname_prepare_lookup(struct inode *dir, struct dentry *dentry, @@ -51,12 +46,7 @@ int ext4_fname_prepare_lookup(struct inode *dir, struct = dentry *dentry, =20 ext4_fname_from_fscrypt_name(fname, &name); =20 -#if IS_ENABLED(CONFIG_UNICODE) - err =3D ext4_fname_setup_ci_filename(dir, &dentry->d_name, fname); - if (err) - ext4_fname_free_filename(fname); -#endif - return err; + return ext4_fname_setup_ci_filename(dir, &dentry->d_name, fname); } =20 void ext4_fname_free_filename(struct ext4_filename *fname) @@ -70,10 +60,7 @@ void ext4_fname_free_filename(struct ext4_filename *fnam= e) fname->usr_fname =3D NULL; fname->disk_name.name =3D NULL; =20 -#if IS_ENABLED(CONFIG_UNICODE) - kfree(fname->cf_name.name); - fname->cf_name.name =3D NULL; -#endif + ext4_fname_free_ci_filename(fname); } =20 static bool uuid_is_zero(__u8 u[16]) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 4061d11b9763..c68f48f706cd 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2740,8 +2740,25 @@ ext4_fsblk_t ext4_inode_to_goal_block(struct inode *= ); =20 #if IS_ENABLED(CONFIG_UNICODE) extern int ext4_fname_setup_ci_filename(struct inode *dir, - const struct qstr *iname, - struct ext4_filename *fname); + const struct qstr *iname, + struct ext4_filename *fname); + +static inline void ext4_fname_free_ci_filename(struct ext4_filename *fname) +{ + kfree(fname->cf_name.name); + fname->cf_name.name =3D NULL; +} +#else +static inline int ext4_fname_setup_ci_filename(struct inode *dir, + const struct qstr *iname, + struct ext4_filename *fname) +{ + return 0; +} + +static inline void ext4_fname_free_ci_filename(struct ext4_filename *fname) +{ +} #endif =20 /* ext4 encryption related stuff goes here crypto.c */ @@ -2764,16 +2781,11 @@ static inline int ext4_fname_setup_filename(struct = inode *dir, int lookup, struct ext4_filename *fname) { - int err =3D 0; fname->usr_fname =3D iname; fname->disk_name.name =3D (unsigned char *) iname->name; fname->disk_name.len =3D iname->len; =20 -#if IS_ENABLED(CONFIG_UNICODE) - err =3D ext4_fname_setup_ci_filename(dir, iname, fname); -#endif - - return err; + return ext4_fname_setup_ci_filename(dir, iname, fname); } =20 static inline int ext4_fname_prepare_lookup(struct inode *dir, @@ -2785,10 +2797,7 @@ static inline int ext4_fname_prepare_lookup(struct i= node *dir, =20 static inline void ext4_fname_free_filename(struct ext4_filename *fname) { -#if IS_ENABLED(CONFIG_UNICODE) - kfree(fname->cf_name.name); - fname->cf_name.name =3D NULL; -#endif + ext4_fname_free_ci_filename(fname); } =20 static inline int ext4_ioctl_get_encryption_pwsalt(struct file *filp, diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 3268cf45d9db..a5d9e5b01015 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1834,8 +1834,7 @@ static struct dentry *ext4_lookup(struct inode *dir, = struct dentry *dentry, unsi } } =20 -#if IS_ENABLED(CONFIG_UNICODE) - if (!inode && IS_CASEFOLDED(dir)) { + if (IS_ENABLED(CONFIG_UNICODE) && !inode && IS_CASEFOLDED(dir)) { /* Eventually we want to call d_add_ci(dentry, NULL) * for negative dentries in the encoding case as * well. For now, prevent the negative dentry @@ -1843,7 +1842,7 @@ static struct dentry *ext4_lookup(struct inode *dir, = struct dentry *dentry, unsi */ return NULL; } -#endif + return d_splice_alias(inode, dentry); } =20 @@ -3173,16 +3172,14 @@ static int ext4_rmdir(struct inode *dir, struct den= try *dentry) ext4_fc_track_unlink(handle, dentry); retval =3D ext4_mark_inode_dirty(handle, dir); =20 -#if IS_ENABLED(CONFIG_UNICODE) /* VFS negative dentries are incompatible with Encoding and * Case-insensitiveness. Eventually we'll want avoid * invalidating the dentries here, alongside with returning the * negative dentries at ext4_lookup(), when it is better * supported by the VFS for the CI case. */ - if (IS_CASEFOLDED(dir)) + if (IS_ENABLED(CONFIG_UNICODE) && IS_CASEFOLDED(dir)) d_invalidate(dentry); -#endif =20 end_rmdir: brelse(bh); @@ -3284,16 +3281,15 @@ static int ext4_unlink(struct inode *dir, struct de= ntry *dentry) goto out_trace; =20 retval =3D __ext4_unlink(dir, &dentry->d_name, d_inode(dentry), dentry); -#if IS_ENABLED(CONFIG_UNICODE) + /* VFS negative dentries are incompatible with Encoding and * Case-insensitiveness. Eventually we'll want avoid * invalidating the dentries here, alongside with returning the * negative dentries at ext4_lookup(), when it is better * supported by the VFS for the CI case. */ - if (IS_CASEFOLDED(dir)) + if (IS_ENABLED(CONFIG_UNICODE) && IS_CASEFOLDED(dir)) d_invalidate(dentry); -#endif =20 out_trace: trace_ext4_unlink_exit(dentry, retval); diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 215b4614eb15..179083728b4b 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3609,14 +3609,12 @@ int ext4_feature_set_ok(struct super_block *sb, int= readonly) return 0; } =20 -#if !IS_ENABLED(CONFIG_UNICODE) - if (ext4_has_feature_casefold(sb)) { + if (!IS_ENABLED(CONFIG_UNICODE) && ext4_has_feature_casefold(sb)) { ext4_msg(sb, KERN_ERR, "Filesystem with casefold feature cannot be " "mounted without CONFIG_UNICODE"); return 0; } -#endif =20 if (readonly) return 1; --=20 2.34.1 From nobody Sun Feb 8 05:59:08 2026 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A34BF38DC0; Wed, 20 Mar 2024 08:46:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924420; cv=none; b=aW94lsrvG9kRnC2Hj4a4f6Pkmcfiz72cHpiqEcvXeNfELUILT17f9GHjEnDOEYrVWybJLQebUX6SJkTQsKz1qah0h6uo3zu3Hz5gPCvzJiPXl6zOO4hA775UVhKd/Ru4vx2CKHjLr8FwZbq1HpJMDZ02MygUroTgdtTRNYxY0S8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924420; c=relaxed/simple; bh=NYwDnN28mEZsfcXBv2JU5FVxAioxdPfAjfdUmE66h5Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bsjrTK6cT3NJEEkFNUoo4VUQTgwychE4xBU0g2aTJlpc9xdk678QM8awoQtwPixf8QnMgQX6sM85kkFysHrnqeRW+s6YLLtDqFzkDidKUWjLZ7IMEgk3yEq+Cb95wrtn8zfgDhrwa8OTT3aZFCnkxOnhWwbtSXo5qHmXwa9X/Yg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=Gj91RX1Y; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="Gj91RX1Y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1710924416; bh=NYwDnN28mEZsfcXBv2JU5FVxAioxdPfAjfdUmE66h5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gj91RX1YXpfuOe85NVcgoi8mVW2QlLmxjvjuUWQYDLqKcyTXc4lFfeQ27+f2gRtCY +u7abuV5kUCMj89swUclHGLOU5b+K7DRzWqZ7oZvO5wwGcN1uE1rCOIb/0w5Nq9oAO BXjnrO65MWFa9WYsgIhBUG5mau3hwTUeqLRWswr8055usJ7cS1CBYYRC/rM5irYyT6 k6coLntNQhogfFg7MZS2ZeYlZWn1vZBQwF3cyn2rVAz6NUHt7LZ/vfD+mE2wMY183m jx6iD5KFkfWyCtTVlLDB3REbq4VLyALet0oQOJyrGynI0SSjf336OUZuF7Lc6FOi8e NV8frGad5YJ8A== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 4C9D93782110; Wed, 20 Mar 2024 08:46:54 +0000 (UTC) From: Eugen Hristev To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, jaegeuk@kernel.org, chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@collabora.com, eugen.hristev@collabora.com, viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, krisman@suse.de, Gabriel Krisman Bertazi Subject: [PATCH v14 9/9] f2fs: Move CONFIG_UNICODE defguards into the code flow Date: Wed, 20 Mar 2024 10:46:22 +0200 Message-Id: <20240320084622.46643-10-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240320084622.46643-1-eugen.hristev@collabora.com> References: <20240320084622.46643-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Gabriel Krisman Bertazi Instead of a bunch of ifdefs, make the unicode built checks part of the code flow where possible, as requested by Torvalds. Signed-off-by: Gabriel Krisman Bertazi [eugen.hristev@collabora.com: port to 6.8-rc3] Signed-off-by: Eugen Hristev --- fs/f2fs/namei.c | 10 ++++------ fs/f2fs/super.c | 8 ++++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index f7f63a567d86..5da1aae7d23a 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -576,8 +576,7 @@ static struct dentry *f2fs_lookup(struct inode *dir, st= ruct dentry *dentry, goto out_iput; } out_splice: -#if IS_ENABLED(CONFIG_UNICODE) - if (!inode && IS_CASEFOLDED(dir)) { + if (IS_ENABLED(CONFIG_UNICODE) && !inode && IS_CASEFOLDED(dir)) { /* Eventually we want to call d_add_ci(dentry, NULL) * for negative dentries in the encoding case as * well. For now, prevent the negative dentry @@ -586,7 +585,7 @@ static struct dentry *f2fs_lookup(struct inode *dir, st= ruct dentry *dentry, trace_f2fs_lookup_end(dir, dentry, ino, err); return NULL; } -#endif + new =3D d_splice_alias(inode, dentry); trace_f2fs_lookup_end(dir, !IS_ERR_OR_NULL(new) ? new : dentry, ino, IS_ERR(new) ? PTR_ERR(new) : err); @@ -639,16 +638,15 @@ static int f2fs_unlink(struct inode *dir, struct dent= ry *dentry) f2fs_delete_entry(de, page, dir, inode); f2fs_unlock_op(sbi); =20 -#if IS_ENABLED(CONFIG_UNICODE) /* VFS negative dentries are incompatible with Encoding and * Case-insensitiveness. Eventually we'll want avoid * invalidating the dentries here, alongside with returning the * negative dentries at f2fs_lookup(), when it is better * supported by the VFS for the CI case. */ - if (IS_CASEFOLDED(dir)) + if (IS_ENABLED(CONFIG_UNICODE) && IS_CASEFOLDED(dir)) d_invalidate(dentry); -#endif + if (IS_DIRSYNC(dir)) f2fs_sync_fs(sbi->sb, 1); fail: diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 313024f5c90c..c4325cc066c6 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -306,7 +306,7 @@ struct kmem_cache *f2fs_cf_name_slab; static int __init f2fs_create_casefold_cache(void) { f2fs_cf_name_slab =3D f2fs_kmem_cache_create("f2fs_casefolded_name", - F2FS_NAME_LEN); + F2FS_NAME_LEN); return f2fs_cf_name_slab ? 0 : -ENOMEM; } =20 @@ -1354,13 +1354,13 @@ static int parse_options(struct super_block *sb, ch= ar *options, bool is_remount) return -EINVAL; } #endif -#if !IS_ENABLED(CONFIG_UNICODE) - if (f2fs_sb_has_casefold(sbi)) { + + if (!IS_ENABLED(CONFIG_UNICODE) && f2fs_sb_has_casefold(sbi)) { f2fs_err(sbi, "Filesystem with casefold feature cannot be mounted without CONFIG_UNIC= ODE"); return -EINVAL; } -#endif + /* * The BLKZONED feature indicates that the drive was formatted with * zone alignment optimization. This is optional for host-aware --=20 2.34.1