| Message ID | 20240808070604.179799-3-w@uter.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3,1/3] nbd: implement the WRITE_ZEROES command | expand |
On 2024/08/08 0:06, Wouter Verhelst wrote: > The version of the NBD protocol implemented by the kernel driver > currently has a 32 bit field for length values. As the NBD protocol uses > bytes as a unit of length, length values larger than 2^32 bytes cannot > be expressed. > > Update the max_hw_discard_sectors field to match that. > > Signed-off-by: Wouter Verhelst <w@uter.be> > Fixes: 268283244c0f018dec8bf4a9c69ce50684561f46 > Cc: Damien Le Moal <dlemoal@kernel.org> > --- > drivers/block/nbd.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c > index fdcf0bbedf3b..235ab5f59608 100644 > --- a/drivers/block/nbd.c > +++ b/drivers/block/nbd.c > @@ -339,7 +339,7 @@ static int __nbd_set_size(struct nbd_device *nbd, loff_t bytesize, > > lim = queue_limits_start_update(nbd->disk->queue); > if (nbd->config->flags & NBD_FLAG_SEND_TRIM) > - lim.max_hw_discard_sectors = UINT_MAX; > + lim.max_hw_discard_sectors = UINT_MAX >> SECTOR_SHIFT; > else > lim.max_hw_discard_sectors = 0; > if (!(nbd->config->flags & NBD_FLAG_SEND_FLUSH)) { Looks good to me. Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
On 8/8/24 1:06 AM, Wouter Verhelst wrote: > The version of the NBD protocol implemented by the kernel driver > currently has a 32 bit field for length values. As the NBD protocol uses > bytes as a unit of length, length values larger than 2^32 bytes cannot > be expressed. > > Update the max_hw_discard_sectors field to match that. > > Signed-off-by: Wouter Verhelst <w@uter.be> > Fixes: 268283244c0f018dec8bf4a9c69ce50684561f46 This isn't the correct way to have a fixes line. In general, please don't nest next versions under the previous posting, and it's strongly recommended to have a cover letter that includes that changed from version N to N+1. Otherwise we have to guess... So please include that when posting v4.
On Fri, Aug 09, 2024 at 09:34:55AM -0600, Jens Axboe wrote: > On 8/8/24 1:06 AM, Wouter Verhelst wrote: > > Fixes: 268283244c0f018dec8bf4a9c69ce50684561f46 > > This isn't the correct way to have a fixes line. Apologies Jens; beginner's mistake. > In general, please don't nest next versions under the previous posting, > and it's strongly recommended to have a cover letter that includes that > changed from version N to N+1. Otherwise we have to guess... So please > include that when posting v4. Right, sorry. "git help send-email" gave an example of how to do something like this for a "v2" patch series, which made me assume (incorrectly) that this is what would be wanted. I should have checked first, I guess. Will send v4 (hopefully the last one) shortly with those fixes.
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index fdcf0bbedf3b..235ab5f59608 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -339,7 +339,7 @@ static int __nbd_set_size(struct nbd_device *nbd, loff_t bytesize, lim = queue_limits_start_update(nbd->disk->queue); if (nbd->config->flags & NBD_FLAG_SEND_TRIM) - lim.max_hw_discard_sectors = UINT_MAX; + lim.max_hw_discard_sectors = UINT_MAX >> SECTOR_SHIFT; else lim.max_hw_discard_sectors = 0; if (!(nbd->config->flags & NBD_FLAG_SEND_FLUSH)) {
The version of the NBD protocol implemented by the kernel driver currently has a 32 bit field for length values. As the NBD protocol uses bytes as a unit of length, length values larger than 2^32 bytes cannot be expressed. Update the max_hw_discard_sectors field to match that. Signed-off-by: Wouter Verhelst <w@uter.be> Fixes: 268283244c0f018dec8bf4a9c69ce50684561f46 Cc: Damien Le Moal <dlemoal@kernel.org> --- drivers/block/nbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)