trivial block layer merging cleanups
Hi Jens,
this series has a bunch of trivial cleanups for the merging code.
PATCH 1/3 block: remove the unused blk_integrity_merge_rq export
Also move the definition from the public blkdev.h to the private block/blk.h header.
Signed-off-by Christoph Hellwig <[email protected]>
--- block/blk-integrity.c | 1 - block/blk.h | 8 ++++++++ include/linux/blkdev.h | 8 -------- 3 files changed, 8 insertions(+), 9 deletions(-)
block/blk-integrity.c +0 -1
@@ -183,7 +183,6 @@ bool blk_integrity_merge_rq(struct request_queue *q, struct request *req,return true; } -EXPORT_SYMBOL (blk_integrity_merge_rq);bool blk_integrity_merge_bio (struct request_queue *q,struct request *req,struct bio *bio)
block/blk.h +8 -0
@@ -120,6 +120,9 @@ static inline bool bio_integrity_endio(struct bio *bio)return true; } +bool blk_integrity_merge_rq (struct request_queue *,struct request *, +struct request *); +static inline bool integrity_req_gap_back_merge (struct request *req,struct bio *next) {
@@ -143,6 +146,11 @@ static inline bool integrity_req_gap_front_merge(struct request *req,void blk_integrity_add (struct gendisk *);void blk_integrity_del (struct gendisk *);#else /* CONFIG_BLK_DEV_INTEGRITY */ +static inline bool blk_integrity_merge_rq (struct request_queue *rq, +struct request *r1,struct request *r2) +{ +return true; +}static inline bool integrity_req_gap_back_merge (struct request *req,struct bio *next) {
include/linux/blkdev.h +0 -8
@@ -1663,8 +1663,6 @@ extern int blk_integrity_compare(struct gendisk *, struct gendisk *);extern int blk_rq_map_integrity_sg (struct request_queue *,struct bio *,struct scatterlist *);extern int blk_rq_count_integrity_sg (struct request_queue *,struct bio *); -extern bool blk_integrity_merge_rq (struct request_queue *,struct request *, -struct request *);extern bool blk_integrity_merge_bio (struct request_queue *,struct request *,struct bio *);
@@ -1794,12 +1792,6 @@ static inline unsigned short queue_max_integrity_segments(const struct request_q {return 0 ; } -static inline bool blk_integrity_merge_rq (struct request_queue *rq, -struct request *r1, -struct request *r2) -{ -return true; -}static inline bool blk_integrity_merge_bio (struct request_queue *rq,struct request *r,struct bio *b)
Signature · 1 line
2.28.0
PATCH 2/3 block: remove the unused blk_integrity_merge_bio export
In reply to Christoph HellwigAlso move the definition from the public blkdev.h to the private block/blk.h header.
Signed-off-by Christoph Hellwig <[email protected]>
--- block/blk-integrity.c | 1 - block/blk.h | 7 +++++++ include/linux/blkdev.h | 8 -------- 3 files changed, 7 insertions(+), 9 deletions(-)
block/blk-integrity.c +0 -1
@@ -211,7 +211,6 @@ bool blk_integrity_merge_bio(struct request_queue *q, struct request *req,return true; } -EXPORT_SYMBOL (blk_integrity_merge_bio);struct integrity_sysfs_entry {struct attribute attr;
block/blk.h +7 -0
@@ -122,6 +122,8 @@ static inline bool bio_integrity_endio(struct bio *bio)bool blk_integrity_merge_rq (struct request_queue *,struct request *,struct request *); +bool blk_integrity_merge_bio (struct request_queue *,struct request *, +struct bio *);static inline bool integrity_req_gap_back_merge (struct request *req,struct bio *next)
@@ -151,6 +153,11 @@ static inline bool blk_integrity_merge_rq(struct request_queue *rq, {return true; } +static inline bool blk_integrity_merge_bio (struct request_queue *rq, +struct request *r,struct bio *b) +{ +return true; +}static inline bool integrity_req_gap_back_merge (struct request *req,struct bio *next) {
include/linux/blkdev.h +0 -8
@@ -1663,8 +1663,6 @@ extern int blk_integrity_compare(struct gendisk *, struct gendisk *);extern int blk_rq_map_integrity_sg (struct request_queue *,struct bio *,struct scatterlist *);extern int blk_rq_count_integrity_sg (struct request_queue *,struct bio *); -extern bool blk_integrity_merge_bio (struct request_queue *,struct request *, -struct bio *);static inline struct blk_integrity *blk_get_integrity (struct gendisk *disk) {
@@ -1792,12 +1790,6 @@ static inline unsigned short queue_max_integrity_segments(const struct request_q {return 0 ; } -static inline bool blk_integrity_merge_bio (struct request_queue *rq, -struct request *r, -struct bio *b) -{ -return true; -}static inline unsigned int bio_integrity_intervals (struct blk_integrity *bi,unsigned int sectors)
Signature · 1 line
2.28.0
PATCH 3/3 block: move blk_mq_sched_try_merge to blk-merge.c
In reply to Christoph HellwigMove blk_mq_sched_try_merge to blk-merge.c, which allows to mark a lot of the merge infrastructure static there.
Signed-off-by Christoph Hellwig <[email protected]>
--- block/blk-merge.c | 62 +++++++++++++++++++++++++++++++++++--------- block/blk-mq-sched.c | 32 ----------------------- block/blk.h | 19 -------------- 3 files changed, 50 insertions(+), 63 deletions(-)
block/blk-merge.c +50 -12
@@ -580,7 +580,8 @@ int ll_back_merge_fn(struct request *req, struct bio *bio, unsigned int nr_segs)return ll_new_hw_segment (req, bio, nr_segs); } -int ll_front_merge_fn (struct request *req,struct bio *bio,unsigned int nr_segs) +static int ll_front_merge_fn (struct request *req,struct bio *bio, +unsigned int nr_segs) {if (req_gap_front_merge (req, bio))return 0 ;
@@ -810,7 +811,8 @@ static struct request *attempt_merge(struct request_queue *q,return next; } -struct request *attempt_back_merge (struct request_queue *q,struct request *rq) +static struct request *attempt_back_merge (struct request_queue *q, +struct request *rq) {struct request *next =elv_latter_request (q, rq);
@@ -820,7 +822,8 @@ struct request *attempt_back_merge(struct request_queue *q, struct request *rq)return NULL ; } -struct request *attempt_front_merge (struct request_queue *q,struct request *rq) +static struct request *attempt_front_merge (struct request_queue *q, +struct request *rq) {struct request *prev =elv_former_request (q, rq);
@@ -907,9 +910,14 @@ static void blk_account_io_merge_bio(struct request *req)part_stat_unlock (); } -enum bio_merge_status bio_attempt_back_merge (struct request *req, -struct bio *bio, -unsigned int nr_segs) +enum bio_merge_status { +BIO_MERGE_OK , +BIO_MERGE_NONE , +BIO_MERGE_FAILED , +}; + +static enum bio_merge_status bio_attempt_back_merge (struct request *req, +struct bio *bio,unsigned int nr_segs) {const int ff = bio->bi_opf &REQ_FAILFAST_MASK ;
@@ -932,9 +940,8 @@ enum bio_merge_status bio_attempt_back_merge(struct request *req,return BIO_MERGE_OK ; } -enum bio_merge_status bio_attempt_front_merge (struct request *req, -struct bio *bio, -unsigned int nr_segs) +static enum bio_merge_status bio_attempt_front_merge (struct request *req, +struct bio *bio,unsigned int nr_segs) {const int ff = bio->bi_opf &REQ_FAILFAST_MASK ;
@@ -959,9 +966,8 @@ enum bio_merge_status bio_attempt_front_merge(struct request *req,return BIO_MERGE_OK ; } -enum bio_merge_status bio_attempt_discard_merge (struct request_queue *q, -struct request *req, -struct bio *bio) +static enum bio_merge_status bio_attempt_discard_merge (struct request_queue *q, +struct request *req,struct bio *bio) {unsigned short segments =blk_rq_nr_discard_segments (req);
@@ -1096,3 +1102,35 @@ bool blk_bio_list_merge(struct request_queue *q, struct list_head *list,return false; }EXPORT_SYMBOL_GPL (blk_bio_list_merge); + +bool blk_mq_sched_try_merge (struct request_queue *q,struct bio *bio, +unsigned int nr_segs,struct request **merged_request) +{ +struct request *rq; + +switch (elv_merge (q, &rq, bio)) { +case ELEVATOR_BACK_MERGE : +if (!blk_mq_sched_allow_merge (q, rq, bio)) +return false; +if (bio_attempt_back_merge (rq, bio, nr_segs) !=BIO_MERGE_OK ) +return false; + *merged_request =attempt_back_merge (q, rq); +if (!*merged_request) +elv_merged_request (q, rq,ELEVATOR_BACK_MERGE ); +return true; +case ELEVATOR_FRONT_MERGE : +if (!blk_mq_sched_allow_merge (q, rq, bio)) +return false; +if (bio_attempt_front_merge (rq, bio, nr_segs) !=BIO_MERGE_OK ) +return false; + *merged_request =attempt_front_merge (q, rq); +if (!*merged_request) +elv_merged_request (q, rq,ELEVATOR_FRONT_MERGE ); +return true; +case ELEVATOR_DISCARD_MERGE : +return bio_attempt_discard_merge (q, rq, bio) ==BIO_MERGE_OK ; +default : +return false; + } +} +EXPORT_SYMBOL_GPL (blk_mq_sched_try_merge);
block/blk-mq-sched.c +0 -32
@@ -344,38 +344,6 @@ void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx) } } -bool blk_mq_sched_try_merge (struct request_queue *q,struct bio *bio, -unsigned int nr_segs,struct request **merged_request) -{ -struct request *rq; - -switch (elv_merge (q, &rq, bio)) { -case ELEVATOR_BACK_MERGE : -if (!blk_mq_sched_allow_merge (q, rq, bio)) -return false; -if (bio_attempt_back_merge (rq, bio, nr_segs) !=BIO_MERGE_OK ) -return false; - *merged_request =attempt_back_merge (q, rq); -if (!*merged_request) -elv_merged_request (q, rq,ELEVATOR_BACK_MERGE ); -return true; -case ELEVATOR_FRONT_MERGE : -if (!blk_mq_sched_allow_merge (q, rq, bio)) -return false; -if (bio_attempt_front_merge (rq, bio, nr_segs) !=BIO_MERGE_OK ) -return false; - *merged_request =attempt_front_merge (q, rq); -if (!*merged_request) -elv_merged_request (q, rq,ELEVATOR_FRONT_MERGE ); -return true; -case ELEVATOR_DISCARD_MERGE : -return bio_attempt_discard_merge (q, rq, bio) ==BIO_MERGE_OK ; -default : -return false; - } -} -EXPORT_SYMBOL_GPL (blk_mq_sched_try_merge); -bool __blk_mq_sched_bio_merge (struct request_queue *q,struct bio *bio,unsigned int nr_segs) {
block/blk.h +0 -19
@@ -29,12 +29,6 @@ struct blk_flush_queue {spinlock_t mq_flush_lock; }; -enum bio_merge_status { -BIO_MERGE_OK , -BIO_MERGE_NONE , -BIO_MERGE_FAILED , -}; -extern struct kmem_cache *blk_requestq_cachep;extern struct kobj_type blk_queue_ktype;extern struct ida blk_queue_ida;
@@ -190,15 +184,6 @@ static inline void blk_integrity_del(struct gendisk *disk)unsigned long blk_rq_timeout (unsigned long timeout);void blk_add_timer (struct request *req); -enum bio_merge_status bio_attempt_front_merge (struct request *req, -struct bio *bio, -unsigned int nr_segs); -enum bio_merge_status bio_attempt_back_merge (struct request *req, -struct bio *bio, -unsigned int nr_segs); -enum bio_merge_status bio_attempt_discard_merge (struct request_queue *q, -struct request *req, -struct bio *bio);bool blk_attempt_plug_merge (struct request_queue *q,struct bio *bio,unsigned int nr_segs,struct request **same_queue_rq); bool blk_bio_list_merge(struct request_queue *q, struct list_head *list,
@@ -249,10 +234,6 @@ ssize_t part_timeout_store(struct device *, struct device_attribute *,void __blk_queue_split (struct bio **bio,unsigned int *nr_segs);int ll_back_merge_fn (struct request *req,struct bio *bio,unsigned int nr_segs); -int ll_front_merge_fn (struct request *req,struct bio *bio, -unsigned int nr_segs); -struct request *attempt_back_merge (struct request_queue *q,struct request *rq); -struct request *attempt_front_merge (struct request_queue *q,struct request *rq);int blk_attempt_req_merge (struct request_queue *q,struct request *rq,struct request *next);unsigned int blk_recalc_rq_segments (struct request *rq);
Signature · 1 line
2.28.0
Quoted 3 lines · Christoph Hellwig
Hi Jens,
this series has a bunch of trivial cleanups for the merging code.
Applied, thanks.
Signature · 1 line
Jens Axboe