UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph 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: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Bart Van Assche 2018-09-26 14:01:05 -07:00 committed by Jens Axboe
parent cd84a62e00
commit 154b00d566
3 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
block/blk-core.c
View File

@ -1744,6 +1744,7 @@ void __blk_put_request(struct request_queue *q, struct request *req)
blk_req_zone_write_unlock(req); blk_req_zone_write_unlock(req);
blk_pm_put_request(req); blk_pm_put_request(req);
blk_pm_mark_last_busy(req);
elv_completed_request(q, req); elv_completed_request(q, req);

36
block/blk-pm.h
View File

@ -6,8 +6,23 @@
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#ifdef CONFIG_PM #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) 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)) if (rq->q->dev && !(rq->rq_flags & RQF_PM))
rq->q->nr_pending--; 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, static inline void blk_pm_add_request(struct request_queue *q,
struct request *rq) struct request *rq)
{ {
if (q->dev && !(rq->rq_flags & RQF_PM) && q->nr_pending++ == 0 && lockdep_assert_held(q->queue_lock);
(q->rpm_status == RPM_SUSPENDED || q->rpm_status == RPM_SUSPENDING))
pm_request_resume(q->dev); if (q->dev && !(rq->rq_flags & RQF_PM))
q->nr_pending++;
} }
static inline void blk_pm_put_request(struct request *rq) static inline void blk_pm_put_request(struct request *rq)
{ {
if (rq->q->dev && !(rq->rq_flags & RQF_PM) && !--rq->q->nr_pending) lockdep_assert_held(rq->q->queue_lock);
pm_runtime_mark_last_busy(rq->q->dev);
if (rq->q->dev && !(rq->rq_flags & RQF_PM))
--rq->q->nr_pending;
} }
#else #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) static inline void blk_pm_requeue_request(struct request *rq)
{ {
} }

1
block/elevator.c
View File

@ -601,6 +601,7 @@ void __elv_add_request(struct request_queue *q, struct request *rq, int where)
trace_block_rq_insert(q, rq); trace_block_rq_insert(q, rq);
blk_pm_add_request(q, rq); blk_pm_add_request(q, rq);
blk_pm_request_resume(q);
rq->q = q; rq->q = q;