Fix up casefolding sysfs entries for F2FS
Subsystems (2)
cover Fix up casefolding sysfs entries for F2FS
These correct displaying support for casefolding only when that capability is present, and advertise if encryption and casefolding are supported together. Casefolding requires CONFIG_UNICODE, and casefolding with encryption wasn't supported until commit 7ad08a58bf67
("f2fs: Handle casefolding with Encryption")
Daniel Rosenberg (2):
f2fs: Show casefolding support only when supported
f2fs: Advertise encrypted casefolding in sysfs
fs/f2fs/sysfs.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
Signature · 1 line
2.32.0.rc0.204.g9fa02ecfa5-goog
PATCH 1/2 f2fs: Show casefolding support only when supported
The casefolding feature is only supported when CONFIG_UNICODE is set. This modifies the feature list f2fs presents under sysfs accordingly.
--- fs/f2fs/sysfs.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/f2fs/sysfs.c +4 -0
@@ -720,7 +720,9 @@ F2FS_FEATURE_RO_ATTR(lost_found, FEAT_LOST_FOUND);F2FS_FEATURE_RO_ATTR (verity,FEAT_VERITY );#endif F2FS_FEATURE_RO_ATTR (sb_checksum,FEAT_SB_CHECKSUM ); +#ifdef CONFIG_UNICODE F2FS_FEATURE_RO_ATTR (casefold,FEAT_CASEFOLD ); +#endif #ifdef CONFIG_F2FS_FS_COMPRESSION F2FS_FEATURE_RO_ATTR (compression,FEAT_COMPRESSION );F2FS_RW_ATTR (F2FS_SBI , f2fs_sb_info, compr_written_block, compr_written_block);
@@ -829,7 +831,9 @@ static struct attribute *f2fs_feat_attrs[] = { ATTR_LIST(verity), #endif ATTR_LIST(sb_checksum), +#ifdef CONFIG_UNICODE ATTR_LIST(casefold), +#endif #ifdef CONFIG_F2FS_FS_COMPRESSION ATTR_LIST(compression),#endif
Signature · 1 line
2.32.0.rc0.204.g9fa02ecfa5-goog
Re: [PATCH 1/2] f2fs: Show casefolding support only when supported
Quoted 5 lines · Daniel Rosenberg
The casefolding feature is only supported when
CONFIG_UNICODEis set. This modifies the feature list f2fs presents under sysfs accordingly.Fixes 5aba54302a46 ("f2fs: include charset encoding information in the superblock")Signed-off-by Daniel Rosenberg <[email protected]>
Thanks,
Re: [PATCH 1/2] f2fs: Show casefolding support only when supported
In reply to Daniel RosenbergQuoted 5 lines · Daniel Rosenberg
The casefolding feature is only supported when
CONFIG_UNICODEis set. This modifies the feature list f2fs presents under sysfs accordingly.Fixes 5aba54302a46 ("f2fs: include charset encoding information in the superblock")Signed-off-by Daniel Rosenberg <[email protected]>
Can you add a Cc stable tag?
- Eric
PATCH 2/2 f2fs: Advertise encrypted casefolding in sysfs
In reply to Daniel RosenbergOlder kernels don't support encryption with casefolding. This adds the sysfs entry encrypted_casefold to show support for those combined features. Support for this feature was originally added by commit 7ad08a58bf67 ("f2fs: Handle casefolding with Encryption")
--- fs/f2fs/sysfs.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
fs/f2fs/sysfs.c +11 -0
@@ -161,6 +161,9 @@ static ssize_t features_show(struct f2fs_attr *a,if (f2fs_sb_has_compression (sbi)) len +=scnprintf (buf + len,PAGE_SIZE - len,"%s%s" , len ?", " :"" ,"compression" ); +if (f2fs_sb_has_casefold (sbi) &&f2fs_sb_has_encrypt (sbi)) + len +=scnprintf (buf + len,PAGE_SIZE - len,"%s%s" , + len ?", " :"" ,"encrypted_casefold" ); len +=scnprintf (buf + len,PAGE_SIZE - len,"%s%s" , len ?", " :"" ,"pin_file" ); len +=scnprintf (buf + len,PAGE_SIZE - len,"\n" );
@@ -579,6 +582,7 @@ enum feat_id {FEAT_CASEFOLD ,FEAT_COMPRESSION ,FEAT_TEST_DUMMY_ENCRYPTION_V2 , + FEAT_ENCRYPTED_CASEFOLD, }; static ssize_t f2fs_feature_show(struct f2fs_attr *a,
@@ -600,6 +604,7 @@ static ssize_t f2fs_feature_show(struct f2fs_attr *a,case FEAT_CASEFOLD :case FEAT_COMPRESSION :case FEAT_TEST_DUMMY_ENCRYPTION_V2 : +case FEAT_ENCRYPTED_CASEFOLD :return sprintf (buf,"supported\n" ); }return 0 ;
@@ -704,6 +709,9 @@ F2FS_GENERAL_RO_ATTR(avg_vblocks);#ifdef CONFIG_FS_ENCRYPTION F2FS_FEATURE_RO_ATTR (encryption,FEAT_CRYPTO );F2FS_FEATURE_RO_ATTR (test_dummy_encryption_v2,FEAT_TEST_DUMMY_ENCRYPTION_V2 ); +#ifdef CONFIG_UNICODE +F2FS_FEATURE_RO_ATTR (encrypted_casefold,FEAT_ENCRYPTED_CASEFOLD ); +#endif #endif #ifdef CONFIG_BLK_DEV_ZONED F2FS_FEATURE_RO_ATTR (block_zoned,FEAT_BLKZONED );
@@ -815,6 +823,9 @@ static struct attribute *f2fs_feat_attrs[] = {#ifdef CONFIG_FS_ENCRYPTION ATTR_LIST(encryption), ATTR_LIST(test_dummy_encryption_v2), +#ifdef CONFIG_UNICODE + ATTR_LIST(encrypted_casefold), +#endif #endif #ifdef CONFIG_BLK_DEV_ZONED ATTR_LIST(block_zoned),
Signature · 1 line
2.32.0.rc0.204.g9fa02ecfa5-goog
Chao Yu
maintainerRe: [PATCH 2/2] f2fs: Advertise encrypted casefolding in sysfs
Quoted 4 lines · Daniel Rosenberg
Older kernels don't support encryption with casefolding. This adds the sysfs entry
encrypted_casefoldto show support for those combined features. Support for this feature was originally added by commit7ad08a58bf67("f2fs: Handle casefolding with Encryption")
Shouldn't this be backported to the kernel where we support casefolding with encryption? So adding a fixes tag here?
Thanks,
Quoted 57 lines
Signed-off-by Daniel Rosenberg <[email protected]>--- fs/f2fs/sysfs.c | 11 +++++++++++ 1 file changed, 11 insertions(+)fs/f2fs/sysfs.c +11
-0@@ -161,6 +161,9 @@ static ssize_t features_show(struct f2fs_attr *a,if (f2fs_sb_has_compression (sbi)) len +=scnprintf (buf + len,PAGE_SIZE - len,"%s%s" , len ?", " :"" ,"compression" ); +if (f2fs_sb_has_casefold (sbi) &&f2fs_sb_has_encrypt (sbi)) + len +=scnprintf (buf + len,PAGE_SIZE - len,"%s%s" , + len ?", " :"" ,"encrypted_casefold" ); len +=scnprintf (buf + len,PAGE_SIZE - len,"%s%s" , len ?", " :"" ,"pin_file" ); len +=scnprintf (buf + len,PAGE_SIZE - len,"\n" );@@ -579,6 +582,7 @@ enum feat_id {FEAT_CASEFOLD ,FEAT_COMPRESSION ,FEAT_TEST_DUMMY_ENCRYPTION_V2 , + FEAT_ENCRYPTED_CASEFOLD, }; static ssize_t f2fs_feature_show(struct f2fs_attr *a,@@ -600,6 +604,7 @@ static ssize_t f2fs_feature_show(struct f2fs_attr *a,case FEAT_CASEFOLD :case FEAT_COMPRESSION :case FEAT_TEST_DUMMY_ENCRYPTION_V2 : +case FEAT_ENCRYPTED_CASEFOLD :return sprintf (buf,"supported\n" ); }return 0 ;@@ -704,6 +709,9 @@ F2FS_GENERAL_RO_ATTR(avg_vblocks);#ifdef CONFIG_FS_ENCRYPTION F2FS_FEATURE_RO_ATTR (encryption,FEAT_CRYPTO );F2FS_FEATURE_RO_ATTR (test_dummy_encryption_v2,FEAT_TEST_DUMMY_ENCRYPTION_V2 ); +#ifdef CONFIG_UNICODE +F2FS_FEATURE_RO_ATTR (encrypted_casefold,FEAT_ENCRYPTED_CASEFOLD ); +#endif #endif #ifdef CONFIG_BLK_DEV_ZONED F2FS_FEATURE_RO_ATTR (block_zoned,FEAT_BLKZONED );@@ -815,6 +823,9 @@ static struct attribute *f2fs_feat_attrs[] = {#ifdef CONFIG_FS_ENCRYPTION ATTR_LIST(encryption), ATTR_LIST(test_dummy_encryption_v2), +#ifdef CONFIG_UNICODE + ATTR_LIST(encrypted_casefold), +#endif #endif #ifdef CONFIG_BLK_DEV_ZONED ATTR_LIST(block_zoned),
Re: [PATCH 2/2] f2fs: Advertise encrypted casefolding in sysfs
In reply to Daniel Rosenbergfs/f2fs/sysfs.c F2FS_GENERAL_RO_ATTR(avg_vblocks); · line 714
Quoted 3 lines · Daniel Rosenberg
fs/f2fs/sysfs.c +3
-0+#ifdef CONFIG_UNICODE +F2FS_FEATURE_RO_ATTR (encrypted_casefold,FEAT_ENCRYPTED_CASEFOLD ); +#endif
Shouldn't it be defined(CONFIG_UNICODE) && defined(CONFIG_FS_ENCRYPTION)?
fs/f2fs/sysfs.c static struct attribute *f2fs_feat_attrs[] = { · line 828
Quoted 10 lines
#endif
#ifdefCONFIG_BLK_DEV_ZONEDF2FS_FEATURE_RO_ATTR(block_zoned, FEAT_BLKZONED);fs/f2fs/sysfs.c +3
-0@@ -815,6 +823,9 @@ static struct attribute *f2fs_feat_attrs[] = {#ifdef CONFIG_FS_ENCRYPTION ATTR_LIST(encryption), ATTR_LIST(test_dummy_encryption_v2), +#ifdef CONFIG_UNICODE + ATTR_LIST(encrypted_casefold), +#endif
Likewise here.
- Eric
Re: [PATCH 2/2] f2fs: Advertise encrypted casefolding in sysfs
Quoted 21 lines · Eric Biggers
fs/f2fs/sysfs.c F2FS_GENERAL_RO_ATTR(avg_vblocks); · line 714
Quoted 3 lines · Daniel Rosenberg
fs/f2fs/sysfs.c +3
-0+#ifdef CONFIG_UNICODE +F2FS_FEATURE_RO_ATTR (encrypted_casefold,FEAT_ENCRYPTED_CASEFOLD ); +#endif Shouldn't it be
defined(CONFIG_UNICODE)&&defined(CONFIG_FS_ENCRYPTION)?fs/f2fs/sysfs.c static struct attribute *f2fs_feat_attrs[] = { · line 828
Quoted 10 lines
#endif
#ifdefCONFIG_BLK_DEV_ZONEDF2FS_FEATURE_RO_ATTR(block_zoned, FEAT_BLKZONED);fs/f2fs/sysfs.c +3
-0@@ -815,6 +823,9 @@ static struct attribute *f2fs_feat_attrs[] = {#ifdef CONFIG_FS_ENCRYPTION ATTR_LIST(encryption), ATTR_LIST(test_dummy_encryption_v2), +#ifdef CONFIG_UNICODE + ATTR_LIST(encrypted_casefold), +#endif Likewise here.
Quoted 1 line
- Eric
Those are already within an #ifdef CONFIG_FS_ENCRYPTION, so it should be covered already.
Should I send a v2 set with the
appended?
-Daniel
Re: [PATCH 2/2] f2fs: Advertise encrypted casefolding in sysfs
Quoted 22 lines · Daniel Rosenberg
Quoted 21 lines · Eric Biggers
fs/f2fs/sysfs.c F2FS_GENERAL_RO_ATTR(avg_vblocks); · line 714
Quoted 3 lines · Daniel Rosenberg
fs/f2fs/sysfs.c +3
-0+#ifdef CONFIG_UNICODE +F2FS_FEATURE_RO_ATTR (encrypted_casefold,FEAT_ENCRYPTED_CASEFOLD ); +#endif Shouldn't it be
defined(CONFIG_UNICODE)&&defined(CONFIG_FS_ENCRYPTION)?fs/f2fs/sysfs.c static struct attribute *f2fs_feat_attrs[] = { · line 828
Quoted 10 lines
#endif
#ifdefCONFIG_BLK_DEV_ZONEDF2FS_FEATURE_RO_ATTR(block_zoned, FEAT_BLKZONED);fs/f2fs/sysfs.c +3
-0@@ -815,6 +823,9 @@ static struct attribute *f2fs_feat_attrs[] = {#ifdef CONFIG_FS_ENCRYPTION ATTR_LIST(encryption), ATTR_LIST(test_dummy_encryption_v2), +#ifdef CONFIG_UNICODE + ATTR_LIST(encrypted_casefold), +#endif Likewise here.
Quoted 4 lines
Quoted 1 line
- Eric
Those are already within an #ifdef
CONFIG_FS_ENCRYPTION, so it should be covered already.
Adding a comment to the #endif for CONFIG_FS_ENCRYPTION would make it easier to read:
#endif /* CONFIG_FS_ENCRYPTION */
Quoted 6 lines
Should I send a v2 set with the
Fixes 7ad08a58bf67 ("f2fs: Handle casefolding with Encryption")Cc [email protected] # v5.11+appended?
Yes, please add those tags.
- Eric