diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c
index 0529e94a20f7f54f7bb8019a5cefdc0d53d69114..ae6ae7f50c6f740dbc5509ce144f620f33e8d1db 100644
--- a/block/blk-iolatency.c
+++ b/block/blk-iolatency.c
@@ -563,7 +563,7 @@ static void blkcg_iolatency_done_bio(struct rq_qos *rqos, struct bio *bio)
 	int inflight = 0;
 
 	blkg = bio->bi_blkg;
-	if (!blkg)
+	if (!blkg || !bio_flagged(bio, BIO_TRACKED))
 		return;
 
 	iolat = blkg_to_lat(bio->bi_blkg);
diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
index 43bcd4e7a7f9ae5da1fa005b5bca0110e7be9aa9..d1eaa118ce3098f903c54cea75fcb6e2e0eb62d5 100644
--- a/block/blk-rq-qos.c
+++ b/block/blk-rq-qos.c
@@ -72,6 +72,12 @@ void rq_qos_throttle(struct request_queue *q, struct bio *bio,
 {
 	struct rq_qos *rqos;
 
+	/*
+	 * BIO_TRACKED lets controllers know that a bio went through the
+	 * normal rq_qos path.
+	 */
+	bio_set_flag(bio, BIO_TRACKED);
+
 	for(rqos = q->rq_qos; rqos; rqos = rqos->next) {
 		if (rqos->ops->throttle)
 			rqos->ops->throttle(rqos, bio, lock);
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index c07caa2a284292e372e173a94bccfed602cab2b3..8075b9955bb3cfd00132a618afe5d87ad46d718b 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -233,6 +233,7 @@ struct bio {
 #define BIO_TRACE_COMPLETION 10	/* bio_endio() should trace the final completion
 				 * of this bio. */
 #define BIO_QUEUE_ENTERED 11	/* can use blk_queue_enter_live() */
+#define BIO_TRACKED 12		/* set if bio goes through the rq_qos path */
 
 /* See BVEC_POOL_OFFSET below before adding new flags */