add a bvec_phys helper
Subsystems (2)
Hi Jens,
this series adds a bvec_phys helper to get the physical address of a bio_vec so that callers don't have to poke into bvec internals. There aren't a whole lot of user of it yet, but with the new proposed DMA mapping API we might grow a lot more soon.
Diffstat:
arch/m68k/emu/nfblock.c | 2 +- block/bio.c | 2 +- block/blk-merge.c | 22 +++++++++------------- block/blk.h | 4 ++-- include/linux/bvec.h | 15 +++++++++++++++ 5 files changed, 28 insertions(+), 17 deletions(-)
PATCH 1/2 block: pass a phys_addr_t to get_max_segment_size
Work on a single address to simplify the logic, and prepare the callers from using better helpers.
--- block/blk-merge.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
block/blk-merge.c +10 -12
@@ -207,25 +207,22 @@ static inline unsigned get_max_io_size(struct bio *bio, }/** -* get_max_segment_size() - maximum number of bytes to add as a single segment +* get_max_segment_size() - maximum number of bytes to add to a single segment * @lim: Request queue limits. -* @start_page: See below. -* @offset: Offset from @start_page where to add a segment. +* @paddr: address of the range to add * -* Returns the maximum number of bytes that can be added as a single segment. +* Returns the maximum number of bytes of the range starting at @addr that can +* be added to a single request. */ static inline unsigned get_max_segment_size (const struct queue_limits *lim, -struct page *start_page,unsigned long offset) +phys_addr_t paddr) { -unsigned long mask = lim->seg_boundary_mask; - - offset = mask & (page_to_phys (start_page) + offset); -/* * Prevent an overflow if mask = ULONG_MAX and offset = 0 by adding 1 * after having calculated the minimum. */ -return min (mask - offset, (unsigned long )lim->max_segment_size -1 ) +1 ; +return min (lim->seg_boundary_mask - (lim->seg_boundary_mask & paddr), + (unsigned long )lim->max_segment_size -1 ) +1 ; }/**
@@ -258,7 +255,7 @@ static bool bvec_split_segs(const struct queue_limits *lim,unsigned seg_size =0 ;while (len && *nsegs < max_segs) { - seg_size =get_max_segment_size (lim, bv->bv_page, + seg_size =get_max_segment_size (lim,page_to_phys (bv->bv_page) + bv->bv_offset + total_len); seg_size =min (seg_size, len);
@@ -495,7 +492,8 @@ static unsigned blk_bvec_map_sg(struct request_queue *q,while (nbytes >0 ) {unsigned offset = bvec->bv_offset + total;unsigned len =min (get_max_segment_size (&q->limits, - bvec->bv_page, offset), nbytes); +page_to_phys (bvec->bv_page) + offset), + nbytes);struct page *page = bvec->bv_page;/*
Signature · 1 line
2.43.0
Re: [PATCH 1/2] block: pass a phys_addr_t to get_max_segment_size
Hi Christoph,
Quoted 4 lines · Christoph Hellwig
Work on a single address to simplify the logic, and prepare the callers from using better helpers.
Signed-off-by Christoph Hellwig <[email protected]>
Thanks for your patch!
Quoted 5 lines
block/blk-merge.c +0
-0@@ -207,25 +207,22 @@ static inline unsigned get_max_io_size(struct bio *bio, }
block/blk-merge.c static inline unsigned get_max_io_size(struct bio *bio, · line 214
Quoted 10 lines
block/blk-merge.c +3
-4/** -* get_max_segment_size() - maximum number of bytes to add as a single segment +* get_max_segment_size() - maximum number of bytes to add to a single segment * @lim: Request queue limits. -* @start_page: See below. -* @offset: Offset from @start_page where to add a segment. +* @paddr: address of the range to add * -* Returns the maximum number of bytes that can be added as a single segment. +* Returns the maximum number of bytes of the range starting at @addr that can
@paddr
block/blk-merge.c static inline unsigned get_max_io_size(struct bio *bio, · line 216
Quoted 2 lines
block/blk-merge.c +1
-0+* be added to a single request. */
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
PATCH 2/2 block: add a bvec_phys helper
In reply to Christoph HellwigGet callers out of poking into bvec internals a bit more. Not a huge win right now, but with the proposed new DMA mapping API we might end up with a lot more of this otherwise.
--- arch/m68k/emu/nfblock.c | 2 +- block/bio.c | 2 +- block/blk-merge.c | 6 ++---- block/blk.h | 4 ++-- include/linux/bvec.h | 15 +++++++++++++++ 5 files changed, 21 insertions(+), 8 deletions(-)
arch/m68k/emu/nfblock.c +1 -1
@@ -71,7 +71,7 @@ static void nfhd_submit_bio(struct bio *bio) len = bvec.bv_len; len >>=9 ;nfhd_read_write (dev->id,0 , dir, sec >> shift, len >> shift, -page_to_phys (bvec.bv_page) + bvec.bv_offset); +bvec_phys (&bvec)); sec += len; }bio_endio (bio);
block/bio.c +1 -1
@@ -953,7 +953,7 @@ bool bvec_try_merge_hw_page(struct request_queue *q, struct bio_vec *bv, bool *same_page) {unsigned long mask =queue_segment_boundary (q); -phys_addr_t addr1 =page_to_phys (bv->bv_page) + bv->bv_offset; +phys_addr_t addr1 =bvec_phys (bv);phys_addr_t addr2 =page_to_phys (page) + offset + len -1 ;if ((addr1 | mask) != (addr2 | mask))
block/blk-merge.c +2 -4
@@ -255,8 +255,7 @@ static bool bvec_split_segs(const struct queue_limits *lim,unsigned seg_size =0 ;while (len && *nsegs < max_segs) { - seg_size =get_max_segment_size (lim,page_to_phys (bv->bv_page) + - bv->bv_offset + total_len); + seg_size =get_max_segment_size (lim,bvec_phys (bv) + total_len); seg_size =min (seg_size, len); (*nsegs)++;
@@ -492,8 +491,7 @@ static unsigned blk_bvec_map_sg(struct request_queue *q,while (nbytes >0 ) {unsigned offset = bvec->bv_offset + total;unsigned len =min (get_max_segment_size (&q->limits, -page_to_phys (bvec->bv_page) + offset), - nbytes); +bvec_phys (bvec) + total), nbytes);struct page *page = bvec->bv_page;/*
block/blk.h +2 -2
@@ -98,8 +98,8 @@ static inline bool biovec_phys_mergeable(struct request_queue *q, struct bio_vec *vec1, struct bio_vec *vec2) { unsigned long mask = queue_segment_boundary(q); -phys_addr_t addr1 =page_to_phys (vec1->bv_page) + vec1->bv_offset; -phys_addr_t addr2 =page_to_phys (vec2->bv_page) + vec2->bv_offset; +phys_addr_t addr1 =bvec_phys (vec1); +phys_addr_t addr2 =bvec_phys (vec2);/* * Merging adjacent physical pages may not work correctly under KMSAN
include/linux/bvec.h +15 -0
@@ -280,4 +280,19 @@ static inline void *bvec_virt(struct bio_vec *bvec) return page_address(bvec->bv_page) + bvec->bv_offset; } +/** +* bvec_phys - return the physical address for a bvec +* @bvec: bvec to return the physical address for +*/ +static inline phys_addr_t bvec_phys (const struct bio_vec *bvec) +{ +/* +* Note this open codes page_to_phys because page_to_phys is defined in +* <asm/io.h>, which we don't want to pull in here. If it ever moves to +* a sensible place we should start using it. +*/ +return ((phys_addr_t )page_to_pfn (bvec->bv_page) <<PAGE_SHIFT ) + + bvec->bv_offset; +} +#endif /* __LINUX_BVEC_H */
Signature · 1 line
2.43.0
Re: [PATCH 2/2] block: add a bvec_phys helper
Hi Christoph,
Quoted 5 lines · Christoph Hellwig
Get callers out of poking into bvec internals a bit more. Not a huge win right now, but with the proposed new DMA mapping API we might end up with a lot more of this otherwise.
Signed-off-by Christoph Hellwig <[email protected]>
Thanks for your patch!
Quoted 1 line
arch/m68k/emu/nfblock.c | 2 +-
Quoted 13 lines
block/blk-merge.c +1
-2@@ -255,8 +255,7 @@ static bool bvec_split_segs(const struct queue_limits *lim,unsigned seg_size =0 ;while (len && *nsegs < max_segs) { - seg_size =get_max_segment_size (lim,page_to_phys (bv->bv_page) + - bv->bv_offset + total_len); + seg_size =get_max_segment_size (lim,bvec_phys (bv) + total_len); seg_size =min (seg_size, len); (*nsegs)++;
block/blk-merge.c static unsigned blk_bvec_map_sg(struct request_queue *q, · line 497
Quoted 9 lines
block/blk-merge.c +1
-2@@ -492,8 +491,7 @@ static unsigned blk_bvec_map_sg(struct request_queue *q,while (nbytes >0 ) {unsigned offset = bvec->bv_offset + total;unsigned len =min (get_max_segment_size (&q->limits, -page_to_phys (bvec->bv_page) + offset), - nbytes); +bvec_phys (bvec) + total), nbytes);struct page *page = bvec->bv_page;/*
If you would have introduce bvec_phys() first, you could fold the above two hunks into [PATCH 1/2].
Quoted 5 lines
include/linux/bvec.h +0
-0@@ -280,4 +280,19 @@ static inline void *bvec_virt(struct bio_vec *bvec)return page_address (bvec->bv_page) + bvec->bv_offset; }
include/linux/bvec.h static inline void *bvec_virt(struct bio_vec *bvec) · line 291
Quoted 10 lines
include/linux/bvec.h +9
-0+/** +* bvec_phys - return the physical address for a bvec +* @bvec: bvec to return the physical address for +*/ +static inline phys_addr_t bvec_phys (const struct bio_vec *bvec) +{ +/* +* Note this open codes page_to_phys because page_to_phys is defined in +* <asm/io.h>, which we don't want to pull in here. If it ever moves to
Which suggests this is arch-specific, and may not always be defined the same? I checked a few (but not all) that seem to differ from the above at first sight, but end up doing the same...
I think it would be good to make sure they are identical, and if they are, move them to a common place first, to any subtle breakages.
include/linux/bvec.h static inline void *bvec_virt(struct bio_vec *bvec) · line 298
Quoted 7 lines
include/linux/bvec.h +6
-0+* a sensible place we should start using it. +*/ +return ((phys_addr_t )page_to_pfn (bvec->bv_page) <<PAGE_SHIFT ) + + bvec->bv_offset; +} +#endif /* __LINUX_BVEC_H */
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [PATCH 2/2] block: add a bvec_phys helper
Quoted 13 lines · Geert Uytterhoeven
Quoted 13 lines
block/blk-merge.c +2
-2+ seg_size =get_max_segment_size (lim,bvec_phys (bv) + total_len); seg_size =min (seg_size, len); (*nsegs)++;@@ -492,8 +491,7 @@ static unsigned blk_bvec_map_sg(struct request_queue *q,while (nbytes >0 ) {unsigned offset = bvec->bv_offset + total;unsigned len =min (get_max_segment_size (&q->limits, -page_to_phys (bvec->bv_page) + offset), - nbytes); +bvec_phys (bvec) + total), nbytes);struct page *page = bvec->bv_page;
Quoted 4 lines
Review static unsigned blk_bvec_map_sg(struct request_queue *q, · line 497
Quoted 1 line
(quoted diff) +0
-0/*If you would have introduce
bvec_phys()first, you could fold the above two hunks into [PATCH 1/2].
Not sure what the advantage of that is, though?
Quoted 6 lines
Which suggests this is arch-specific, and may not always be defined the same? I checked a few (but not all) that seem to differ from the above at first sight, but end up doing the same...
I think it would be good to make sure they are identical, and if they are, move them to a common place first, to any subtle breakages.
It fundamentally is a wrapper around page_to_pfn that converts from the PFN to the full physical address. There a bunch of weird incosnsitencies and it should really move to common code, but I don't want this series to depend on that. The only interesting part is that for architectures with physical addresses larger than unsigned long we need to cast to a 64-bit type, although all the architectures that actually do that in the page_to_phys helper itself do that incorrectly by casting to a dma_addr_t instdead of a phys_addr_t. Fortunately we've stopped supporting a dma_addr_t smaller than phys_addr_t a long time ago, and even back then that only affected sparc (IIRC).
Geert Uytterhoeven
maintainerRe: [PATCH 2/2] block: add a bvec_phys helper
Hi Christoph,
Quoted 14 lines · Christoph Hellwig
Quoted 13 lines · Geert Uytterhoeven
Quoted 13 lines
block/blk-merge.c +2
-2+ seg_size =get_max_segment_size (lim,bvec_phys (bv) + total_len); seg_size =min (seg_size, len); (*nsegs)++;@@ -492,8 +491,7 @@ static unsigned blk_bvec_map_sg(struct request_queue *q,while (nbytes >0 ) {unsigned offset = bvec->bv_offset + total;unsigned len =min (get_max_segment_size (&q->limits, -page_to_phys (bvec->bv_page) + offset), - nbytes); +bvec_phys (bvec) + total), nbytes);struct page *page = bvec->bv_page;
Quoted 6 lines
Quoted 4 lines
Review static unsigned blk_bvec_map_sg(struct request_queue *q, · line 497
Quoted 1 line
(quoted diff) +0
-0/*If you would have introduce
bvec_phys()first, you could fold the above two hunks into [PATCH 1/2].Not sure what the advantage of that is, though?
It would avoid having to change these lines twice: once to the open-coded bvec_phys() variant, and a second time to bvec_phys().
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds