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 v2 1/2] f2fs: define MIN_DISCARD_GRANULARITY macro
Date:   Thu, 24 Nov 2022 00:44:01 +0800
Message-Id: <20221123164402.13849-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?IrP5FuOsg4qclIGdnEP+zu7aYuac4XMxOI5hGDMYbQiD4p0goqp4oyJ56p3L?=
 =?us-ascii?Q?BAFrvxPCg5PeGwfAmMAStp9tCW9mOBXMSnFNyD5XPQTvXB7JpOYkE/jhXtfX?=
 =?us-ascii?Q?Yvap691MKrEoIDtYfZPr/I56ZRNupHrEQUSAyk+82d7C9L/FdAnOOXcz5oRo?=
 =?us-ascii?Q?RYZzD4xjikuIm/rx6r/ARF8b7BQrmVtiAKgmWauFi5ZBPUmCcVaSzg2/uY4o?=
 =?us-ascii?Q?M4XTUEo4BO8b50lcSB4efKWjRDdroBVHiG7zqqAwrvT3qYqI6HJHcvmLzGqV?=
 =?us-ascii?Q?bO4W83Cze9J52TSb3hduWWsYjBb6FOfazS4ScN7R3CYKMaD0JV7NCJgY+h8b?=
 =?us-ascii?Q?6T53yL0xeaFXs157Xm2oRogzyyHF3j/2QHZHMAX9tqKAXW4KVYedGJP0uRr9?=
 =?us-ascii?Q?LQePCOoVb3ZnHIOXfAeo+UUxPkZOrpWjL33LVihROeFjxM/Q6ERVBj8uEAiO?=
 =?us-ascii?Q?lhtrtzDT7hv4TTkw4YlRu7Vp+4iFOv+mEuTRVxwev1BmDAeIDSIhSWSjuqBb?=
 =?us-ascii?Q?zGy5ibyBVYXXWBV41MkQwNHTC0vxedeAE0SalGVL4eBCVlgCRCm6+RbCRCSD?=
 =?us-ascii?Q?x0s1UNWoC7J389wqsjBmtfDfooF9U/MJpf3o5hOvnWhpV6PrjperCRdMWSK7?=
 =?us-ascii?Q?ryTtMWHkzL0JTbRBXvcEvKXlgFq8NBrz91PFBni3Nyvgq+BFa8jw1NSHpbGn?=
 =?us-ascii?Q?1PWM+oZt2n5s9Fcax17rWYqba5L+0s0WalpH/yQuPCA/+Aq1iBohyhcooqIB?=
 =?us-ascii?Q?+Yx/h/GEfsszui1VeX9IXUO995nOuNcezGGIg6yfJSo4nj9G04Onm6nfLRv4?=
 =?us-ascii?Q?PH7n+N+5SWwd2VdQlwmSUD4p+27lkB2iGrx7FVdvtlYz12cazmv0hOLMfTzB?=
 =?us-ascii?Q?4YZmq8971jl9sFSKzMVL2J8ajruEdaUmufXrlQwQ5UX69Er+S6yCsaO9yHIw?=
 =?us-ascii?Q?0Z6hLSa3ZyS3hFXUc+D/ib0PU65vRvLSAFqvy2fGipAqg8aqHtfBNAHZ+H7U?=
 =?us-ascii?Q?ycfRStrnAEN0YkoSrj3kerNxQB5rcnUMP5HKY+kE0anpJS4ch2jpZxhi7Ct0?=
 =?us-ascii?Q?3KomTCV3eucuzqaVm6EmugPs9SSsP4PdM3c7Z9Tbp1GxzDywN9OLZDf1F4LY?=
 =?us-ascii?Q?5395sslxU8UgZ6xSnMEF561jkMJNNVIwwh1KvVDgGjVwDovE6+O5Wl9zP+q4?=
 =?us-ascii?Q?OcECdp9FppmAmoLbKgd9J/uXjgX64xvwSG6w2jZBq0WZQc3p6Wt0f5pSHpv0?=
 =?us-ascii?Q?j1lcmA/I2kPbmTIYna8zRG9M+ZUKiafWcvwCbhb8uQ0Ql9TMU4kWxBcXen4W?=
 =?us-ascii?Q?YRwjUTfWbR+1jzPVq2Uecnhrd6xyD1sgJCiyThLfA67v0sB3dkX3F6T96ib3?=
 =?us-ascii?Q?lgi2Y2XRuDNIWOhEqeBNfigZTADW7zhXHqbR/tlRDHyUAlY9LZLqI+Umvwp1?=
 =?us-ascii?Q?e/bt4eYMpkQSNRU+3ut4tu7I5wbku0bU68Yg+OOJXU3UYshRmximMS0KU43P?=
 =?us-ascii?Q?e2z1gamLxYJfuH4fldPcQLv2hycs/DH0QzFvOU+KgdAXBpZjNCrlfpTxsdnp?=
 =?us-ascii?Q?8HzkywVPli9q1l06tl0XCrORUjxfUxaCQKQlZ3ns?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f74fda78-ac00-4638-16c5-08dacd71f3b3
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2022 16:44:13.1351
 (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: 3rB0gtQAJ3rMX4+D8vZl9xvpIWmtIajOV4M6TgOto0JhaNhM9oHXWuvho0OiEwLC43NrPaLS8ZGipX35eVKrkQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB5950
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 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

Do cleanup in f2fs_tuning_parameters() and __init_discard_policy(),
let's use macro instead of number.

Suggested-by: Chao Yu <chao@kernel.org>
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/f2fs.h    | 2 ++
 fs/f2fs/segment.c | 4 ++--
 fs/f2fs/super.c   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index f0833638f59e..4694b55b6df4 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -329,6 +329,8 @@ struct discard_entry {
 	unsigned char discard_map[SIT_VBLOCK_MAP_SIZE];	/* segment discard bitmap */
 };
 
+/* minimum discard granularity, unit: block count */
+#define MIN_DISCARD_GRANULARITY		1
 /* default discard granularity of inner discard thread, unit: block count */
 #define DEFAULT_DISCARD_GRANULARITY		16
 /* default maximum discard granularity of ordered discard, unit: block count */
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 8b0b76550578..a993211ded1d 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1070,7 +1070,7 @@ static void __init_discard_policy(struct f2fs_sb_info *sbi,
 		dpolicy->sync = false;
 		dpolicy->ordered = true;
 		if (utilization(sbi) > DEF_DISCARD_URGENT_UTIL) {
-			dpolicy->granularity = 1;
+			dpolicy->granularity = MIN_DISCARD_GRANULARITY;
 			if (atomic_read(&dcc->discard_cmd_cnt))
 				dpolicy->max_interval =
 					dcc->min_discard_issue_time;
@@ -1085,7 +1085,7 @@ static void __init_discard_policy(struct f2fs_sb_info *sbi,
 	} else if (discard_type == DPOLICY_UMOUNT) {
 		dpolicy->io_aware = false;
 		/* we need to issue all to keep CP_TRIMMED_FLAG */
-		dpolicy->granularity = 1;
+		dpolicy->granularity = MIN_DISCARD_GRANULARITY;
 		dpolicy->timeout = true;
 	}
 }
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 31435c8645c8..daf14b55a972 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -4080,7 +4080,8 @@ static void f2fs_tuning_parameters(struct f2fs_sb_info *sbi)
 	/* adjust parameters according to the volume size */
 	if (MAIN_SEGS(sbi) <= SMALL_VOLUME_SEGMENTS) {
 		if (f2fs_block_unit_discard(sbi))
-			SM_I(sbi)->dcc_info->discard_granularity = 1;
+			SM_I(sbi)->dcc_info->discard_granularity =
+						MIN_DISCARD_GRANULARITY;
 		SM_I(sbi)->ipu_policy = 1 << F2FS_IPU_FORCE |
 					1 << F2FS_IPU_HONOR_OPU_WRITE;
 	}
-- 
2.25.1