block: fix get_max_segment_size() overflow on 32bit arch
PATCH v2 1/1 block: fix get_max_segment_size() overflow on 32bit arch
Commit 429120f3df2d starts to take account of segment's start dma address when computing max segment size, and data type of 'unsigned long' is used to do that. However, the segment mask may be 0xffffffff, so the figured out segment size may be overflowed in case of zero physical address on 32bit arch.
Fix the issue by returning queue_max_segment_size() directly when that happens.
---
V2:
- don't use 64bit offset, so that not adding overhead on 32bit physical address space
block/blk-merge.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
block/blk-merge.c +7 -2
@@ -164,8 +164,13 @@ static inline unsigned get_max_segment_size(const struct request_queue *q,unsigned long mask =queue_segment_boundary (q); offset = mask & (page_to_phys (start_page) + offset); - return min_t(unsigned long, mask - offset + 1, -queue_max_segment_size (q)); + +/* +* overflow may be triggered in case of zero page physical address +* on 32bit arch, use queue's max segment size when that happens. +*/ +return min_not_zero (mask - offset +1 , + (unsigned long )queue_max_segment_size (q)); }/**
Signature · 1 line
2.20.1
Jens Axboe
maintainerQuoted 8 lines · Ming Lei
Commit
429120f3df2dstarts to take account of segment's start dma address when computing max segment size, and data type of 'unsigned long' is used to do that. However, the segment mask may be0xffffffff, so the figured out segment size may be overflowed in case of zero physical address on 32bit arch.Fix the issue by returning
queue_max_segment_size()directly when that happens.
I still think this should use phys_addr_t, just in case the mask is ever not 32-bit. The current types are a bit weird, tbh.
Signature · 1 line
Jens Axboe
Quoted 7 lines · Jens Axboe
Quoted 6 lines · Ming Lei
Commit
429120f3df2dstarts to take account of segment's start dma address when computing max segment size, and data type of 'unsigned long' is used to do that. However, the segment mask may be0xffffffff, so the figured out segment size may be overflowed in case of zero physical address on 32bit arch.
Quoted 5 lines
Quoted 2 lines
Fix the issue by returning
queue_max_segment_size()directly when that happens.I still think this should use
phys_addr_t, just in case the mask is ever not 32-bit. The current types are a bit weird, tbh.
I didn't use phys_addr_t because queue_segment_boundary() always returns 'unsigned long', so using 'phys_addr_t' doesn't make any difference because the following result can be held in 32bit always no matter offset is 32bit or 64bit:
mask & (page_to_phys(start_page) + offset)
BTW, 'seg_boundary_mask' is defined as 'unsigned long' since kernel git tree was born. Given not see related report with 64bit phys_addr_t on 32bit arch, I guess we may leave it alone.
However, if you think we need to convert 'seg_boundary_mask' into phys_addr_t, the 'offset' parameter can be re-defined as phys_addr_t.
thanks,
Ming