bio_add_pc_page cleanups
Hi Jens,
please take a look at these trivial bio_add_pc_page cleanups.
PATCH 1/3 block: remove the __bio_add_pc_page export
The same page optimization is a rather odd corner case, which is not used outside bio.c and which really should not be used outside of bio.c either - we have better highlevel helpers like the rq/bio mapping helpers.
--- block/bio.c | 3 +-- include/linux/bio.h | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-)
block/bio.c +1 -2
@@ -709,7 +709,7 @@ static bool can_add_page_to_seg(struct request_queue *q,* * This should only be used by passthrough bios. */ -int __bio_add_pc_page (struct request_queue *q,struct bio *bio, +static int __bio_add_pc_page (struct request_queue *q,struct bio *bio,struct page *page,unsigned int len,unsigned int offset,bool put_same_page) {
@@ -776,7 +776,6 @@ int __bio_add_pc_page(struct request_queue *q, struct bio *bio,bio_set_flag (bio,BIO_SEG_VALID );return len; } -EXPORT_SYMBOL (__bio_add_pc_page);int bio_add_pc_page (struct request_queue *q,struct bio *bio,struct page *page,unsigned int len,unsigned int offset)
include/linux/bio.h +0 -3
@@ -435,9 +435,6 @@ void bio_chain(struct bio *, struct bio *);extern int bio_add_page (struct bio *,struct page *,unsigned int ,unsigned int );extern int bio_add_pc_page (struct request_queue *,struct bio *,struct page *,unsigned int ,unsigned int ); -extern int __bio_add_pc_page (struct request_queue *,struct bio *, -struct page *,unsigned int ,unsigned int , -bool );bool __bio_try_merge_page (struct bio *bio,struct page *page,unsigned int len,unsigned int off,bool same_page); void __bio_add_page(struct bio *bio, struct page *page,
Signature · 1 line
2.20.1
PATCH 2/3 block: remove bogus comments in __bio_add_pc_page
In reply to Christoph HellwigWe are never called with file system pages by defintions for the passthrough interface, and we also never undo any addition later these days.
--- block/bio.c | 9 --------- 1 file changed, 9 deletions(-)
block/bio.c +0 -9
@@ -724,11 +724,6 @@ static int __bio_add_pc_page(struct request_queue *q, struct bio *bio,if (((bio->bi_iter.bi_size + len) >>9 ) >queue_max_hw_sectors (q))return 0 ; -/* -* For filesystems with a blocksize smaller than the pagesize -* we will often be called with the same page as last time and -* a consecutive offset. Optimize this special case. -*/ if (bio->bi_vcnt >0 ) { bvec = &bio->bi_io_vec[bio->bi_vcnt -1 ];
@@ -760,10 +755,6 @@ static int __bio_add_pc_page(struct request_queue *q, struct bio *bio,if (bio->bi_phys_segments >=queue_max_segments (q))return 0 ; -/* -* setup the new entry, we might clear it again later if we -* cannot add the page -*/ bvec = &bio->bi_io_vec[bio->bi_vcnt]; bvec->bv_page = page; bvec->bv_len = len;
Signature · 1 line
2.20.1
PATCH 3/3 block: clean up __bio_add_pc_page a bit
In reply to Christoph HellwigShare the bi_size update by moving the done label up, and duplicate the bv_len update in the two callers to get rid of the bvec_merge label.
--- block/bio.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
block/bio.c +5 -6
@@ -731,9 +731,7 @@ static int __bio_add_pc_page(struct request_queue *q, struct bio *bio, offset == bvec->bv_offset + bvec->bv_len) {if (put_same_page)put_page (page); - bvec_merge: bvec->bv_len += len; - bio->bi_iter.bi_size += len; goto done; }
@@ -745,8 +743,10 @@ static int __bio_add_pc_page(struct request_queue *q, struct bio *bio,return 0 ;if (page_is_mergeable (bvec, page, len, offset, false) && -can_add_page_to_seg (q, bvec, page, len, offset)) - goto bvec_merge; +can_add_page_to_seg (q, bvec, page, len, offset)) { + bvec->bv_len += len; + goto done; + } }if (bio_full (bio))
@@ -760,9 +760,8 @@ static int __bio_add_pc_page(struct request_queue *q, struct bio *bio, bvec->bv_len = len; bvec->bv_offset = offset; bio->bi_vcnt++; - bio->bi_iter.bi_size += len; - done: + bio->bi_iter.bi_size += len; bio->bi_phys_segments = bio->bi_vcnt;bio_set_flag (bio,BIO_SEG_VALID );return len;
Signature · 1 line
2.20.1
ping?
Quoted 3 lines · Christoph Hellwig
Hi Jens,
please take a look at these trivial
bio_add_pc_pagecleanups.
---end quoted text---
Jens Axboe
maintainerQuoted 3 lines · Christoph Hellwig
Hi Jens,
please take a look at these trivial
bio_add_pc_pagecleanups.
LGTM, applied.
Signature · 1 line
Jens Axboe