Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Yangtao Li <frank.li@vivo.com>
To:     jaegeuk@kernel.org, chao@kernel.org
Cc:     linux-f2fs-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org, Yangtao Li <frank.li@vivo.com>
Subject: [PATCH] f2fs: add compression feature check for all compress mount opt
Date:   Fri, 13 Jan 2023 04:10:32 +0800
Message-Id: <20230112201032.66300-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lDRJQSDJZ2U+aqQJJUjGtol8b34LOgnYUzuq6S4Fn78CfWkdv6H+JJG06vln?=
 =?us-ascii?Q?p60usgipFr/bTttYqdYbAvseH7ggWrS3zGhBZIBUgy4dEHY2h+oZFqt9DOD3?=
 =?us-ascii?Q?AOjGT3cwdXCtBXFesMH2Tual7k3yqjIbNbxMoG+Cp2zjHsMrDrceCWLzdPS/?=
 =?us-ascii?Q?Dx1CPNkERHcGTmNX5zgNb8AmEprENqqeK69R6uKagHTdF9x2nGtLwNFrFZGM?=
 =?us-ascii?Q?aerqoZAmHbslJVeryn8KX/SNhGTIrc82jd4am17eDVs93cEZK/w3XCOy6xtn?=
 =?us-ascii?Q?FPtY9nP5pS7jlR2fTPRZS+7jJaPTAJBkynHRPVLct+jFyOSAnjKU3KebvYyz?=
 =?us-ascii?Q?LnHjo95YXpTDMkdlOadk3lcD7lxLD2kcXQwLs4MKqxUSl2pp7k/Vho5R7j7A?=
 =?us-ascii?Q?OFNBcnOmhEPmTw/DW5aZRxSzHbArWyakaeiKwlsqe7B/rQFexWzCCBrgmfxC?=
 =?us-ascii?Q?Rj5ACxrTHyMevwcVihTZ9hjG8CtpGCmzH8d5b7e6jJXkrG2iooJlALhh7k2A?=
 =?us-ascii?Q?531Pfz5+OQ1nloUqVXB+yiMdH5U5nHOvVSsX6vsgsz1MShnCEvR9RmwX2Trd?=
 =?us-ascii?Q?t2wp1cMfLj1yNeHIGXyCXKGfMGgih2KCmLXfovyahKjXCqtxN+GKQgkyY7V0?=
 =?us-ascii?Q?Ho/WNW6/D5t1KALjv2GpUVNYvxLvnqAzjdmBCJHnXg7KE4kuAmKTDtf/tuAJ?=
 =?us-ascii?Q?uM/GCQYaOlxsUadZKAMQTkrbtgpcr8hguWH/61T8/Ii0Q0eSudlgrmmaqpt2?=
 =?us-ascii?Q?V0BnpuZHjmdDD9gvWi+E8vhdkwScLG4DJ7ngwhlxLk55poSMhHipQFPmk5ez?=
 =?us-ascii?Q?D2tuko+R3+WQExdelcfeZN3ArpFheUX7wZlF35jG89jCsQqVcECbELprEcFb?=
 =?us-ascii?Q?I4qNwZ89VOJM3cON2EjUI0SaYbnyhCmdNkUoDO9H06rVDSpB/AbAlda9z6FU?=
 =?us-ascii?Q?5Ll+vgmvqz5OaBzullpzkvngR4oRj0Ut/uMaHXFdPXm8RBKm8tYOd3Aass3i?=
 =?us-ascii?Q?/Dp/8YJcGVXhb/dDoKK/m79w30GwVTtppnQaTzEddf0B2TvmTkBKihumnT2d?=
 =?us-ascii?Q?xrL2IpRjuA/8vrHkyjHVaudkJc3o1TZ4UMRzbfUzy2pdQ40bdxNCmGpHaogp?=
 =?us-ascii?Q?MgXztPEGS4e7OJwGJ/U7unXV0SdGSOMN0h+DyFJ40GZSKTd4zs6TG0ihQ3ti?=
 =?us-ascii?Q?QpCuHb95M92l8LcWpoIyo+cYxNH+N36OLXsPjAp6h+8Xo5bqcRLpISFDeGuM?=
 =?us-ascii?Q?0DnfplxU3ML+HE1Y35fmz2lkddVpgupPlzcJzy6ZVXwSYd+VpHuHbUp4fg9W?=
 =?us-ascii?Q?GwiaS5I4cXYLV3kwonKJsl0X2SiLWNo5uNvoETClKU84Ls8jhpQkrZkepZlK?=
 =?us-ascii?Q?5qiF6leCb/X8JprZ/sKXOs8TGUf84Ejwl1usC38WQrFWvnJn1ysIvi/mFSxL?=
 =?us-ascii?Q?l1m9asaSGicte5bR3tzm+nNlDGWxMozYyFaaFDzB9eVP4ID/v54DWEM1FCbC?=
 =?us-ascii?Q?vv8v4wUzxjbyDS6yGDn7G4spBRi7jlGBEBQfIPj8Iiao63sVuX+kwAjihBXL?=
 =?us-ascii?Q?Ecn65n1BKY9+B65IPhfTf4ZB3ETwY8zTuTSEKCAK?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cc1d4b29-0143-4783-ed78-08daf4d91454
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2023 20:10:41.4099
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Vdoyqmbu69W/yjCp01RKv+GcDvXOont/E4/5FYLP3Vg/rsNaXru2ssDS8gMOjcXbhMq1GaNlquHTgmc2jxFC5g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR06MB6111
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_FILL_THIS_FORM_SHORT
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Opt_compress_chksum, Opt_compress_mode and Opt_compress_cache
lack the necessary check to see if the image supports compression,
let's add it.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/super.c | 55 +++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 5fc83771042d..8ef1449272b3 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -89,7 +89,7 @@ static struct shrinker f2fs_shrinker_info = {
 	.seeks = DEFAULT_SEEKS,
 };
 
