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

Commit 154b00d5 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

block: Split blk_pm_add_request() and blk_pm_put_request() 



Move the pm_request_resume() and pm_runtime_mark_last_busy() calls into
two new functions and thereby separate legacy block layer code from code
that works for both the legacy block layer and blk-mq. A later patch will
add calls to the new functions in the blk-mq code.

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Jianchao Wang <jianchao.w.wang@oracle.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent cd84a62e

block/blk-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1744,6 +1744,7 @@ void __blk_put_request(struct request_queue *q, struct request *req) 


	blk_req_zone_write_unlock(req);

	blk_pm_put_request(req);

	blk_pm_mark_last_busy(req);



	elv_completed_request(q, req);

block/blk-pm.h

+31 −5
Original line number Diff line number Diff line
@@ -6,8 +6,23 @@ 
#include <linux/pm_runtime.h>



#ifdef CONFIG_PM

static inline void blk_pm_request_resume(struct request_queue *q)

{

	if (q->dev && (q->rpm_status == RPM_SUSPENDED ||

		       q->rpm_status == RPM_SUSPENDING))

		pm_request_resume(q->dev);

}



static inline void blk_pm_mark_last_busy(struct request *rq)

{

	if (rq->q->dev && !(rq->rq_flags & RQF_PM))

		pm_runtime_mark_last_busy(rq->q->dev);

}



static inline void blk_pm_requeue_request(struct request *rq)

{

	lockdep_assert_held(rq->q->queue_lock);



	if (rq->q->dev && !(rq->rq_flags & RQF_PM))

		rq->q->nr_pending--;

}
@@ -15,17 +30,28 @@ static inline void blk_pm_requeue_request(struct request *rq) 
static inline void blk_pm_add_request(struct request_queue *q,

				      struct request *rq)

{

	if (q->dev && !(rq->rq_flags & RQF_PM) && q->nr_pending++ == 0 &&

	    (q->rpm_status == RPM_SUSPENDED || q->rpm_status == RPM_SUSPENDING))

		pm_request_resume(q->dev);

	lockdep_assert_held(q->queue_lock);



	if (q->dev && !(rq->rq_flags & RQF_PM))

		q->nr_pending++;

}



static inline void blk_pm_put_request(struct request *rq)

{

	if (rq->q->dev && !(rq->rq_flags & RQF_PM) && !--rq->q->nr_pending)

		pm_runtime_mark_last_busy(rq->q->dev);

	lockdep_assert_held(rq->q->queue_lock);



	if (rq->q->dev && !(rq->rq_flags & RQF_PM))

		--rq->q->nr_pending;

}

#else

static inline void blk_pm_request_resume(struct request_queue *q)

{

}



static inline void blk_pm_mark_last_busy(struct request *rq)

{

}



static inline void blk_pm_requeue_request(struct request *rq)

{

}

block/elevator.c

+1 −0
Original line number Diff line number Diff line
@@ -601,6 +601,7 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where) 
	trace_block_rq_insert(q, rq);



	blk_pm_add_request(q, rq);

	blk_pm_request_resume(q);



	rq->q = q;