Skip to content

Commit 3d75ca0

Browse files
Ming Leiaxboe
authored andcommitted
block: introduce multi-page bvec helpers
This patch introduces helpers of 'mp_bvec_iter_*' for multi-page bvec support. The introduced helpers treate one bvec as real multi-page segment, which may include more than one pages. The existed helpers of bvec_iter_* are interfaces for supporting current bvec iterator which is thought as single-page by drivers, fs, dm and etc. These introduced helpers will build single-page bvec in flight, so this way won't break current bio/bvec users, which needn't any change. Follows some multi-page bvec background: - bvecs stored in bio->bi_io_vec is always multi-page style - bvec(struct bio_vec) represents one physically contiguous I/O buffer, now the buffer may include more than one page after multi-page bvec is supported, and all these pages represented by one bvec is physically contiguous. Before multi-page bvec support, at most one page is included in one bvec, we call it single-page bvec. - .bv_page of the bvec points to the 1st page in the multi-page bvec - .bv_offset of the bvec is the offset of the buffer in the bvec The effect on the current drivers/filesystem/dm/bcache/...: - almost everyone supposes that one bvec only includes one single page, so we keep the sp interface not changed, for example, bio_for_each_segment() still returns single-page bvec - bio_for_each_segment_all() will return single-page bvec too - during iterating, iterator variable(struct bvec_iter) is always updated in multi-page bvec style, and bvec_iter_advance() is kept not changed - returned(copied) single-page bvec is built in flight by bvec helpers from the stored multi-page bvec Reviewed-by: Christoph Hellwig <[email protected]> Reviewed-by: Omar Sandoval <[email protected]> Signed-off-by: Ming Lei <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent 19d62f6 commit 3d75ca0

File tree

1 file changed

+27
-3
lines changed

1 file changed

+27
-3
lines changed

include/linux/bvec.h

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <linux/kernel.h>
2424
#include <linux/bug.h>
2525
#include <linux/errno.h>
26+
#include <linux/mm.h>
2627

2728
/*
2829
* was unsigned short, but we might as well be ready for > 64kB I/O pages
@@ -50,16 +51,39 @@ struct bvec_iter {
5051
*/
5152
#define __bvec_iter_bvec(bvec, iter) (&(bvec)[(iter).bi_idx])
5253

53-
#define bvec_iter_page(bvec, iter) \
54+
/* multi-page (mp_bvec) helpers */
55+
#define mp_bvec_iter_page(bvec, iter) \
5456
(__bvec_iter_bvec((bvec), (iter))->bv_page)
5557

56-
#define bvec_iter_len(bvec, iter) \
58+
#define mp_bvec_iter_len(bvec, iter) \
5759
min((iter).bi_size, \
5860
__bvec_iter_bvec((bvec), (iter))->bv_len - (iter).bi_bvec_done)
5961

60-
#define bvec_iter_offset(bvec, iter) \
62+
#define mp_bvec_iter_offset(bvec, iter) \
6163
(__bvec_iter_bvec((bvec), (iter))->bv_offset + (iter).bi_bvec_done)
6264

65+
#define mp_bvec_iter_page_idx(bvec, iter) \
66+
(mp_bvec_iter_offset((bvec), (iter)) / PAGE_SIZE)
67+
68+
#define mp_bvec_iter_bvec(bvec, iter) \
69+
((struct bio_vec) { \
70+
.bv_page = mp_bvec_iter_page((bvec), (iter)), \
71+
.bv_len = mp_bvec_iter_len((bvec), (iter)), \
72+
.bv_offset = mp_bvec_iter_offset((bvec), (iter)), \
73+
})
74+
75+
/* For building single-page bvec in flight */
76+
#define bvec_iter_offset(bvec, iter) \
77+
(mp_bvec_iter_offset((bvec), (iter)) % PAGE_SIZE)
78+
79+
#define bvec_iter_len(bvec, iter) \
80+
min_t(unsigned, mp_bvec_iter_len((bvec), (iter)), \
81+
PAGE_SIZE - bvec_iter_offset((bvec), (iter)))
82+
83+
#define bvec_iter_page(bvec, iter) \
84+
nth_page(mp_bvec_iter_page((bvec), (iter)), \
85+
mp_bvec_iter_page_idx((bvec), (iter)))
86+
6387
#define bvec_iter_bvec(bvec, iter) \
6488
((struct bio_vec) { \
6589
.bv_page = bvec_iter_page((bvec), (iter)), \

0 commit comments

Comments
 (0)