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] f2fs: introduce max_ordered_discard sysfs node
Date:   Tue, 25 Oct 2022 15:35:03 +0800
Message-Id: <20221025073503.43935-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?4RoxzEqKVOFV5Y2K8SkQ/HreJhzVG1u2vhd3O6W3jbXzqPAk2kCpmKSfTHzt?=
 =?us-ascii?Q?Kr0VeYVX8PqNUF79euU5w/aCdtnflCoILlT0yh555S56QFPJiSmtXoMDTzCm?=
 =?us-ascii?Q?4gbi2aynLyXtoxkUhsbIW3el5qTWf4OErbVmdZIRG0TXNgjr8viwRP6ty3Jq?=
 =?us-ascii?Q?SV6FJYxRyZ+Mo5i6+Vt4D4rEA6baMslDipCvaGZdi06+3ogo8d+DE+j4O9dI?=
 =?us-ascii?Q?s67Az4t7CSFb7U7dAH2LWzpRKr+9lcvUqr+Hl1UcVTRLDJv32RJhHrqWGtxK?=
 =?us-ascii?Q?JuesMmc7s4DkyAaAjSS8W89tOAbHTuJi8u+24dO1t3BWrWXcuIXnenSStMVo?=
 =?us-ascii?Q?uKp+oPyx8AjnzKgH2N5lTVYwpOaTORoHdEyOQ/UBmqdzpJqHYjjz4Vw8TWtv?=
 =?us-ascii?Q?swNB8oQsuogsF1GhmZybMnMs3YE79rqqdlIirva/SwR+vwcxbGRn2eG3xk5b?=
 =?us-ascii?Q?5VA/0m3L7vs18iq02MqUfl6tcr7dfXMhN3yZfEE0Wun9GAX3IyYigp+tfDLJ?=
 =?us-ascii?Q?aPvgO2ji5lhsA7OueNeHOlSSlJq/IvAfLVRgvd5M8CO/atffbcDRjuTbO5v9?=
 =?us-ascii?Q?fnREPTUGVtMwIkQ5TJD1ucenJq1H10PXLOQgEdEd1aMH6jsk15kZDi6JD7v0?=
 =?us-ascii?Q?Pjp+CSeNgnd57aHF+RzWl/ugapEe3WJDk/HnhRqg/KQ+LR/d2WglML+4EuNR?=
 =?us-ascii?Q?K7ESo1yYEkvRPrCZMEaYcTn1wxaMrXMZ6BzQ/MRXxzJexOxA0bgbBHGxLFqy?=
 =?us-ascii?Q?kZzkP8U6Ta2qA6JT1zi58bElbPR91UmhlfoumsmD0XU82rB1JcFTZ8CZOtfp?=
 =?us-ascii?Q?P9O62OJ0FvBhqBXy5zwejIwRCLfDuJc8xk6rEYg/RhwMgJP+KQqcXns6neIU?=
 =?us-ascii?Q?Glg374UJt65npc6JWYzB5JjHXeo3iUub3CTRUTmwWQcoA9NCqfZVjRBCrxr6?=
 =?us-ascii?Q?xgnEnedHOiOgyp484h9O7jZyNtzYjFJuUTC38fGeCHv0u3j7orAA1wif71sI?=
 =?us-ascii?Q?2tSLXL2Yv58kamNOfgWiLF+yIlbHsuePfB2+YsVZ7vxUW/Hx5FfYcdc6Pqeh?=
 =?us-ascii?Q?c9v6vGm74f+/j8oE5x7VT4AEGpPIzmrZIcjdhKk3cCPeFiM4x9WXYgCe1BOK?=
 =?us-ascii?Q?/d1jVJSKm4riK2kehxslGSx00HZfNPOhxgPPDFK4r5e3j38PYwHqbvZX7fb6?=
 =?us-ascii?Q?THDXk2yNuzNCb8aVDKDLB1+2AMiKG09QclM6l2azpi8uxbIz19J56BSQIuP2?=
 =?us-ascii?Q?5B/s1XnmzjGIjnbhBh6A4eLt4G9VurRwsIz6n2/lMtBqzy6nKQtD4PG7By8h?=
 =?us-ascii?Q?k1kVMcoM/jy+V5Dftx4FxnmP5klIO7AsffMxu+SIY8grrh+cXcfJiSysgsNq?=
 =?us-ascii?Q?W+2TMdxaFxI1CYsdUNTvFaRhvNOP3moyu/6mMqroq+G4liRJM3fjQmLuqfEX?=
 =?us-ascii?Q?rPuk5DDgtD7cSNoaBVY9t8VUW4RyIh6YhLLgxh3kx39YtCittFsfz2hNJbZN?=
 =?us-ascii?Q?CnUVALO/rBN3bsGS5jRyfOXx/cEfDri/S7vBatI0SeXvK0pb1sJmq+8B7dZm?=
 =?us-ascii?Q?KlZSPMPq0SXktNAPErEtB8FK5jTV8BLixKZGH5hg?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d3231c5c-e787-44b3-92a5-08dab65b73da
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2022 07:35:12.9423
 (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: xZV+m3584kpdSqJJqSeXppd0t4Y9Vxom1olsZUjDc6PIKZDTK39rMR45npGHe8R2g1ORoGPAWXaVvYr1o8DVww==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR06MB5236
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,URIBL_BLOCKED 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

The current max_ordered_discard is a fixed value,
change it to be configurable through the sys node.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
v2:
- s/order/ordered
 Documentation/ABI/testing/sysfs-fs-f2fs |  6 ++++++
 fs/f2fs/f2fs.h                          |  3 +++
 fs/f2fs/segment.c                       |  3 ++-
 fs/f2fs/sysfs.c                         | 11 +++++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/testing/sysfs-fs-f2fs
index 859c4e53a846..8faf7b1274df 100644
--- a/Documentation/ABI/testing/sysfs-fs-f2fs
+++ b/Documentation/ABI/testing/sysfs-fs-f2fs
@@ -99,6 +99,12 @@ Description:	Controls the issue rate of discard commands that consist of small
 		checkpoint is triggered, and issued during the checkpoint.
 		By default, it is disabled with 0.
 
+What:		/sys/fs/f2fs/<disk>/max_ordered_discard
+Date:		October 2022
+Contact:	"Yangtao Li" <frank.li@vivo.com>
+Description:	Controls the maximum ordered discard, the unit size is one block(4KB).
+		Set it to 16 by default.
+
 What:		/sys/fs/f2fs/<disk>/max_discard_request
 Date:		December 2021
 Contact:	"Konstantin Vyshetsky" <vkon@google.com>
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 2bad69cf9fd9..91c3fc5383f1 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -330,6 +330,8 @@ struct discard_entry {
 
 /* 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 */
+#define DEFAULT_MAX_ORDERED_DISCARD_GRANULARITY	16
 
 /* max discard pend list number */
 #define MAX_PLIST_NUM		512
@@ -409,6 +411,7 @@ struct discard_cmd_control {
 	unsigned int mid_discard_issue_time;	/* mid. interval between discard issue */
 	unsigned int max_discard_issue_time;	/* max. interval between discard issue */
 	unsigned int discard_granularity;	/* discard granularity */
+	unsigned int max_ordered_discard; /* maximum discard granularity issued by lba order */
 	unsigned int undiscard_blks;		/* # of undiscard blocks */
 	unsigned int next_pos;			/* next discard position */
 	atomic_t issued_discard;		/* # of issued discard */
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index acf3d3fa4363..dfa9dc3a1bc3 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1448,7 +1448,7 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi,
 		if (i + 1 < dpolicy->granularity)
 			break;
 
-		if (i < DEFAULT_DISCARD_GRANULARITY && dpolicy->ordered)
+		if (i < dcc->max_ordered_discard && dpolicy->ordered)
 			return __issue_discard_cmd_orderly(sbi, dpolicy);
 
 		pend_list = &dcc->pend_list[i];
@@ -2046,6 +2046,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
 		return -ENOMEM;
 
 	dcc->discard_granularity = DEFAULT_DISCARD_GRANULARITY;
+	dcc->max_ordered_discard = DEFAULT_MAX_ORDERED_DISCARD_GRANULARITY;
 	if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_SEGMENT)
 		dcc->discard_granularity = sbi->blocks_per_seg;
 	else if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_SECTION)
diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index 2b1c653b37cf..e2325d8dcbb1 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -483,6 +483,15 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
 		return count;
 	}
 
