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 2/4] f2fs: introduce f2fs_set_compress_level()
Date:   Tue, 24 Jan 2023 23:33:44 +0800
Message-Id: <20230124153346.74881-2-frank.li@vivo.com>
In-Reply-To: <20230124153346.74881-1-frank.li@vivo.com>
References: <20230124153346.74881-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?uSG714e7Ld9oWhlX3QneEh9e4ayOY1MqvVNaA26drbknYP+IxHjU2Nh6gDw6?=
 =?us-ascii?Q?k5O8JN9AbJoR7Npxs12FtYGf94+6T8uQvnzEqF7pF3qIuxKxaNYjxoxK971g?=
 =?us-ascii?Q?/OQ/Y4B62c3CwevDx934BfT5w7/fJ0CjsEP6AG93M/GExl0p1LwywKWhSo15?=
 =?us-ascii?Q?BFDGZR7oE6NzXfEW8N/9gsqN7xxRSQgLU+et1bt39EbHnqIZ3ALfL221vIBt?=
 =?us-ascii?Q?DkUouX0aICCPi7iIWx75VX7RfaWjyug5qKFgzAedFBpwoVReFM/2pn73tv3g?=
 =?us-ascii?Q?iezQlvoaDaEK1kB2qbyq37mveaGC0hPOngm78KVlW+c2wstAcLFaqSGY86Fb?=
 =?us-ascii?Q?wCDaM7298Cnk5nyMs0OOLc/A5kYfukOHYe0itZd1BcXT9R5BkRogqQKmK3R/?=
 =?us-ascii?Q?jC/lC1nNpCWlvtV7TzeAGuxqwQ8HVd/E5H42qbuF1IrZBvCA6FhLoP+aqbmK?=
 =?us-ascii?Q?pL/ssFMXXWz5JCfHQXZCP13TZggqDV9D1ewviVzeTt6NcNoK2s4Zv/0Bsumw?=
 =?us-ascii?Q?u5xuTjG9fjOJBB3JfmCl6tuihXmQMquIFT3qQ7MgEm6gAqmhkWKc4weKWsL6?=
 =?us-ascii?Q?b4vKk3D3lSX1Yj8Vbj8Ktp1DX4J39ilrDYKcKX43sydAIqOdwp7iforrdF0D?=
 =?us-ascii?Q?PONfYxbLLOnqQFFeVslvNCO9Fy5B13VTgrJcb9jP60ni74DyI2PnZC6ECGjK?=
 =?us-ascii?Q?q32MQzupBRvbMj/xLsMFe8xUQnKZpTii/VyLBffvZlhqBIlKUTvcRIOj4iB6?=
 =?us-ascii?Q?7IWO33eEceYZ773wC+xKphHY/gocXE+ocHzOp3xyRVyv1KL8b/etZZHT/Om4?=
 =?us-ascii?Q?QF1KSIxJ/KxLjncDguMEI1/Ll9XDEck1Ty+VlZeTHI5hFIsJSxtE4b2AnmU6?=
 =?us-ascii?Q?/rNlh3EQniAPWp1uHZQk7fpvsZJ7QCF7wjYegcIVhFzdBr/KZxjAAwZ3gTF/?=
 =?us-ascii?Q?fRup1YxOQ9bE1uFT5ZQKVSOe4lwkNtBRO1wvT9sJzxoGaFnCH4Tw0faP5wck?=
 =?us-ascii?Q?DhDR2LAH76GegcshyzCMq/rSGki9M1eh3jNbKt0LfEx6+WqNgl9FcHTIAhMM?=
 =?us-ascii?Q?gyyT45TAjttgFFrBlCwM7wv29wEt14rq99/d8Jhty/GhBI2l/TJ90dqBLCWu?=
 =?us-ascii?Q?YsSfuUGR6V3dNgGKAcb95umo2xYZYxbvhNZOTP4D1WzDnATK1CTWKw4pIT7E?=
 =?us-ascii?Q?N/Lmfy9V13q9t4Uvkz76vSyc6vC9qrC9zG5ByYZPpSOI+dHSr02JvJqx4yfM?=
 =?us-ascii?Q?CslIMq+PllXj+GHhunpQKrQ7nUW1THgpa6fJGjwg8Bk/iu3Q6dA7IaMR5cjK?=
 =?us-ascii?Q?755RVgWLIuXVGzkg7yxXVPVWKGfbN/8EeRLWyE/sCwupdS9tV5BJDB32gZyE?=
 =?us-ascii?Q?L7LvVADg0ebUoDEcNociJfhh8ixw7xBwgbdlTD54IO9cIOtvDOUZrNguGBop?=
 =?us-ascii?Q?2bGc8G/L7rc90NxzRGaNWFNObkYudFbjv6gHpenKDAuXaYHoQRK9uYdVamcU?=
 =?us-ascii?Q?SwVIulw06twaURFkrP1qls3ffGO2MjFq3+APNhdVK8ceSxmzgPBDhOvv0TmN?=
 =?us-ascii?Q?DFgg/TTXbhx/KSL1pRGnbBT+g7onYPLUoQZGxpuH?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3a6e1fa0-f0a5-4c94-4ecc-08dafe2069a2
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 15:33:59.2573
 (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: E3YsLk4w62/HtYXRS2GiKu2emPbfS70A/6oR0T6QQ8RJjRZSdeWbadFauECvKTBuxC2z4YjcYtzv9kXOdFdJZg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB5019
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

f2fs_set_lz4hc_level() and f2fs_set_zstd_level() have common code,
let's introduce f2fs_set_compress_level() to do sanity compress level
check.

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

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index ad5df4d5c39a..b5fbe9939390 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -588,40 +588,12 @@ static int f2fs_test_compress_extension(struct f2fs_sb_info *sbi)
 	return 0;
 }
 
