When trying to issue write_zeroes command against TARGET with a 4K block
size, it ends up hitting the following condition at __blkdev_issue_zeroout:
if ((sector | nr_sects) & bs_mask)
return -EINVAL;
Causing the command to always fail.
Considering we need to add 1 to get the correct block count, that addition
needs to be performed in the native format, so we moved the +1 right after
le16_to_cpu prior to converting to 512b.
Signed-off-by: Rodrigo R. Galvao <[email protected]>
---
drivers/nvme/target/io-cmd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/nvme/target/io-cmd.c b/drivers/nvme/target/io-cmd.c
index 28bbdff..cd23441 100644
--- a/drivers/nvme/target/io-cmd.c
+++ b/drivers/nvme/target/io-cmd.c
@@ -173,8 +173,8 @@ static void nvmet_execute_write_zeroes(struct nvmet_req *req)
sector = le64_to_cpu(write_zeroes->slba) <<
(req->ns->blksize_shift - 9);
- nr_sector = (((sector_t)le16_to_cpu(write_zeroes->length)) <<
- (req->ns->blksize_shift - 9)) + 1;
+ nr_sector = (((sector_t)le16_to_cpu(write_zeroes->length) + 1) <<
+ (req->ns->blksize_shift - 9));
if (__blkdev_issue_zeroout(req->ns->bdev, sector, nr_sector,
GFP_KERNEL, &bio, 0))
--
2.7.4
Thanks, I've applied the patch with a simpler changelog explaining
the bug.
On 4/2/2018 8:38 PM, Keith Busch wrote:
> Thanks, I've applied the patch with a simpler changelog explaining
> the bug.
Thanks Rodrigo and Keith, I've tested with/w.o the patch and it works
well (with the fix only).
-Max.
>
> _______________________________________________
> Linux-nvme mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-nvme
>
Reviewed-by: Sagi Grimberg <[email protected]>