Commit 528ec5ab authored by Mike Christie's avatar Mike Christie Committed by Jens Axboe
Browse files

dm: pass dm stats data dir instead of bi_rw 



It looks like dm stats cares about the data direction
(READ vs WRITE) and does not need the bio/request flags.
Commands like REQ_FLUSH, REQ_DISCARD and REQ_WRITE_SAME
are currently always set with REQ_WRITE, so the extra check for
REQ_DISCARD in dm_stats_account_io is not needed.

This patch has it use the bio and request data_dir helpers
instead of accessing the bi_rw/cmd_flags directly. This makes
the next patches that remove the operation from the cmd_flags
and bi_rw easier, because we will no longer have the REQ_WRITE
bit set for operations like discards.

Signed-off-by: default avatarMike Christie <mchristi@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 162b99e3

drivers/md/dm-stats.c

+4 −5
Original line number Diff line number Diff line
@@ -514,11 +514,10 @@ static void dm_stat_round(struct dm_stat *s, struct dm_stat_shared *shared, 
}



static void dm_stat_for_entry(struct dm_stat *s, size_t entry,

			      unsigned long bi_rw, sector_t len,

			      int idx, sector_t len,

			      struct dm_stats_aux *stats_aux, bool end,

			      unsigned long duration_jiffies)

{

	unsigned long idx = bi_rw & REQ_WRITE;

	struct dm_stat_shared *shared = &s->stat_shared[entry];

	struct dm_stat_percpu *p;
@@ -584,7 +583,7 @@ static void dm_stat_for_entry(struct dm_stat *s, size_t entry, 
#endif

}



static void __dm_stat_bio(struct dm_stat *s, unsigned long bi_rw,

static void __dm_stat_bio(struct dm_stat *s, int bi_rw,

			  sector_t bi_sector, sector_t end_sector,

			  bool end, unsigned long duration_jiffies,

			  struct dm_stats_aux *stats_aux)
@@ -645,8 +644,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw, 
		last = raw_cpu_ptr(stats->last);

		stats_aux->merged =

			(bi_sector == (ACCESS_ONCE(last->last_sector) &&

				       ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==

					(ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))

				       ((bi_rw == WRITE) ==

					(ACCESS_ONCE(last->last_rw) == WRITE))

				       ));

		ACCESS_ONCE(last->last_sector) = end_sector;

		ACCESS_ONCE(last->last_rw) = bi_rw;

drivers/md/dm.c

+12 −9
Original line number Diff line number Diff line
@@ -723,8 +723,9 @@ static void start_io_acct(struct dm_io *io) 
		atomic_inc_return(&md->pending[rw]));



	if (unlikely(dm_stats_used(&md->stats)))

		dm_stats_account_io(&md->stats, bio->bi_rw, bio->bi_iter.bi_sector,

				    bio_sectors(bio), false, 0, &io->stats_aux);

		dm_stats_account_io(&md->stats, bio_data_dir(bio),

				    bio->bi_iter.bi_sector, bio_sectors(bio),

				    false, 0, &io->stats_aux);

}



static void end_io_acct(struct dm_io *io)
@@ -738,8 +739,9 @@ static void end_io_acct(struct dm_io *io) 
	generic_end_io_acct(rw, &dm_disk(md)->part0, io->start_time);



	if (unlikely(dm_stats_used(&md->stats)))

		dm_stats_account_io(&md->stats, bio->bi_rw, bio->bi_iter.bi_sector,

				    bio_sectors(bio), true, duration, &io->stats_aux);

		dm_stats_account_io(&md->stats, bio_data_dir(bio),

				    bio->bi_iter.bi_sector, bio_sectors(bio),

				    true, duration, &io->stats_aux);



	/*

	 * After this is decremented the bio must not be touched if it is
@@ -1121,9 +1123,9 @@ static void rq_end_stats(struct mapped_device *md, struct request *orig) 
	if (unlikely(dm_stats_used(&md->stats))) {

		struct dm_rq_target_io *tio = tio_from_request(orig);

		tio->duration_jiffies = jiffies - tio->duration_jiffies;

		dm_stats_account_io(&md->stats, orig->cmd_flags, blk_rq_pos(orig),

				    tio->n_sectors, true, tio->duration_jiffies,

				    &tio->stats_aux);

		dm_stats_account_io(&md->stats, rq_data_dir(orig),

				    blk_rq_pos(orig), tio->n_sectors, true,

				    tio->duration_jiffies, &tio->stats_aux);

	}

}
@@ -2082,8 +2084,9 @@ static void dm_start_request(struct mapped_device *md, struct request *orig) 
		struct dm_rq_target_io *tio = tio_from_request(orig);

		tio->duration_jiffies = jiffies;

		tio->n_sectors = blk_rq_sectors(orig);

		dm_stats_account_io(&md->stats, orig->cmd_flags, blk_rq_pos(orig),

				    tio->n_sectors, false, 0, &tio->stats_aux);

		dm_stats_account_io(&md->stats, rq_data_dir(orig),

				    blk_rq_pos(orig), tio->n_sectors, false, 0,

				    &tio->stats_aux);

	}



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE