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, Yuwei.Guan@zeekrlife.com,
        Yangtao Li <frank.li@vivo.com>
Subject: [PATCH v2] f2fs: introduce discard_io_aware_gran sysfs node
Date:   Mon, 12 Dec 2022 22:05:40 +0800
Message-Id: <20221212140540.5187-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?Ujn/JcEx5EUbyzQGenD2y/zgah9Nie/8IPKJ1Rt8lYEOdUBqay/Vb984PwP+?=
 =?us-ascii?Q?6KrKFzdaoYTR69Ov23UwAMVCc2l+9JdalYEbds/nrBXljo4SKgWQuaTrcECo?=
 =?us-ascii?Q?SpC8PEWt3KDhJnNDtK1D1+c2UxQlFJrG0qPMdh7E4TA9B39rjs0hspHIOZvN?=
 =?us-ascii?Q?baYNdzoLq7PBAGPUZEawc0ymFqUWKLzO87WMhWhLQIXpgrdDgjFHZtGcYr/x?=
 =?us-ascii?Q?1oe9Z8md85SLNA9G9E9C00DRf6HKQZUEoM3d5sfFelMbmFSxhCbVUpNTDrUH?=
 =?us-ascii?Q?BwKTSOJUpNIt6eG4stsU14/tbN//5Ny/hnOIhAaJXFOkjMzAR3Y5e1nQST69?=
 =?us-ascii?Q?KkAwS5WExVnPxh4yCRJugi7OIwIyEnJ+iQZ/A/tW1dRW8eUFXvrRmWm2p1Wh?=
 =?us-ascii?Q?DQ0amWuQDlvfxzC6DZd/lCZeG8N8MGb0JWbwC67+JV+jXKw493yooSwEnWgr?=
 =?us-ascii?Q?GB+qnkki6NK3dFePF8eY47n8yRaXarHELFvX/n2YYX2fZA5ftVuoofShQFIU?=
 =?us-ascii?Q?qoSNg0feBXsbAIwE3vkQHYeWMUsJsdrXHEXirFRFe3TlB4mZjJTB1yykdBoa?=
 =?us-ascii?Q?jAxd56qye8x2YOTVL8dvlhuajsqNO0QnXRSDwuMW+juqVo74j1B9dzhjgESS?=
 =?us-ascii?Q?Nv9t1/oa49GIGstub53mhtYcSzvaJG/nwmNlBTedLOe1PudNm3457BV9cZy5?=
 =?us-ascii?Q?/J6MmQhcytZM579TQIIYWMhJMfPNT4DvLWjH1htIMt/ekqu9jk9Wh71CvlgW?=
 =?us-ascii?Q?Om/gLWdFauiqQUCDrJPzdzRk/lj7Hy4vMb3jgd8UsT71c3Ip+vs9E0yP5Tpl?=
 =?us-ascii?Q?xy6OBcOWdN0JZyvpWOx/KpUFDZ26zK1XYJhk9j4F5cIBdHLUOy8/xGXUy0LA?=
 =?us-ascii?Q?Eg9Mbsj+uk9fPLSjV4L+ToU+WES1QkMoBMBaK0ot7NTXnRHO7thYGPWv0srd?=
 =?us-ascii?Q?bpnc5fYAPKhBwY6fhSVohWRWkQTzfDNZeJFbFl6ypOhnB48QJ4FcZYuFyM6P?=
 =?us-ascii?Q?p0+S6h6H3/yDhkLNH/wGMNlHrNNwnzK2BCiHxZDosRidcHK2mAqpZQslj4iu?=
 =?us-ascii?Q?3GieriwxeXqXlHUf0zddom3T37tfmbSG5hn0kV1ZY6G2RKWttfYrHbZesqkj?=
 =?us-ascii?Q?XZhiFd61WiuSIwqt1hx/h6upZjeG1UYt5VnJLFPlwGI7wS1dxHARgdBsRuGS?=
 =?us-ascii?Q?PuxckHf2s+OPGTRxOue5L8tvHq6TJDsu6S2IerXu+ufZmaPQvx3TG5wvQZg7?=
 =?us-ascii?Q?N/QBw+fqZbJFCT71SSVd5N5xWbFMvOmNIxUL97zpPOjCSy1hFyvalyGRv8nO?=
 =?us-ascii?Q?XhmHCiV5xrQ1+2h8o+hMVNnYv2SjOJgg+4Rv8qixruCHaKoDHVaoGphgX4Kb?=
 =?us-ascii?Q?df4LKNPtIHR4bQ4n5JvP+gb9b0AwVv8bUsx9e9Eq4n13JWoEpo8PyKsMG0X8?=
 =?us-ascii?Q?BpKazmm3B7NovP2KqMLJlQBm+eHJFIqfH5Q2VDcqCSxDN36O3M95+i6qF3ja?=
 =?us-ascii?Q?v12P486E8cH0nol8pqPHg6fZrGgykkRk4GsexdOLeAdCzf3CzHrrLGBHR2LH?=
 =?us-ascii?Q?Loj+oLmt/MWAaYwWykxVe1AQl2gcY3j6jGGEfnmQ?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 40b8329e-b08d-46ed-78c1-08dadc49fa07
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2022 14:05:51.3269
 (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: osMPXCpmOiOKKwehp5oTbz4pyZeJNn08VbWHVIXcx+5ArdrS3wnCnwbc7wcOBLok540Zh7VonaQ7pUoqOqouVA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR06MB5469
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

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

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
v2:
- allow 0
 Documentation/ABI/testing/sysfs-fs-f2fs |  9 +++++++++
 fs/f2fs/f2fs.h                          |  3 +++
 fs/f2fs/segment.c                       |  3 ++-
 fs/f2fs/sysfs.c                         | 13 +++++++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/testing/sysfs-fs-f2fs
index 9e3756625a81..7b6cd4cf40ce 100644
--- a/Documentation/ABI/testing/sysfs-fs-f2fs
+++ b/Documentation/ABI/testing/sysfs-fs-f2fs
@@ -669,3 +669,12 @@ Contact:	"Ping Xiong" <xiongping1@xiaomi.com>
 Description:	When DATA SEPARATION is on, it controls the age threshold to indicate
 		the data blocks as warm. By default it was initialized as 2621440 blocks
 		(equals to 10GB).
+
+What:		/sys/fs/f2fs/<disk>/discard_io_aware_gran
+Date:		December 2022
+Contact:	"Yangtao Li" <frank.li@vivo.com>
+Description:	Controls background discard granularity of inner discard thread
+		when is not in idle. Inner thread will not issue discards with size that
+		is smaller than granularity. The unit size is one block(4KB), now only
+		support configuring in range of [0, 512].
+		Default: 512
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index e8953c3dc81a..bd1430d09c6d 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -332,6 +332,8 @@ struct discard_entry {
 #define DEFAULT_DISCARD_GRANULARITY		16
 /* default maximum discard granularity of ordered discard, unit: block count */
 #define DEFAULT_MAX_ORDERED_DISCARD_GRANULARITY	16
+/* default minimum granularity discard not be aware of I/O, unit: block count */
+#define DEFAULT_IO_AWARE_DISCARD_GRANULARITY	512
 
 /* max discard pend list number */
 #define MAX_PLIST_NUM		512
@@ -410,6 +412,7 @@ struct discard_cmd_control {
 	unsigned int min_discard_issue_time;	/* min. interval between discard issue */
 	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_io_aware_gran; /* minimum discard granularity not be aware of I/O */
 	unsigned int discard_urgent_util;	/* utilization which issue discard proactively */
 	unsigned int discard_granularity;	/* discard granularity */
 	unsigned int max_ordered_discard;	/* maximum discard granularity issued by lba order */
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index a9099a754dd2..f4bf39ee31c6 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1060,7 +1060,7 @@ static void __init_discard_policy(struct f2fs_sb_info *sbi,
 	dpolicy->granularity = granularity;
 
 	dpolicy->max_requests = dcc->max_discard_request;
-	dpolicy->io_aware_gran = MAX_PLIST_NUM;
+	dpolicy->io_aware_gran = dcc->discard_io_aware_gran;
 	dpolicy->timeout = false;
 
 	if (discard_type == DPOLICY_BG) {
@@ -2066,6 +2066,7 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
 	if (!dcc)
 		return -ENOMEM;
 
+	dcc->discard_io_aware_gran = DEFAULT_IO_AWARE_DISCARD_GRANULARITY;
 	dcc->discard_granularity = DEFAULT_DISCARD_GRANULARITY;
 	dcc->max_ordered_discard = DEFAULT_MAX_ORDERED_DISCARD_GRANULARITY;
 	if (F2FS_OPTION(sbi).discard_unit == DISCARD_UNIT_SEGMENT)
diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index 83a366f3ee80..5ab42da5f2a3 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -473,6 +473,17 @@ static ssize_t __sbi_store(struct f2fs_attr *a,
 		return count;
 	}
 
+	if (!strcmp(a->attr.name, "discard_io_aware_gran")) {
+		if (t > MAX_PLIST_NUM)
+			return -EINVAL;
+		if (!f2fs_block_unit_discard(sbi))
+			return -EINVAL;
+		if (t == *ui)
+			return count;
+		*ui = t;
+		return count;
+	}
+
 	if (!strcmp(a->attr.name, "discard_granularity")) {
 		if (t == 0 || t > MAX_PLIST_NUM)
 			return -EINVAL;
@@ -825,6 +836,7 @@ F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, max_discard_request, max_discard_req
 F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, min_discard_issue_time, min_discard_issue_time);
 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_io_aware_gran, discard_io_aware_gran);
 F2FS_RW_ATTR(DCC_INFO, discard_cmd_control, discard_urgent_util, discard_urgent_util);
 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);
@@ -960,6 +972,7 @@ static struct attribute *f2fs_attrs[] = {
 	ATTR_LIST(min_discard_issue_time),
 	ATTR_LIST(mid_discard_issue_time),
 	ATTR_LIST(max_discard_issue_time),
+	ATTR_LIST(discard_io_aware_gran),
 	ATTR_LIST(discard_urgent_util),
 	ATTR_LIST(discard_granularity),
 	ATTR_LIST(max_ordered_discard),
-- 
2.25.1