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 3/4] f2fs: introduce IOSTAT_INFO_SHOW macro
Date:   Wed,  4 Jan 2023 19:21:57 +0800
Message-Id: <20230104112158.15844-3-frank.li@vivo.com>
In-Reply-To: <20230104112158.15844-1-frank.li@vivo.com>
References: <20230104112158.15844-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?SOAbJv/ln+AkRoYmVHoZc07fYN+0F10Jfupb8uLfSz9kz8NkzfeZUz2T/jiF?=
 =?us-ascii?Q?/YodQ9Li+Lvinibt+MsmaoZytZLz2HEXB/T4TctDLGnuA4Cv4eDw0f7ANqoE?=
 =?us-ascii?Q?4N4tt1HIUIcItXx/p48CVgqggRnLMPIv7FfN2N5tbeGLUCquZlMwAqGxe5Ph?=
 =?us-ascii?Q?txxT2K1wVZPNWxN5TiVxjRxZIt+qy2mAlyEWe2Ptw3/oOFrSa4AzkKeB5cgH?=
 =?us-ascii?Q?mOCCBSZfv1aABlTuRUlu15pmIffQVfw/k8bKvKOZj7ayBf08PV3nmvPou8Fg?=
 =?us-ascii?Q?OehhXGrg0ase5l1BWSRX6MAmIr8E24WoqJVSHsEyiW+GJuqD5j2F4FOQCa9s?=
 =?us-ascii?Q?+AhU+gzqb9xct6qCe1E2UflwfTLESEJwpc77gMPUB4II8n+KgTiQUKnMztr/?=
 =?us-ascii?Q?rG036im9f9X8ASls3/Yt6Se/+0nEpZxvhU2HIL6K25F+Onyva7cJof4PnUh2?=
 =?us-ascii?Q?Et7GaYL/CRS65BrjDO/3QCZlZtGEw9poxvqTzxvjoiZqghuA9XgEHT0a9DL0?=
 =?us-ascii?Q?qmVOpBvX2H2b0e3z+htF31Qv56WnsmftyC719DB/730BcdmUjzzsfhBUSww8?=
 =?us-ascii?Q?tAiKo47y8+f2GXpRtW5hkUhpo5ohSiSTmmY+kn/U6dsBQ/XwntbTcZm2FpvC?=
 =?us-ascii?Q?h+woOXZl45QeIKwWJlKjnWnkTdpxjpLKpVjbxSMdRjNWXdSaRZtO5aqC8uJD?=
 =?us-ascii?Q?HWFZv+Y5QyUOLjLb+TcJYI9r6cUTlMRKXEbu++89nPztwtcKCTDmfEtG64vW?=
 =?us-ascii?Q?3hnK3iXjMobomGePdEmenkCgenNkrtXlnCgJh3rS+3g1ZK/AejwGHAseoJVn?=
 =?us-ascii?Q?RZ8dSG7xwZGXCfsN0ZeptSM2OlxYB7/SANC/+0xf0amkGObM1LU0yUCKb2bC?=
 =?us-ascii?Q?//AAby9Bso1R1zHRb8Pu4KRVDnOnFm3CPlY2KYOlxoQ2msXo8l+bZgdtLdDj?=
 =?us-ascii?Q?DlQWv35KnMwMUYNu9Jdwye5Q/uTBIH7KfUNbEGAtA2saCOPgLKWRVVnDK7Oo?=
 =?us-ascii?Q?r4pil4pbZMmbd5HBFyejqNwiDWIm00s5slAAzQFRYYm9fqN6+bau1czBgsp2?=
 =?us-ascii?Q?U7zTSfbkRVmbm0SR3FkzUPQkn29duYOr5xg14jSzBjOczq8/Xoo+MbDiaeem?=
 =?us-ascii?Q?jEu9ce4SUGIuZTMwC953w5qyrrZKpV5WhQtX0mhuzqOnowpyyyInvNE3XTDt?=
 =?us-ascii?Q?ohdBLpyLy3GEXgZXuH7vwFTtPHpO772wWUsfGNsSdTsg4FQFAKVA3SPGoz6l?=
 =?us-ascii?Q?ZGc1m9rRNg6H2isZBYPu14dESSgXI0QJT/E/8GUBsGjB1V9QEUTdJ/50hhUx?=
 =?us-ascii?Q?Bu7oT2ucH9gD4j2h1iSo6g79kyyhpXTbQYkEUPSXfgzM+t+Hr8GvsaPRnmd8?=
 =?us-ascii?Q?q5ieW0LSwX+ClPpmg8WDHqhq7DbjD+YpUYvPdpaDXuzCM8rMvM5Arxt4VtPX?=
 =?us-ascii?Q?Un5TpiXuV7Qw5CwtmYOKpLT8PKcP2B5BpVDji3nHrRSGPmvr06JE4J6+EHPi?=
 =?us-ascii?Q?cJL96DWgHZEdFN6TaF8/9jX3HMNi5trfi4HLRvv9PCaH5yMXXfoLMTdGBK1M?=
 =?us-ascii?Q?5kl5eCpZX2psDS3Wnd6NhMn1MlZsQKYTy858I+uK?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8976b458-83e1-40d5-3174-08daee45f1ec
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2023 11:22:20.6851
 (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: n/uB6MbSkSSb+vMtiX6pF7kIVCcPr1Ewp2NvgPg5txCVtn5MYqrRSBgMZfBxJGcL3r06f+5eZRuJBRUkP8l6Hw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB5844
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

Define IOSTAT_INFO_SHOW macro and use it to simplify code.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/iostat.c | 136 +++++++++++------------------------------------
 1 file changed, 32 insertions(+), 104 deletions(-)

diff --git a/fs/f2fs/iostat.c b/fs/f2fs/iostat.c
index e7d03c446994..991605fcfe0b 100644
--- a/fs/f2fs/iostat.c
+++ b/fs/f2fs/iostat.c
@@ -25,6 +25,12 @@ static inline unsigned long long iostat_get_avg_bytes(struct f2fs_sb_info *sbi,
 		sbi->iostat_count[type]) : 0;
 }
 
