Hi Jens,
The proposed alternatives continue to break with allowable (however
unlikely) queue limits, where this should be safe for any possible
settings. I think this should be okay to go as-is.
On Thu, Aug 06, 2020 at 02:58:37PM -0700, Keith Busch wrote:
> A previous commit aligning splits to physical block sizes inadvertently
> modified one return case such that that it now returns 0 length splits
> when the number of sectors doesn't exceed the physical offset. This
> later hits a BUG in bio_split(). Restore the previous working behavior.
>
> Reported-by: Eric Deal <eric.deal@xxxxxxx>
> Cc: Bart Van Assche <bvanassche@xxxxxxx>
> Cc: stable@xxxxxxxxxxxxxxx
> Fixes: 9cc5169cd478b ("block: Improve physical block alignment of split bios")
> Signed-off-by: Keith Busch <kbusch@xxxxxxxxxx>
> ---
> block/blk-merge.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/block/blk-merge.c b/block/blk-merge.c
> index 5196dc145270..d7fef954d42f 100644
> --- a/block/blk-merge.c
> +++ b/block/blk-merge.c
> @@ -154,7 +154,7 @@ static inline unsigned get_max_io_size(struct request_queue *q,
> if (max_sectors > start_offset)
> return max_sectors - start_offset;
>
> - return sectors & (lbs - 1);
> + return sectors & ~(lbs - 1);
> }
>
> static inline unsigned get_max_segment_size(const struct request_queue *q,
> --
