From nobody Thu Sep 18 02:50:31 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D1FBC4332F for ; Mon, 12 Dec 2022 05:47:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230408AbiLLFr1 (ORCPT ); Mon, 12 Dec 2022 00:47:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229537AbiLLFrY (ORCPT ); Mon, 12 Dec 2022 00:47:24 -0500 Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on2138.outbound.protection.outlook.com [40.107.255.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C632EBE1F for ; Sun, 11 Dec 2022 21:47:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=myv2vwiWmm6jNKEtU8Un2BYAKOudQJ00vEdw151HKddTc7gqZhmXXaUDOEtROvgp4L4CWPa0ywcFMET+dRE4/4MewDeZuYbY7ekir+1IB3nrXlaIe+QYxH1lScx0InODeevdnQuy2jdKAcgRiwlAk7wNJeRShMPMDXfbJg7ddtERZE83Z8xanycAA50R2NMnmOrHfgPPZ2WJUUEg53wsI0tyjC/X2UgbwDWOORD5mr1JisHkxhLtPBW6jR8J8sCE7gVT+pCxjBr5jjF9wvprdAItFw0EfaF/cKWDQr9RHNRUKQQVbcLDbJa75ngVxUu7S2y070XQxzcdM9dfZkoX+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8NtMptIuuwoPL0r3LeWz617Ept3oNagQXfDI2KNYP3M=; b=IzinWBFSjZne9JM3X6VPWar/UXDCvQMcbm0lMEYCHUIGeCkPE+bjWgcZDvkj5njS9K2oYMy3/AFCa9gAn9qQTVK/TKw6NmpO+YBGsfz6/uXP08dDS3uBoKxOz8+BbzpE8dPDg1Q6QamESL2BRCQQ803RDpoYGoVj2bQaVrXX/XcysC3YxCXssb+zgLgojvVsEanGcH/5HO7pAod5jCaeUtt5MwCRLqEGOmTxtTnJU0xAnUCj1uumIKiyByHrwmeyMe17OYO5QoJ8U7cEQIQ5pcIZazdqte1rtShMbBC5di19XP8tYecHiYEvpZ1CDUkOMHDqoS3LhP1S6dBjIjgyfA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8NtMptIuuwoPL0r3LeWz617Ept3oNagQXfDI2KNYP3M=; b=WpDfjk0/h6qxjqnpZy301B7i+JyEqbqqBnGNjP0vfBVyoJXU9QU29NkIn6w9W8ao2qyj9pxpkLH2f7Pw1ljXsQDewaXU97A3Wvv36lTe48vCKnlDvCCzx4LIQ6GoK0ozl4GTx13nPcP7UrQMd6n+w9UXShcbw6RFrQvW4v7bDi7mQ6ygNUgXKYCLpUniE0GyPNFRNM6o5GpGk3BmyaeAQ2efV76rbbQJTt5iGw7g12MiCcp+/alAf90XXp1En1RP8mKuSeCquY1dxKAevx2cVvZmEnBDnpRcu8a0DWuByAyX5EuilkdbK5JoM5oq00ZT7mdnG39l5vOafzzpPYu6jQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) by SEYPR06MB6035.apcprd06.prod.outlook.com (2603:1096:101:d9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Mon, 12 Dec 2022 05:47:15 +0000 Received: from SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::ef03:cbfb:f8ef:d88b]) by SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::ef03:cbfb:f8ef:d88b%9]) with mapi id 15.20.5880.019; Mon, 12 Dec 2022 05:47:15 +0000 From: Yangtao Li To: jaegeuk@kernel.org, chao@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Yangtao Li 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> X-Mailer: git-send-email 2.35.1 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0021.apcprd02.prod.outlook.com (2603:1096:4:1f4::14) To SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5269:EE_|SEYPR06MB6035:EE_ X-MS-Office365-Filtering-Correlation-Id: e2e46bfe-64b5-4bab-b57f-08dadc0452cd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +C61zJVR9HKOXdlprZwxFDvHYXpg0hN4YAm5JYtAdOoTXUSdXymuUhwDsCkk6oV2uhhoH+yleJDyjx2pPZ53F2RZk/4akE7jYyPhLi6p7bNX6j7BW3Ok5+o7gbJxYma/GbXcB2N+S+dzLb0VpTr9WNtlET27YrV2IlNf3/zE9TOifLL7iNbZobawPY23Qx6sVaSi2vFOyt916/j9OH8UMwDGfmsI+Di/rOFBdzIW17cEf17uquxYJqMLKOq/NqQ/BvVgilKFB6T8+dlTxMeLXFLFH/TLbk7zs7tQNhAeDTZl0fosQEyb/A49dem9R0LWSwLEwZ1Td350t6iq5L3vkt26T1T+T+aAsJUVTL890kVFOJnU6SNUE2y/i/xamLMQJ18lwyK+I5O2pundZMhLEiTlvBKqprX7dzcADihpBjaAiKfGnlEG9oTYJVxhxkUiJOMQNccvoxSFV2lEV813atEIl5OSNFuqZR4DHv6rAaBedF6Z4DsYrFabC/RgUuKTY7Il2A2xqe7cFkASFj9wza1ggwch6bbjjNNk/jsn8n5bPbZbzUfa+imgzM8vQuHlWHRiTqaYgEJ00VOF9KMoIkWqLWqhWf0N17sHrT7QD3izQ96NqMY1xwRDT/3A3Xu3fxh59FaezVXoqLeZFUM8pwHIUeBE70ruHRPdCsol0B4TL5fcTWgcfavVIHU8YDIb X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR06MB5269.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(39860400002)(136003)(376002)(366004)(346002)(396003)(451199015)(38350700002)(83380400001)(38100700002)(66556008)(5660300002)(86362001)(66476007)(8936002)(66946007)(316002)(2906002)(8676002)(4326008)(107886003)(52116002)(6666004)(26005)(6506007)(6512007)(186003)(1076003)(478600001)(41300700001)(2616005)(6486002)(36756003);DIR:OUT;SFP:1102; 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Yangtao Li Reviewed-by: Chao Yu --- 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 */ =20 /* 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) =20 /* 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]); =20 @@ -180,6 +182,9 @@ void f2fs_update_iostat(struct f2fs_sb_info *sbi, struc= t inode *inode, spin_lock_irqsave(&sbi->iostat_lock, flags); sbi->rw_iostat[type] +=3D io_bytes; =20 + if (type =3D=3D FS_DISCARD_IO) + sbi->rw_iostat[FS_DISCARD]++; + if (type =3D=3D APP_BUFFERED_IO || type =3D=3D APP_DIRECT_IO) sbi->rw_iostat[APP_WRITE_IO] +=3D io_bytes; =20 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, =20 atomic_inc(&dcc->issued_discard); =20 - f2fs_update_iostat(sbi, NULL, FS_DISCARD, 1); + f2fs_update_iostat(sbi, NULL, FS_DISCARD_IO, len * F2FS_BLKSIZE); =20 lstart +=3D len; start +=3D len; --=20 2.25.1