+#define IOSTAT_INFO_SHOW(name, type)					\
+	seq_printf(seq, "%-23s %-16llu %-16llu %-16llu\n",	\
+			name":", sbi->rw_iostat[type],				\
+			sbi->iostat_count[type],					\
+			iostat_get_avg_bytes(sbi, type))			\
+
 int __maybe_unused iostat_info_seq_show(struct seq_file *seq, void *offset)
 {
 	struct super_block *sb = seq->private;
@@ -39,120 +45,42 @@ int __maybe_unused iostat_info_seq_show(struct seq_file *seq, void *offset)
 
 	/* print app write IOs */
 	seq_puts(seq, "[WRITE]\n");
-	seq_printf(seq, "app buffered data:	%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[APP_BUFFERED_IO],
-				sbi->iostat_count[APP_BUFFERED_IO],
-				iostat_get_avg_bytes(sbi, APP_BUFFERED_IO));
-	seq_printf(seq, "app direct data:	%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[APP_DIRECT_IO],
-				sbi->iostat_count[APP_DIRECT_IO],
-				iostat_get_avg_bytes(sbi, APP_DIRECT_IO));
-	seq_printf(seq, "app mapped data:	%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[APP_MAPPED_IO],
-				sbi->iostat_count[APP_MAPPED_IO],
-				iostat_get_avg_bytes(sbi, APP_MAPPED_IO));
-	seq_printf(seq, "app buffered cdata:	%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[APP_BUFFERED_CDATA_IO],
-				sbi->iostat_count[APP_BUFFERED_CDATA_IO],
-				iostat_get_avg_bytes(sbi, APP_BUFFERED_CDATA_IO));
-	seq_printf(seq, "app mapped cdata:	%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[APP_MAPPED_CDATA_IO],
-				sbi->iostat_count[APP_MAPPED_CDATA_IO],
-				iostat_get_avg_bytes(sbi, APP_MAPPED_CDATA_IO));
+	IOSTAT_INFO_SHOW("app buffered data", APP_BUFFERED_IO);
+	IOSTAT_INFO_SHOW("app direct data", APP_DIRECT_IO);
+	IOSTAT_INFO_SHOW("app mapped data", APP_MAPPED_IO);
+	IOSTAT_INFO_SHOW("app buffered cdata", APP_BUFFERED_CDATA_IO);
+	IOSTAT_INFO_SHOW("app mapped cdata", APP_MAPPED_CDATA_IO);
 
 	/* print fs write IOs */
-	seq_printf(seq, "fs data:		%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[FS_DATA_IO],
-				sbi->iostat_count[FS_DATA_IO],
-				iostat_get_avg_bytes(sbi, FS_DATA_IO));
-	seq_printf(seq, "fs cdata:		%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[FS_CDATA_IO],
-				sbi->iostat_count[FS_CDATA_IO],
-				iostat_get_avg_bytes(sbi, FS_CDATA_IO));
-	seq_printf(seq, "fs node:		%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[FS_NODE_IO],
-				sbi->iostat_count[FS_NODE_IO],
-				iostat_get_avg_bytes(sbi, FS_NODE_IO));
-	seq_printf(seq, "fs meta:		%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[FS_META_IO],
-				sbi->iostat_count[FS_META_IO],
-				iostat_get_avg_bytes(sbi, FS_META_IO));
-	seq_printf(seq, "fs gc data:		%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[FS_GC_DATA_IO],
-				sbi->iostat_count[FS_GC_DATA_IO],
-				iostat_get_avg_bytes(sbi, FS_GC_DATA_IO));
-	seq_printf(seq, "fs gc node:		%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[FS_GC_NODE_IO],
-				sbi->iostat_count[FS_GC_NODE_IO],
-				iostat_get_avg_bytes(sbi, FS_GC_NODE_IO));
-	seq_printf(seq, "fs cp data:		%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[FS_CP_DATA_IO],
-				sbi->iostat_count[FS_CP_DATA_IO],
-				iostat_get_avg_bytes(sbi, FS_CP_DATA_IO));
-	seq_printf(seq, "fs cp node:		%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[FS_CP_NODE_IO],
-				sbi->iostat_count[FS_CP_NODE_IO],
-				iostat_get_avg_bytes(sbi, FS_CP_NODE_IO));
-	seq_printf(seq, "fs cp meta:		%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[FS_CP_META_IO],
-				sbi->iostat_count[FS_CP_META_IO],
-				iostat_get_avg_bytes(sbi, FS_CP_META_IO));
+	IOSTAT_INFO_SHOW("fs data", FS_DATA_IO);
+	IOSTAT_INFO_SHOW("fs cdata", FS_CDATA_IO);
+	IOSTAT_INFO_SHOW("fs node", FS_NODE_IO);
+	IOSTAT_INFO_SHOW("fs meta", FS_META_IO);
+	IOSTAT_INFO_SHOW("fs gc data", FS_GC_DATA_IO);
+	IOSTAT_INFO_SHOW("fs gc node", FS_GC_NODE_IO);
+	IOSTAT_INFO_SHOW("fs cp data", FS_CP_DATA_IO);
+	IOSTAT_INFO_SHOW("fs cp node", FS_CP_NODE_IO);
+	IOSTAT_INFO_SHOW("fs cp meta", FS_CP_META_IO);
 
 	/* print app read IOs */
 	seq_puts(seq, "[READ]\n");
-	seq_printf(seq, "app buffered data:	%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[APP_BUFFERED_READ_IO],
-				sbi->iostat_count[APP_BUFFERED_READ_IO],
-				iostat_get_avg_bytes(sbi, APP_BUFFERED_READ_IO));
-	seq_printf(seq, "app direct data:	%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[APP_DIRECT_READ_IO],
-				sbi->iostat_count[APP_DIRECT_READ_IO],
-				iostat_get_avg_bytes(sbi, APP_DIRECT_READ_IO));
-	seq_printf(seq, "app mapped data:	%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[APP_MAPPED_READ_IO],
-				sbi->iostat_count[APP_MAPPED_READ_IO],
-				iostat_get_avg_bytes(sbi, APP_MAPPED_READ_IO));
-	seq_printf(seq, "app buffered cdata:	%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[APP_BUFFERED_CDATA_READ_IO],
-				sbi->iostat_count[APP_BUFFERED_CDATA_READ_IO],
-				iostat_get_avg_bytes(sbi, APP_BUFFERED_CDATA_READ_IO));
-	seq_printf(seq, "app mapped cdata:	%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[APP_MAPPED_CDATA_READ_IO],
-				sbi->iostat_count[APP_MAPPED_CDATA_READ_IO],
-				iostat_get_avg_bytes(sbi, APP_MAPPED_CDATA_READ_IO));
+	IOSTAT_INFO_SHOW("app buffered data", APP_BUFFERED_READ_IO);
+	IOSTAT_INFO_SHOW("app direct data", APP_DIRECT_READ_IO);
+	IOSTAT_INFO_SHOW("app mapped data", APP_MAPPED_READ_IO);
+	IOSTAT_INFO_SHOW("app buffered cdata", APP_BUFFERED_CDATA_READ_IO);
+	IOSTAT_INFO_SHOW("app mapped cdata", APP_MAPPED_CDATA_READ_IO);
 
 	/* print fs read IOs */
-	seq_printf(seq, "fs data:		%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[FS_DATA_READ_IO],
-				sbi->iostat_count[FS_DATA_READ_IO],
-				iostat_get_avg_bytes(sbi, FS_DATA_READ_IO));
-	seq_printf(seq, "fs gc data:		%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[FS_GDATA_READ_IO],
-				sbi->iostat_count[FS_GDATA_READ_IO],
-				iostat_get_avg_bytes(sbi, FS_GDATA_READ_IO));
-	seq_printf(seq, "fs cdata:		%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[FS_CDATA_READ_IO],
-				sbi->iostat_count[FS_CDATA_READ_IO],
-				iostat_get_avg_bytes(sbi, FS_CDATA_READ_IO));
-	seq_printf(seq, "fs node:		%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[FS_NODE_READ_IO],
-				sbi->iostat_count[FS_NODE_READ_IO],
-				iostat_get_avg_bytes(sbi, FS_NODE_READ_IO));
-	seq_printf(seq, "fs meta:		%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[FS_META_READ_IO],
-				sbi->iostat_count[FS_META_READ_IO],
-				iostat_get_avg_bytes(sbi, FS_META_READ_IO));
+	IOSTAT_INFO_SHOW("fs data", FS_DATA_READ_IO);
+	IOSTAT_INFO_SHOW("fs gc data", FS_GDATA_READ_IO);
+	IOSTAT_INFO_SHOW("fs cdata", FS_CDATA_READ_IO);
+	IOSTAT_INFO_SHOW("fs node", FS_NODE_READ_IO);
+	IOSTAT_INFO_SHOW("fs meta", FS_META_READ_IO);
 
 	/* print other IOs */
 	seq_puts(seq, "[OTHER]\n");
-	seq_printf(seq, "fs discard:		%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[FS_DISCARD],
-				sbi->iostat_count[FS_DISCARD],
-				iostat_get_avg_bytes(sbi, FS_DISCARD));
-	seq_printf(seq, "fs flush:		%-16llu %-16llu %-16llu\n",
-				sbi->rw_iostat[FS_FLUSH],
-				sbi->iostat_count[FS_FLUSH],
-				iostat_get_avg_bytes(sbi, FS_FLUSH));
+	IOSTAT_INFO_SHOW("fs discard", FS_DISCARD);
+	IOSTAT_INFO_SHOW("fs flush", FS_FLUSH);
 
 	return 0;
 }
-- 
2.25.1