-#ifdef CONFIG_F2FS_FS_LZ4HC
-static int f2fs_set_lz4hc_level(struct f2fs_sb_info *sbi, const char *str)
+static int __maybe_unused f2fs_set_compress_level(struct f2fs_sb_info *sbi,
+					const char *str, const char *alg_name,
+					unsigned int min, unsigned int max)
 {
 	unsigned int level;
-
-	str += 3;
-
-	if (str[0] != ':') {
-		f2fs_info(sbi, "wrong format, e.g. <alg_name>:<compr_level>");
-		return -EINVAL;
-	}
-	if (kstrtouint(str + 1, 10, &level))
-		return -EINVAL;
-
-	if (level < LZ4HC_MIN_CLEVEL || level > LZ4HC_MAX_CLEVEL) {
-		f2fs_info(sbi, "invalid lz4hc compress level: %d", level);
-		return -EINVAL;
-	}
-
-	F2FS_OPTION(sbi).compress_level = level;
-	return 0;
-}
-#endif
-
-#ifdef CONFIG_F2FS_FS_ZSTD
-static int f2fs_set_zstd_level(struct f2fs_sb_info *sbi, const char *str)
-{
-	unsigned int level;
-	int len = 4;
-
-	if (strlen(str) == len) {
-		F2FS_OPTION(sbi).compress_level = 0;
-		return 0;
-	}
+	int len = strlen(alg_name);
 
 	str += len;
 
@@ -632,8 +604,8 @@ static int f2fs_set_zstd_level(struct f2fs_sb_info *sbi, const char *str)
 	if (kstrtouint(str + 1, 10, &level))
 		return -EINVAL;
 
-	if (!level || level > zstd_max_clevel()) {
-		f2fs_info(sbi, "invalid zstd compress level: %d", level);
+	if (level < min || level > max) {
+		f2fs_info(sbi, "invalid %s compress level: %d", alg_name, level);
 		return -EINVAL;
 	}
 
@@ -641,7 +613,6 @@ static int f2fs_set_zstd_level(struct f2fs_sb_info *sbi, const char *str)
 	return 0;
 }
 #endif
-#endif
 
 static int parse_options(struct super_block *sb, char *options, bool is_remount)
 {
@@ -1077,7 +1048,8 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
 					F2FS_OPTION(sbi).compress_level = 0;
 				} else {
 #ifdef CONFIG_F2FS_FS_LZ4HC
-					ret = f2fs_set_lz4hc_level(sbi, name);
+					ret = f2fs_set_compress_level(sbi, name, "lz4",
+						LZ4HC_MIN_CLEVEL, LZ4HC_MAX_CLEVEL);
 					if (ret) {
 						kfree(name);
 						return -EINVAL;
@@ -1094,10 +1066,15 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
 #endif
 			} else if (!strncmp(name, "zstd", 4)) {
 #ifdef CONFIG_F2FS_FS_ZSTD
-				ret = f2fs_set_zstd_level(sbi, name);
-				if (ret) {
-					kfree(name);
-					return -EINVAL;
+				if (strlen(name) == 4) {
+					F2FS_OPTION(sbi).compress_level = 0;
+				} else {
+					ret = f2fs_set_compress_level(sbi, name, "zstd", 1,
+						zstd_max_clevel());
+					if (ret) {
+						kfree(name);
+						return -EINVAL;
+					}
 				}
 				F2FS_OPTION(sbi).compress_algorithm =
 								COMPRESS_ZSTD;
-- 
2.25.1