+	if (!strcmp(a->attr.name, "max_ordered_discard")) {
+		if (t == 0 || t > MAX_PLIST_NUM)
+			return -EINVAL;
+		if (!f2fs_block_unit_discard(sbi))
+			return -EINVAL;
+		*ui = t;
+		return count;
+	}
+
 	if (!strcmp(a->attr.name, "migration_granularity")) {
 		if (t == 0 || t > sbi->segs_per_sec)
 			return -EINVAL;
@@ -793,6 +802,7 @@ F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, min_discard_issue_time, min_discard_
 F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, mid_discard_issue_time, mid_discard_issue_time);
 F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, max_discard_issue_time, max_discard_issue_time);
 F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, discard_granularity, discard_granularity);
+F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, max_ordered_discard, max_ordered_discard);
 F2FS_RW_ATTR(RESERVED_BLOCKS, f2fs_sb_info, reserved_blocks, reserved_blocks);
 F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, batched_trim_sections, trim_sections);
 F2FS_RW_ATTR(SM_INFO, f2fs_sm_info, ipu_policy, ipu_policy);
@@ -923,6 +933,7 @@ static struct attribute *f2fs_attrs[] = {
 	ATTR_LIST(mid_discard_issue_time),
 	ATTR_LIST(max_discard_issue_time),
 	ATTR_LIST(discard_granularity),
+	ATTR_LIST(max_ordered_discard),
 	ATTR_LIST(pending_discard),
 	ATTR_LIST(batched_trim_sections),
 	ATTR_LIST(ipu_policy),
-- 
2.25.1