[PATCH] block: set default max segment size in case of virt_boundary

[PATCH] block: set default max segment size in case of virt_boundary

[Ming Lei]

For devices with virt_boundary limit, the driver may provide zero max
segment size, we have to set it as UINT_MAX at default. Otherwise, it
may cause warning in driver when handling sglist.

Fix it by setting default max segment size as UINT_MAX.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Mike Snitzer <snitzer@kernel.org>
Fixes: b561ea56a264 ("block: allow device to have both virt_boundary_mask and max segment size")
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Closes: https://lore.kernel.org/linux-block/7e38b67c-9372-a42d-41eb-abdce33d3372@linux-m68k.org/
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
 block/blk-settings.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/block/blk-settings.c b/block/blk-settings.c
index d2731843f2fc..9d6033e01f2e 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -188,7 +188,10 @@ static int blk_validate_limits(struct queue_limits *lim)
 	 * bvec and lower layer bio splitting is supposed to handle the two
 	 * correctly.
 	 */
-	if (!lim->virt_boundary_mask) {
+	if (lim->virt_boundary_mask) {
+		if (!lim->max_segment_size)
+			lim->max_segment_size = UINT_MAX;
+	} else {
 		/*
 		 * The maximum segment size has an odd historic 64k default that
 		 * drivers probably should override.  Just like the I/O size we
-- 
2.42.0

Re: [PATCH] block: set default max segment size in case of virt_boundary

[Ming Lei]

On Wed, Apr 24, 2024 at 09:47:22PM +0800, Ming Lei wrote:
> For devices with virt_boundary limit, the driver may provide zero max
> segment size, we have to set it as UINT_MAX at default. Otherwise, it
> may cause warning in driver when handling sglist.
> 
> Fix it by setting default max segment size as UINT_MAX.
> 
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: Mike Snitzer <snitzer@kernel.org>
> Fixes: b561ea56a264 ("block: allow device to have both virt_boundary_mask and max segment size")
> Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Closes: https://lore.kernel.org/linux-block/7e38b67c-9372-a42d-41eb-abdce33d3372@linux-m68k.org/
> Signed-off-by: Ming Lei <ming.lei@redhat.com>
> ---
>  block/blk-settings.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/block/blk-settings.c b/block/blk-settings.c
> index d2731843f2fc..9d6033e01f2e 100644
> --- a/block/blk-settings.c
> +++ b/block/blk-settings.c
> @@ -188,7 +188,10 @@ static int blk_validate_limits(struct queue_limits *lim)
>  	 * bvec and lower layer bio splitting is supposed to handle the two
>  	 * correctly.
>  	 */
> -	if (!lim->virt_boundary_mask) {
> +	if (lim->virt_boundary_mask) {
> +		if (!lim->max_segment_size)
> +			lim->max_segment_size = UINT_MAX;
> +	} else {
>  		/*
>  		 * The maximum segment size has an odd historic 64k default that
>  		 * drivers probably should override.  Just like the I/O size we

Hello Jens,

Looks this fix is missed, can you make it to v6.9?


Thanks,
Ming

Re: [PATCH] block: set default max segment size in case of virt_boundary

[Jens Axboe]

On 5/6/24 7:41 PM, Ming Lei wrote:
> On Wed, Apr 24, 2024 at 09:47:22PM +0800, Ming Lei wrote:
>> For devices with virt_boundary limit, the driver may provide zero max
>> segment size, we have to set it as UINT_MAX at default. Otherwise, it
>> may cause warning in driver when handling sglist.
>>
>> Fix it by setting default max segment size as UINT_MAX.
>>
>> Cc: Christoph Hellwig <hch@lst.de>
>> Cc: Mike Snitzer <snitzer@kernel.org>
>> Fixes: b561ea56a264 ("block: allow device to have both virt_boundary_mask and max segment size")
>> Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
>> Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
>> Closes: https://lore.kernel.org/linux-block/7e38b67c-9372-a42d-41eb-abdce33d3372@linux-m68k.org/
>> Signed-off-by: Ming Lei <ming.lei@redhat.com>
>> ---
>>  block/blk-settings.c | 5 ++++-
>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/block/blk-settings.c b/block/blk-settings.c
>> index d2731843f2fc..9d6033e01f2e 100644
>> --- a/block/blk-settings.c
>> +++ b/block/blk-settings.c
>> @@ -188,7 +188,10 @@ static int blk_validate_limits(struct queue_limits *lim)
>>  	 * bvec and lower layer bio splitting is supposed to handle the two
>>  	 * correctly.
>>  	 */
>> -	if (!lim->virt_boundary_mask) {
>> +	if (lim->virt_boundary_mask) {
>> +		if (!lim->max_segment_size)
>> +			lim->max_segment_size = UINT_MAX;
>> +	} else {
>>  		/*
>>  		 * The maximum segment size has an odd historic 64k default that
>>  		 * drivers probably should override.  Just like the I/O size we
> 
> Hello Jens,
> 
> Looks this fix is missed, can you make it to v6.9?

Oops yes, thanks for the reminder.

-- 
Jens Axboe

Re: [PATCH] block: set default max segment size in case of virt_boundary

[Jens Axboe]

On Wed, 24 Apr 2024 21:47:22 +0800, Ming Lei wrote:
> For devices with virt_boundary limit, the driver may provide zero max
> segment size, we have to set it as UINT_MAX at default. Otherwise, it
> may cause warning in driver when handling sglist.
> 
> Fix it by setting default max segment size as UINT_MAX.
> 
> 
> [...]

Applied, thanks!

[1/1] block: set default max segment size in case of virt_boundary
      commit: ffd379c13fc0ab2c7c4313e7a01c71d9d202cc88

Best regards,
-- 
Jens Axboe