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 iostat support for FS_DISCARD_IO
Date:   Mon, 12 Dec 2022 13:47:06 +0800
Message-Id: <20221212054706.65579-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?ABCAZ/IuwHmmHS5FRtSDf7NqWtCC81B90mNusdxdaCbr47UZ/Zt2Uzx43+7o?=
 =?us-ascii?Q?LV2YmDxJxEBYNN3Dv/59i68VnSrQdirb0YVolm+SrCTQ7bq6xTW5gCgfjxPw?=
 =?us-ascii?Q?HUZ1adx0L1Q0cpprarvwYOgp2xgWQ2xF1Cy82zdzlGy3/oZc5aLJpA3QDqwi?=
 =?us-ascii?Q?pRqADTLU7r1GcrZMYOSn6YvcKS2mq0OX9jQAS01/2nyogw7aPstJpPFQ9rt9?=
 =?us-ascii?Q?l3vtILLpr1CZM5A39n2yZb2eDnfqaAVkLVZJSxCTKyp+JHlywXQl0wQdzePj?=
 =?us-ascii?Q?nl6w99ut0PY7qEXeKSqkTep28rsBeNLumqOQ00Pfm2ubZ0YZRzOk3fa6aaKA?=
 =?us-ascii?Q?J/I4/SzvppSiSlBP/GCu0p2woGNrJgOE26OToYHr/hcZy14CN54UJdW619IV?=
 =?us-ascii?Q?evkW9IFQEtvzgnRCbm060QPkVGv7DKI9TwqL0u8i1mjXP7tZzwZiiVS7bARv?=
 =?us-ascii?Q?jmQJfMDB56ZLj66yw+v42Wek+q4EJtKfPWKQ+TD8qZAEOH0Ckq5OsTnrIVAf?=
 =?us-ascii?Q?AA41cv0BuAI0THWMW4G9YRI8121kk/pRj7YCwjuZ36ew2EpvYyjUnMNT/5lN?=
 =?us-ascii?Q?wlM629k5u2S770MEvR2sWnBdMSwC7Dcq2g3UF0l98P5cQgU4TQUqa459CJZD?=
 =?us-ascii?Q?WtCoCPBDcmQQZL7i0KNr231HL5CIFGp3ksyM41iY5ZsT5DEJI9pFuFTzMQGh?=
 =?us-ascii?Q?tqxmiMbqaiFPL9uzPZILSBkPEL8c/3JXS1eOqLfxMcZiGFiio+uZC2Y6UI7f?=
 =?us-ascii?Q?+83BeaGWf6HaLFj+lk56j1qH/fQBmARmeSfjYK5l/ZR08RETljkkUJM+6VsE?=
 =?us-ascii?Q?FamIedVEzz/gy3xMQDgYYWB6y/Gv1pyZSWFwVNPlxtfVgCYrVUKrNITUpeHj?=
 =?us-ascii?Q?Gm0Km9ibE4AN4qDga07iJ3udGx0AIOILlzbXof0paKkH9SwMZ6A+F6fsge4y?=
 =?us-ascii?Q?Y84DM1ww3nWCvvTEv2Cch7hWb/VjZpVqUddKsg8IqawufEff4vhGvpFtQH8v?=
 =?us-ascii?Q?TmXLev0V4yOwC6/VpJ2oJ8EclhEtILIebHoDx8VP3JutRd1dkKxFOXINO/42?=
 =?us-ascii?Q?rs3bn+bKcEf5/Tn8+HmVH+/QP0RYr3lxekuniS+UGqnAwIPlTyAE8X/n7OZ+?=
 =?us-ascii?Q?zVAAw9lqquAADdMWj2pbgJ1bVOxlFtsLvUkAZuoDNDLSTWo7sIT1jENH/Nki?=
 =?us-ascii?Q?K7AU2po2ePJkJYLzNndH0rVdBuLgn6t1u2n/ZnWyTLzGzUh+JsZZsq8pjJ3A?=
 =?us-ascii?Q?Yy78Bq9gD5HVkiYWx8kHP6ACzUc09havQEtQoz34HaShINErDik9TjCKVBYg?=
 =?us-ascii?Q?BmkcSBnA4gG4WAieQcU0YQp1c2K33HYeCMCj1ksHN55T5cap3M22MXuwxl0J?=
 =?us-ascii?Q?gDb0ywVdVZzxffhY7ejEczuAiq/TGN2LVI6bDtrUH7IGR4JrngRmGtRUNbs4?=
 =?us-ascii?Q?SGQRPoagkaXWZ6eX9aj7gtaahye5UGio3643bDbzVnMpfpvlNAcIhuDD2qAn?=
 =?us-ascii?Q?OE1yjNlw+Wcj8jaXMGk/nzXgxCxuO5jfh25RX6U2qarCbihR+IBgvYVdiMYo?=
 =?us-ascii?Q?OKMyK/tTwPAtG7j1rVjd1M9JljZHYbbetwHRBYGe?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e2e46bfe-64b5-4bab-b57f-08dadc0452cd
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2022 05:47:15.5426
 (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: fmmL1A+EiInz4+Pr2yOD5aq18dcXWn54+iznve1ARZwlPbSfqejs/343XW6mV9STKeKKEEJA6aHApo0/LMp1Hw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6035
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

Just like other data we count uses the number of bytes as the basic
unit, but discard uses the number of cmds as the statistical unit. In
fact, the discard command contains the number of blocks. In order to
avoid breaking its usage of application, let's keeping FS_DISCARD
as it is, and add FS_DISCARD_IO to account discard bytes.

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

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index e8953c3dc81a..ef0043003bf8 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1193,6 +1193,7 @@ enum iostat_type {
 	FS_META_READ_IO,		/* meta read IOs */
 
 	/* other */
+	FS_DISCARD_IO,		/* discard IOs */
 	FS_DISCARD,			/* discard */
 	NR_IO_TYPE,
 };
diff --git a/fs/f2fs/iostat.c b/fs/f2fs/iostat.c
index 3166a8939ed4..3d2f0b69cdda 100644
--- a/fs/f2fs/iostat.c
+++ b/fs/f2fs/iostat.c
@@ -89,6 +89,8 @@ int __maybe_unused iostat_info_seq_show(struct seq_file *seq, void *offset)
 
 	/* print other IOs */
 	seq_puts(seq, "[OTHER]\n");
+	seq_printf(seq, "fs discard bytes:	%-16llu\n",
+				sbi->rw_iostat[FS_DISCARD_IO]);
 	seq_printf(seq, "fs discard:		%-16llu\n",
 				sbi->rw_iostat[FS_DISCARD]);
 
@@ -180,6 +182,9 @@ void f2fs_update_iostat(struct f2fs_sb_info *sbi, struct inode *inode,
 	spin_lock_irqsave(&sbi->iostat_lock, flags);
 	sbi->rw_iostat[type] += io_bytes;
 
+	if (type == FS_DISCARD_IO)
+		sbi->rw_iostat[FS_DISCARD]++;
+
 	if (type == APP_BUFFERED_IO || type == APP_DIRECT_IO)
 		sbi->rw_iostat[APP_WRITE_IO] += io_bytes;
 
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index dee712f7225f..bd02631f9681 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1187,7 +1187,7 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
 
 		atomic_inc(&dcc->issued_discard);
 
-		f2fs_update_iostat(sbi, NULL, FS_DISCARD, 1);
+		f2fs_update_iostat(sbi, NULL, FS_DISCARD_IO, len * F2FS_BLKSIZE);
 
 		lstart += len;
 		start += len;
-- 
2.25.1