nvmet: ignore EOPNOTSUPP for discard
Subsystems (2)
Christoph Hellwig
maintainerPATCH 1/2 nvmet: ignore EOPNOTSUPP for discard
NVMe DSM is a pure hint, so if the underlying device / file system does not support discard-like operations we should not fail the operation but rather return success.
Signed-off-by: Christoph Hellwig <hch at lst.de> Reviewed by: Chaitanya Kulkarni <chaitanya.kulkarni at wdc.com>.
--- drivers/nvme/target/io-cmd-bdev.c | 7 ++++--- drivers/nvme/target/io-cmd-file.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
drivers/nvme/target/io-cmd-bdev.c +4 -3
@@ -194,11 +194,12 @@ static u16 nvmet_bdev_discard_range(struct nvmet_req *req,le64_to_cpu (range->slba) << (ns->blksize_shift -9 ),le32_to_cpu (range->nlb) << (ns->blksize_shift -9 ), GFP_KERNEL, 0, bio); - -if (ret) +if (ret && ret != -EOPNOTSUPP ) { req->error_slba =le64_to_cpu (range->slba); +return blk_to_nvme_status (req,errno_to_blk_status (ret)); + } -return blk_to_nvme_status (req,errno_to_blk_status (ret)); +return 0 ; }static void nvmet_bdev_execute_discard (struct nvmet_req *req)
drivers/nvme/target/io-cmd-file.c +1 -1
@@ -297,7 +297,7 @@ static void nvmet_file_execute_discard(struct nvmet_req *req) } ret =vfs_fallocate (req->ns->file, mode, offset, len); -if (ret) { +if (ret && ret != -EOPNOTSUPP ) { req->error_slba =le64_to_cpu (range.slba); status =errno_to_nvme_status (req, ret);break ;
Signature · 1 line
2.20.1
Christoph Hellwig
maintainerPATCH 2/2 nvmet: avoid double errno conversions
Use errno_to_nvme_status to convert from a negative errno to a nvme status field instead of going through a blk_status_t.
Also remove the pointless status variable innvmet_bdev_execute_write_zeroes.
--- drivers/nvme/target/io-cmd-bdev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/nvme/target/io-cmd-bdev.c +2 -4
@@ -196,7 +196,7 @@ static u16 nvmet_bdev_discard_range(struct nvmet_req *req, GFP_KERNEL, 0, bio);if (ret && ret != -EOPNOTSUPP ) { req->error_slba =le64_to_cpu (range->slba); -return blk_to_nvme_status (req,errno_to_blk_status (ret)); +return errno_to_nvme_status (req, ret); }return 0 ;
@@ -253,7 +253,6 @@ static void nvmet_bdev_execute_write_zeroes(struct nvmet_req *req) {struct nvme_write_zeroes_cmd *write_zeroes = &req->cmd->write_zeroes;struct bio *bio =NULL ; -u16 status =NVME_SC_SUCCESS ;sector_t sector;sector_t nr_sector;int ret;
@@ -265,13 +264,12 @@ static void nvmet_bdev_execute_write_zeroes(struct nvmet_req *req) ret =__blkdev_issue_zeroout (req->ns->bdev, sector, nr_sector,GFP_KERNEL , &bio,0 ); - status =blk_to_nvme_status (req,errno_to_blk_status (ret));if (bio) { bio->bi_private = req; bio->bi_end_io = nvmet_bio_done;submit_bio (bio); }else { -nvmet_req_complete (req, status); +nvmet_req_complete (req,errno_to_nvme_status (req, ret)); } }
Signature · 1 line
2.20.1
PATCH 2/2 nvmet: avoid double errno conversions
Looks good.
Quoted 48 lines · Christoph Hellwig
Use
errno_to_nvme_statusto convert from a negative errno to a nvme status field instead of going through ablk_status_t.Also remove the pointless status variable in
nvmet_bdev_execute_write_zeroes.Signed-off-by Christoph Hellwig <hch at lst.de>--- drivers/nvme/target/io-cmd-bdev.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)drivers/nvme/target/io-cmd-bdev.c +2
-4@@ -196,7 +196,7 @@ static u16 nvmet_bdev_discard_range(struct nvmet_req *req, GFP_KERNEL, 0, bio);if (ret && ret != -EOPNOTSUPP ) { req->error_slba =le64_to_cpu (range->slba); -return blk_to_nvme_status (req,errno_to_blk_status (ret)); +return errno_to_nvme_status (req, ret); }return 0 ;@@ -253,7 +253,6 @@ static void nvmet_bdev_execute_write_zeroes(struct nvmet_req *req) {struct nvme_write_zeroes_cmd *write_zeroes = &req->cmd->write_zeroes;struct bio *bio =NULL ; -u16 status =NVME_SC_SUCCESS ;sector_t sector;sector_t nr_sector;int ret;@@ -265,13 +264,12 @@ static void nvmet_bdev_execute_write_zeroes(struct nvmet_req *req) ret =__blkdev_issue_zeroout (req->ns->bdev, sector, nr_sector,GFP_KERNEL , &bio,0 ); - status =blk_to_nvme_status (req,errno_to_blk_status (ret));if (bio) { bio->bi_private = req; bio->bi_end_io = nvmet_bio_done;submit_bio (bio); }else { -nvmet_req_complete (req, status); +nvmet_req_complete (req,errno_to_nvme_status (req, ret)); } }
Sagi Grimberg
maintainerPATCH 2/2 nvmet: avoid double errno conversions
In reply to Christoph HellwigPATCH 1/2 nvmet: ignore EOPNOTSUPP for discard
In reply to Christoph HellwigWe can keep the original reviewed-by.
Quoted 45 lines · Christoph Hellwig
NVMe DSM is a pure hint, so if the underlying device / file system does not support discard-like operations we should not fail the operation but rather return success.
Signed-off-by: Christoph Hellwig <hch at lst.de> Reviewed by: Chaitanya Kulkarni <chaitanya.kulkarni at wdc.com>.
--- drivers/nvme/target/io-cmd-bdev.c | 7 ++++--- drivers/nvme/target/io-cmd-file.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)drivers/nvme/target/io-cmd-bdev.c +4
-3@@ -194,11 +194,12 @@ static u16 nvmet_bdev_discard_range(struct nvmet_req *req,le64_to_cpu (range->slba) << (ns->blksize_shift -9 ),le32_to_cpu (range->nlb) << (ns->blksize_shift -9 ), GFP_KERNEL, 0, bio); - -if (ret) +if (ret && ret != -EOPNOTSUPP ) { req->error_slba =le64_to_cpu (range->slba); +return blk_to_nvme_status (req,errno_to_blk_status (ret)); + } -return blk_to_nvme_status (req,errno_to_blk_status (ret)); +return 0 ; }static void nvmet_bdev_execute_discard (struct nvmet_req *req)drivers/nvme/target/io-cmd-file.c +1
-1@@ -297,7 +297,7 @@ static void nvmet_file_execute_discard(struct nvmet_req *req) } ret =vfs_fallocate (req->ns->file, mode, offset, len); -if (ret) { +if (ret && ret != -EOPNOTSUPP ) { req->error_slba =le64_to_cpu (range.slba); status =errno_to_nvme_status (req, ret);break ;
PATCH 1/2 nvmet: ignore EOPNOTSUPP for discard
In reply to Christoph HellwigQuoted 16 lines · Christoph Hellwig
NVMe DSM is a pure hint, so if the underlying device / file system does not support discard-like operations we should not fail the operation but rather return success.
Signed-off-by: Christoph Hellwig <hch at lst.de> Reviewed by: Chaitanya Kulkarni <chaitanya.kulkarni at wdc.com>.
--- drivers/nvme/target/io-cmd-bdev.c | 7 ++++--- drivers/nvme/target/io-cmd-file.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)drivers/nvme/target/io-cmd-bdev.c +0
-0
drivers/nvme/target/io-cmd-bdev.c static u16 nvmet_bdev_discard_range(struct nvmet_req *req, · line 200
Quoted 9 lines
drivers/nvme/target/io-cmd-bdev.c +3
-2@@ -194,11 +194,12 @@ static u16 nvmet_bdev_discard_range(struct nvmet_req *req,le64_to_cpu (range->slba) << (ns->blksize_shift -9 ),le32_to_cpu (range->nlb) << (ns->blksize_shift -9 ), GFP_KERNEL, 0, bio); - -if (ret) +if (ret && ret != -EOPNOTSUPP ) { req->error_slba =le64_to_cpu (range->slba); +return blk_to_nvme_status (req,errno_to_blk_status (ret)); + }
this was fixed in the past by IsraelR commit and somehow got broken in commit 3b031d15995f3e4c (nvmet: add error log support for bdev backend)
can you please add a "fixes" clause to the commit message ?
drivers/nvme/target/io-cmd-bdev.c static u16 nvmet_bdev_discard_range(struct nvmet_req *req, · line 202
Quoted 3 lines
drivers/nvme/target/io-cmd-bdev.c +1
-1-return blk_to_nvme_status (req,errno_to_blk_status (ret)); +return 0 ;
maybe we can return NVME_SC_SUCCESS (not really a must)
Quoted 16 lines
drivers/nvme/target/io-cmd-bdev.c +0
-0}static void nvmet_bdev_execute_discard (struct nvmet_req *req)drivers/nvme/target/io-cmd-file.c +1
-1@@ -297,7 +297,7 @@ static void nvmet_file_execute_discard(struct nvmet_req *req) } ret =vfs_fallocate (req->ns->file, mode, offset, len); -if (ret) { +if (ret && ret != -EOPNOTSUPP ) { req->error_slba =le64_to_cpu (range.slba); status =errno_to_nvme_status (req, ret);break ;