Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d62e26b3 authored by Jens Axboe's avatar Jens Axboe
Browse files

block: pass in queue to inflight accounting 



No functional change in this patch, just in preparation for
basing the inflight mechanism on the queue in question.

Reviewed-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7f5562d5

block/bio.c

+8 −8
Original line number Diff line number Diff line
@@ -1736,29 +1736,29 @@ void bio_check_pages_dirty(struct bio *bio) 
	}

}



void generic_start_io_acct(int rw, unsigned long sectors,

			   struct hd_struct *part)

void generic_start_io_acct(struct request_queue *q, int rw,

			   unsigned long sectors, struct hd_struct *part)

{

	int cpu = part_stat_lock();



	part_round_stats(cpu, part);

	part_round_stats(q, cpu, part);

	part_stat_inc(cpu, part, ios[rw]);

	part_stat_add(cpu, part, sectors[rw], sectors);

	part_inc_in_flight(part, rw);

	part_inc_in_flight(q, part, rw);



	part_stat_unlock();

}

EXPORT_SYMBOL(generic_start_io_acct);



void generic_end_io_acct(int rw, struct hd_struct *part,

			 unsigned long start_time)

void generic_end_io_acct(struct request_queue *q, int rw,

			 struct hd_struct *part, unsigned long start_time)

{

	unsigned long duration = jiffies - start_time;

	int cpu = part_stat_lock();



	part_stat_add(cpu, part, ticks[rw], duration);

	part_round_stats(cpu, part);

	part_dec_in_flight(part, rw);

	part_round_stats(q, cpu, part);

	part_dec_in_flight(q, part, rw);



	part_stat_unlock();

}

block/blk-core.c

+12 −10
Original line number Diff line number Diff line
@@ -1469,15 +1469,15 @@ static void add_acct_request(struct request_queue *q, struct request *rq, 
	__elv_add_request(q, rq, where);

}



static void part_round_stats_single(int cpu, struct hd_struct *part,

				    unsigned long now)

static void part_round_stats_single(struct request_queue *q, int cpu,

				    struct hd_struct *part, unsigned long now)

{

	int inflight;



	if (now == part->stamp)

		return;



	inflight = part_in_flight(part);

	inflight = part_in_flight(q, part);

	if (inflight) {

		__part_stat_add(cpu, part, time_in_queue,

				inflight * (now - part->stamp));
@@ -1488,6 +1488,7 @@ static void part_round_stats_single(int cpu, struct hd_struct *part, 


/**

 * part_round_stats() - Round off the performance stats on a struct disk_stats.

 * @q: target block queue

 * @cpu: cpu number for stats access

 * @part: target partition

 *
@@ -1502,13 +1503,14 @@ static void part_round_stats_single(int cpu, struct hd_struct *part, 
 * /proc/diskstats.  This accounts immediately for all queue usage up to

 * the current jiffies and restarts the counters again.

 */

void part_round_stats(int cpu, struct hd_struct *part)

void part_round_stats(struct request_queue *q, int cpu, struct hd_struct *part)

{

	unsigned long now = jiffies;



	if (part->partno)

		part_round_stats_single(cpu, &part_to_disk(part)->part0, now);

	part_round_stats_single(cpu, part, now);

		part_round_stats_single(q, cpu, &part_to_disk(part)->part0,

						now);

	part_round_stats_single(q, cpu, part, now);

}

EXPORT_SYMBOL_GPL(part_round_stats);
@@ -2431,8 +2433,8 @@ void blk_account_io_done(struct request *req) 


		part_stat_inc(cpu, part, ios[rw]);

		part_stat_add(cpu, part, ticks[rw], duration);

		part_round_stats(cpu, part);

		part_dec_in_flight(part, rw);

		part_round_stats(req->q, cpu, part);

		part_dec_in_flight(req->q, part, rw);



		hd_struct_put(part);

		part_stat_unlock();
@@ -2489,8 +2491,8 @@ void blk_account_io_start(struct request *rq, bool new_io) 
			part = &rq->rq_disk->part0;

			hd_struct_get(part);

		}

		part_round_stats(cpu, part);

		part_inc_in_flight(part, rw);

		part_round_stats(rq->q, cpu, part);

		part_inc_in_flight(rq->q, part, rw);

		rq->part = part;

	}

block/blk-merge.c

+2 −2
Original line number Diff line number Diff line
@@ -633,8 +633,8 @@ static void blk_account_io_merge(struct request *req) 
		cpu = part_stat_lock();

		part = req->part;



		part_round_stats(cpu, part);

		part_dec_in_flight(part, rq_data_dir(req));

		part_round_stats(req->q, cpu, part);

		part_dec_in_flight(req->q, part, rq_data_dir(req));



		hd_struct_put(part);

		part_stat_unlock();

block/genhd.c

+2 −2
Original line number Diff line number Diff line
@@ -1217,7 +1217,7 @@ static int diskstats_show(struct seq_file *seqf, void *v) 
	disk_part_iter_init(&piter, gp, DISK_PITER_INCL_EMPTY_PART0);

	while ((hd = disk_part_iter_next(&piter))) {

		cpu = part_stat_lock();

		part_round_stats(cpu, hd);

		part_round_stats(gp->queue, cpu, hd);

		part_stat_unlock();

		seq_printf(seqf, "%4d %7d %s %lu %lu %lu "

			   "%u %lu %lu %lu %u %u %u %u\n",
@@ -1231,7 +1231,7 @@ static int diskstats_show(struct seq_file *seqf, void *v) 
			   part_stat_read(hd, merges[WRITE]),

			   part_stat_read(hd, sectors[WRITE]),

			   jiffies_to_msecs(part_stat_read(hd, ticks[WRITE])),

			   part_in_flight(hd),

			   part_in_flight(gp->queue, hd),

			   jiffies_to_msecs(part_stat_read(hd, io_ticks)),

			   jiffies_to_msecs(part_stat_read(hd, time_in_queue))

			);

block/partition-generic.c

+3 −2
Original line number Diff line number Diff line
@@ -112,10 +112,11 @@ ssize_t part_stat_show(struct device *dev, 
		       struct device_attribute *attr, char *buf)

{

	struct hd_struct *p = dev_to_part(dev);

	struct request_queue *q = dev_to_disk(dev)->queue;

	int cpu;



	cpu = part_stat_lock();

	part_round_stats(cpu, p);

	part_round_stats(q, cpu, p);

	part_stat_unlock();

	return sprintf(buf,

		"%8lu %8lu %8llu %8u "
@@ -130,7 +131,7 @@ ssize_t part_stat_show(struct device *dev, 
		part_stat_read(p, merges[WRITE]),

		(unsigned long long)part_stat_read(p, sectors[WRITE]),

		jiffies_to_msecs(part_stat_read(p, ticks[WRITE])),

		part_in_flight(p),

		part_in_flight(q, p),

		jiffies_to_msecs(part_stat_read(p, io_ticks)),

		jiffies_to_msecs(part_stat_read(p, time_in_queue)));

}