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>,
        kernel test robot <lkp@intel.com>,
        Dan Carpenter <error27@gmail.com>
Subject: [PATCH v3 2/2] f2fs: use iostat_lat_type directly as a parameter in the iostat_update_and_unbind_ctx()
Date:   Sat, 21 Jan 2023 00:16:56 +0800
Message-Id: <20230120161656.70308-2-frank.li@vivo.com>
In-Reply-To: <20230120161656.70308-1-frank.li@vivo.com>
References: <20230120161656.70308-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?6zD0JJcL9OIH7d7Prtn8YnyeW512UCMLPBT9Olnm3LT2iNVSEsduLsqenk/9?=
 =?us-ascii?Q?JtZIKbryNweNqEOG54QGD/ij9R7JNVOd3gSqOjsWl2XktekfmL2Hbx1d2Pdl?=
 =?us-ascii?Q?XRl6HAJWh14OcbUxch+Q0PMitUCTJ1Tvffd1cJklvEePOkrXvrMwJKTr3Oqn?=
 =?us-ascii?Q?6KYnZYvRC4drvqZIZXpSZAIKe+bJKebZcFeRkYaxEBQa0DtaA0/ZNZ4XGenX?=
 =?us-ascii?Q?pDYVlYX8dUJad5b0ui++D5OLtdppn7U6YD9vgg2Gmu/L98UZh28nC5CL+vUh?=
 =?us-ascii?Q?oufrIOpXnej1GwZiLMWpzphoaMRfGq373VHFp1t6Bh9p3wRkZq7elfw89LHj?=
 =?us-ascii?Q?75GdRSqDJP+I+vrvjXiD6hY0Sh7stXaHF3OWFhg/z7GeWDKlBdeDKQcYKPmP?=
 =?us-ascii?Q?SVidrvEL3nMNmqMUWq8Pn8lNmHYN1HR3sVSUYxUsisNS69QIUDF061d+TYHo?=
 =?us-ascii?Q?13w8hkIM+sbBgwFP53STaxCWt6dn+JP7qbf3zJs6f3ekqZaUOkfbVUzHlf+Q?=
 =?us-ascii?Q?aJVnvTj6SE9rXqzFr6lKovYseaVeIdX6cA6GtBa12K7aVsn75P8POs5Zn+JS?=
 =?us-ascii?Q?J+OeII8Fds4dIAjErf+07ROzDgpRIc+IGaslANGsHw8J4ycY1hwoHBNpH7hD?=
 =?us-ascii?Q?+MH0AHqnK7zCi39ZKu2P6OCqxD7qsCFcQeoW7bDNPt3jvVCKX+G+pHjjQLfK?=
 =?us-ascii?Q?TveaUwcCPY2bOm69lJ/MuyGZaNit/VQ8Ldp++g8ceQ9+m/kfOyNMlfckSpIr?=
 =?us-ascii?Q?nXE45s25SJPLNTbzCZD3cXg972ztI7HBDKaHoHPsMRl6IXBmY5BtLZkV160e?=
 =?us-ascii?Q?TEkb20uWAZFt2nBNXkN77MBAer+iSp5OaAqR+IEoG83KD4WPqYzKhFFFC3i7?=
 =?us-ascii?Q?QkM4XEXMnfG20TeC2XKkO4OyCc1l+mpN1D9mZ5/jRpoZKT/Qk92IJWy/Hnce?=
 =?us-ascii?Q?2NJD41c08xD/nIGl42GCt9xUgqcuVmMoW8QZReIJaksY44FdEctBPu0kMGoH?=
 =?us-ascii?Q?Gl79xArViwzDWmMGgPSTlCU6hHFwOzwvRAW+DxP5v3p0+e4Gv4hmPV+m0XMh?=
 =?us-ascii?Q?28t6/M3NvUPPxV9Lwut1x3SiO5MAPP06ZL5LS+U1LXezr5TUInLqA9vj8rII?=
 =?us-ascii?Q?FuiWFrxZ99d3pmO8Mex7hv6RARDjyrnUNRrfuqdlrzFsXTROQK2Z4Rq5uQkZ?=
 =?us-ascii?Q?oexmdsB1rhmwJ+8fp2JKL12ypRsv3xrTfLoYamKrX757193ckcJh28jV78pL?=
 =?us-ascii?Q?OARa3WEfmOfsxmFBm2REWbV0FwhLtXUMu/GhKMC02Y7lfdap3NCAHzu4P7uy?=
 =?us-ascii?Q?5ETLwM/OJwtT3+LZ0ENTzThLFURb8wEDrQW3YEtqokn3D06AR7wgA82UdMVl?=
 =?us-ascii?Q?xI71AbFSXYQMSSYU+g8Ro6SlHPBdYewvMRV28P3biqHKDfV0FDWJuN8hE1Xk?=
 =?us-ascii?Q?Rqp5MWEFzVWK84rBneTAfzfadjjnd1BMNK9lrKBP3iNdCJfiKKV3wYlG+8vL?=
 =?us-ascii?Q?1O3mpOyK+QIPhHUYUD0WA31RIKFiWxMGnczl0Icp2838INoO+gu+rpFDEvGy?=
 =?us-ascii?Q?RdepLeXWT9cPSoVuyuZbkmgYUOMffwln1SZP1+an?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f2895943-8783-4bc6-0512-08dafb01c780
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 16:17:08.8035
 (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: TjE6VVfUZzPbHuuKvgwolwqyX2+WQr2MXOFYBxzV9IPZvbW8qAuxZBfPMNoMVR0K7QK+joeDN3yCkVq+6p30Fg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR06MB6233
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

Convert to use iostat_lat_type as parameter instead of raw number.
BTW, move NUM_PREALLOC_IOSTAT_CTXS to the header file, and rename
iotype to page_type to match the definition.

Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
v3:
-convert to f2fs_warn()
 fs/f2fs/data.c   |  4 ++--
 fs/f2fs/iostat.c | 39 ++++++++++++++++-----------------------
 fs/f2fs/iostat.h | 19 ++++++++++---------
 3 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 1645b8a1b904..710d4acde187 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -292,7 +292,7 @@ static void f2fs_read_end_io(struct bio *bio)
 	struct bio_post_read_ctx *ctx;
 	bool intask = in_task();
 
-	iostat_update_and_unbind_ctx(bio, 0);
+	iostat_update_and_unbind_ctx(bio, READ_IO);
 	ctx = bio->bi_private;
 
 	if (time_to_inject(sbi, FAULT_READ_IO))
@@ -330,7 +330,7 @@ static void f2fs_write_end_io(struct bio *bio)
 	struct bio_vec *bvec;
 	struct bvec_iter_all iter_all;
 
-	iostat_update_and_unbind_ctx(bio, 1);
+	iostat_update_and_unbind_ctx(bio, bio->bi_opf & REQ_SYNC ? WRITE_SYNC_IO : WRITE_ASYNC_IO);
 	sbi = bio->bi_private;
 
 	if (time_to_inject(sbi, FAULT_WRITE_IO))
diff --git a/fs/f2fs/iostat.c b/fs/f2fs/iostat.c
index 96637756eae8..c767a2e7d5a9 100644
--- a/fs/f2fs/iostat.c
+++ b/fs/f2fs/iostat.c
@@ -14,7 +14,6 @@
 #include "iostat.h"
 #include <trace/events/f2fs.h>
 
-#define NUM_PREALLOC_IOSTAT_CTXS	128
 static struct kmem_cache *bio_iostat_ctx_cache;
 static mempool_t *bio_iostat_ctx_pool;
 
@@ -210,53 +209,47 @@ void f2fs_update_iostat(struct f2fs_sb_info *sbi, struct inode *inode,
 }
 
 static inline void __update_iostat_latency(struct bio_iostat_ctx *iostat_ctx,
-				int rw, bool is_sync)
+				enum iostat_lat_type lat_type)
 {
 	unsigned long ts_diff;
-	unsigned int iotype = iostat_ctx->type;
+	unsigned int page_type = iostat_ctx->type;
 	struct f2fs_sb_info *sbi = iostat_ctx->sbi;
 	struct iostat_lat_info *io_lat = sbi->iostat_io_lat;
-	int idx;
 	unsigned long flags;
 
 	if (!sbi->iostat_enable)
 		return;
 
 	ts_diff = jiffies - iostat_ctx->submit_ts;
-	if (iotype == META_FLUSH) {
-		iotype = META;
-	} else if (iotype >= NR_PAGE_TYPE) {
-		f2fs_warn(sbi, "%s: %d over NR_PAGE_TYPE", __func__, iotype);
+	if (page_type == META_FLUSH) {
+		page_type = META;
+	} else if (page_type >= NR_PAGE_TYPE) {
+		f2fs_warn(sbi, "%s: %d over NR_PAGE_TYPE", __func__, page_type);
 		return;
 	}
 
-	if (rw == 0) {
-		idx = READ_IO;
-	} else {
-		if (is_sync)
-			idx = WRITE_SYNC_IO;
-		else
-			idx = WRITE_ASYNC_IO;
+	if (lat_type >= MAX_IO_TYPE) {
+		f2fs_warn(sbi, "%s: %d over MAX_IO_TYPE", __func__, lat_type);
+		return;
 	}
 
 	spin_lock_irqsave(&sbi->iostat_lat_lock, flags);
-	io_lat->sum_lat[idx][iotype] += ts_diff;
-	io_lat->bio_cnt[idx][iotype]++;
-	if (ts_diff > io_lat->peak_lat[idx][iotype])
-		io_lat->peak_lat[idx][iotype] = ts_diff;
+	io_lat->sum_lat[lat_type][page_type] += ts_diff;
+	io_lat->bio_cnt[lat_type][page_type]++;
+	if (ts_diff > io_lat->peak_lat[lat_type][page_type])
+		io_lat->peak_lat[lat_type][page_type] = ts_diff;
 	spin_unlock_irqrestore(&sbi->iostat_lat_lock, flags);
 }
 
-void iostat_update_and_unbind_ctx(struct bio *bio, int rw)
+void iostat_update_and_unbind_ctx(struct bio *bio, enum iostat_lat_type lat_type)
 {
 	struct bio_iostat_ctx *iostat_ctx = bio->bi_private;
-	bool is_sync = bio->bi_opf & REQ_SYNC;
 
-	if (rw == 0)
+	if (lat_type == READ_IO)
 		bio->bi_private = iostat_ctx->post_read_ctx;
 	else
 		bio->bi_private = iostat_ctx->sbi;
-	__update_iostat_latency(iostat_ctx, rw, is_sync);
+	__update_iostat_latency(iostat_ctx, lat_type);
 	mempool_free(iostat_ctx, bio_iostat_ctx_pool);
 }
 
diff --git a/fs/f2fs/iostat.h b/fs/f2fs/iostat.h
index 2c048307b6e0..1f827a2fe6b2 100644
--- a/fs/f2fs/iostat.h
+++ b/fs/f2fs/iostat.h
@@ -8,20 +8,21 @@
 
 struct bio_post_read_ctx;
 
+enum iostat_lat_type {
+	READ_IO = 0,
+	WRITE_SYNC_IO,
+	WRITE_ASYNC_IO,
+	MAX_IO_TYPE,
+};
+
 #ifdef CONFIG_F2FS_IOSTAT
 
+#define NUM_PREALLOC_IOSTAT_CTXS	128
 #define DEFAULT_IOSTAT_PERIOD_MS	3000
 #define MIN_IOSTAT_PERIOD_MS		100
 /* maximum period of iostat tracing is 1 day */
 #define MAX_IOSTAT_PERIOD_MS		8640000
 
-enum {
-	READ_IO,
-	WRITE_SYNC_IO,
-	WRITE_ASYNC_IO,
-	MAX_IO_TYPE,
-};
-
 struct iostat_lat_info {
 	unsigned long sum_lat[MAX_IO_TYPE][NR_PAGE_TYPE];	/* sum of io latencies */
 	unsigned long peak_lat[MAX_IO_TYPE][NR_PAGE_TYPE];	/* peak io latency */
@@ -57,7 +58,7 @@ static inline struct bio_post_read_ctx *get_post_read_ctx(struct bio *bio)
 	return iostat_ctx->post_read_ctx;
 }
 
-extern void iostat_update_and_unbind_ctx(struct bio *bio, int rw);
+extern void iostat_update_and_unbind_ctx(struct bio *bio, enum iostat_lat_type type);
 extern void iostat_alloc_and_bind_ctx(struct f2fs_sb_info *sbi,
 		struct bio *bio, struct bio_post_read_ctx *ctx);
 extern int f2fs_init_iostat_processing(void);
@@ -67,7 +68,7 @@ extern void f2fs_destroy_iostat(struct f2fs_sb_info *sbi);
 #else
 static inline void f2fs_update_iostat(struct f2fs_sb_info *sbi, struct inode *inode,
 		enum iostat_type type, unsigned long long io_bytes) {}
-static inline void iostat_update_and_unbind_ctx(struct bio *bio, int rw) {}
+static inline void iostat_update_and_unbind_ctx(struct bio *bio, enum iostat_lat_type type) {}
 static inline void iostat_alloc_and_bind_ctx(struct f2fs_sb_info *sbi,
 		struct bio *bio, struct bio_post_read_ctx *ctx) {}
 static inline void iostat_update_submit_ctx(struct bio *bio,
-- 
2.25.1