block: Add and use op_stat_group() for indexing disk_stat fields.

Add and use a new op_stat_group() function for indexing partition stat
fields rather than indexing them by rq_data_dir() or bio_data_dir().
This function works similarly to op_is_sync() in that it takes the
request::cmd_flags or bio::bi_opf flags and determines which stats
should et updated.

In addition, the second parameter to generic_start_io_acct() and
generic_end_io_acct() is now a REQ_OP rather than simply a read or
write bit and it uses op_stat_group() on the parameter to determine
the stat group.

Note that the partition in_flight counts are not part of the per-cpu
statistics and as such are not indexed via this function.  It's now
indexed by op_is_write().

tj: Refreshed on top of v4.17.  Updated to pass around REQ_OP.

Signed-off-by: Michael Callahan <michaelcallahan@fb.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Joshua Morris <josh.h.morris@us.ibm.com>
Cc: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Matias Bjorling <mb@lightnvm.io>
Cc: Kent Overstreet <kent.overstreet@gmail.com>
Cc: Alasdair Kergon <agk@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 6 insertions, 6 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index c4b57d8806fe..03a4ea93a5f3 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2702,13 +2702,13 @@ EXPORT_SYMBOL_GPL(blk_rq_err_bytes);
 void blk_account_io_completion(struct request *req, unsigned int bytes)
 {
         if (blk_do_io_stat(req)) {
-                const int rw = rq_data_dir(req);
+                const int sgrp = op_stat_group(req_op(req));
                 struct hd_struct *part;
                 int cpu;
 
                 cpu = part_stat_lock();
                 part = req->part;
-                part_stat_add(cpu, part, sectors[rw], bytes >> 9);
+                part_stat_add(cpu, part, sectors[sgrp], bytes >> 9);
                 part_stat_unlock();
         }
 }
@@ -2722,7 +2722,7 @@ void blk_account_io_done(struct request *req, u64 now)
          */
         if (blk_do_io_stat(req) && !(req->rq_flags & RQF_FLUSH_SEQ)) {
                 unsigned long duration;
-                const int rw = rq_data_dir(req);
+                const int sgrp = op_stat_group(req_op(req));
                 struct hd_struct *part;
                 int cpu;
 
@@ -2730,10 +2730,10 @@ void blk_account_io_done(struct request *req, u64 now)
                 cpu = part_stat_lock();
                 part = req->part;
 
-                part_stat_inc(cpu, part, ios[rw]);
-                part_stat_add(cpu, part, ticks[rw], duration);
+                part_stat_inc(cpu, part, ios[sgrp]);
+                part_stat_add(cpu, part, ticks[sgrp], duration);
                 part_round_stats(req->q, cpu, part);
-                part_dec_in_flight(req->q, part, rw);
+                part_dec_in_flight(req->q, part, rq_data_dir(req));
 
                 hd_struct_put(part);
                 part_stat_unlock();