-enum {
+enum f2fs_mount_opt {
 	Opt_gc_background,
 	Opt_disable_roll_forward,
 	Opt_norecovery,
@@ -655,6 +655,30 @@ static int f2fs_set_zstd_level(struct f2fs_sb_info *sbi, const char *str)
 #endif
 #endif
 
+static bool f2fs_mount_opt_need_skip(struct f2fs_sb_info *sbi, enum f2fs_mount_opt opt)
+{
+	switch (opt) {
+	case Opt_compress_algorithm:
+	case Opt_compress_log_size:
+	case Opt_compress_extension:
+	case Opt_nocompress_extension:
+	case Opt_compress_chksum:
+	case Opt_compress_mode:
+	case Opt_compress_cache:
+#ifdef CONFIG_F2FS_FS_COMPRESSION
+		if (f2fs_sb_has_compression(sbi))
+			return false;
+
+		f2fs_info(sbi, "Image doesn't support compression");
+#else
+		f2fs_info(sbi, "compression options not supported");
+#endif
+		return true;
+	default:
+		return false;
+	}
+}
+
 static int parse_options(struct super_block *sb, char *options, bool is_remount)
 {
 	struct f2fs_sb_info *sbi = F2FS_SB(sb);
@@ -685,6 +709,9 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
 		args[0].to = args[0].from = NULL;
 		token = match_token(p, f2fs_tokens, args);
 
+		if (f2fs_mount_opt_need_skip(sbi, token))
+			continue;
+
 		switch (token) {
 		case Opt_gc_background:
 			name = match_strdup(&args[0]);
@@ -1068,10 +1095,6 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
 			break;
 #ifdef CONFIG_F2FS_FS_COMPRESSION
 		case Opt_compress_algorithm:
-			if (!f2fs_sb_has_compression(sbi)) {
-				f2fs_info(sbi, "Image doesn't support compression");
-				break;
-			}
 			name = match_strdup(&args[0]);
 			if (!name)
 				return -ENOMEM;
@@ -1122,10 +1145,6 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
 			kfree(name);
 			break;
 		case Opt_compress_log_size:
-			if (!f2fs_sb_has_compression(sbi)) {
-				f2fs_info(sbi, "Image doesn't support compression");
-				break;
-			}
 			if (args->from && match_int(args, &arg))
 				return -EINVAL;
 			if (arg < MIN_COMPRESS_LOG_SIZE ||
@@ -1137,10 +1156,6 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
 			F2FS_OPTION(sbi).compress_log_size = arg;
 			break;
 		case Opt_compress_extension:
-			if (!f2fs_sb_has_compression(sbi)) {
-				f2fs_info(sbi, "Image doesn't support compression");
-				break;
-			}
 			name = match_strdup(&args[0]);
 			if (!name)
 				return -ENOMEM;
@@ -1161,10 +1176,6 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
 			kfree(name);
 			break;
 		case Opt_nocompress_extension:
-			if (!f2fs_sb_has_compression(sbi)) {
-				f2fs_info(sbi, "Image doesn't support compression");
-				break;
-			}
 			name = match_strdup(&args[0]);
 			if (!name)
 				return -ENOMEM;
@@ -1204,16 +1215,6 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
 		case Opt_compress_cache:
 			set_opt(sbi, COMPRESS_CACHE);
 			break;
-#else
-		case Opt_compress_algorithm:
-		case Opt_compress_log_size:
-		case Opt_compress_extension:
-		case Opt_nocompress_extension:
-		case Opt_compress_chksum:
-		case Opt_compress_mode:
-		case Opt_compress_cache:
-			f2fs_info(sbi, "compression options not supported");
-			break;
 #endif
 		case Opt_atgc:
 			set_opt(sbi, ATGC);
-- 
2.25.1