nvme: quiet user passthrough command errors

The driver is spamming the kernel logs for entirely harmless errors from
user space submitting unsupported commands. Just silence the errors.
The application has direct access to command status, so there's no need
to log these.

And since every passthrough command now uses the quiet flag, move the
setting to the common initializer.

Signed-off-by: Keith Busch <[email protected]>
Reviewed-by: Alan Adamson <[email protected]>
Reviewed-by: Jens Axboe <[email protected]>
Reviewed-by: Kanchan Joshi <[email protected]>
Reviewed-by: Chaitanya Kulkarni <[email protected]>
Reviewed-by: Daniel Wagner <[email protected]>
Tested-by: Alan Adamson <[email protected]>
Signed-off-by: Christoph Hellwig <[email protected]>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index dc42206005855dce9ce9cc2ec60429995f246573..da55ce45ac7013be5839979228438175b8a8f5d3 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -675,6 +675,7 @@ void nvme_init_request(struct request *req, struct nvme_command *cmd)
        if (req->mq_hctx->type == HCTX_TYPE_POLL)
                req->cmd_flags |= REQ_POLLED;
        nvme_clear_nvme_request(req);
+       req->rq_flags |= RQF_QUIET;
        memcpy(nvme_req(req)->cmd, cmd, sizeof(*cmd));
 }
 EXPORT_SYMBOL_GPL(nvme_init_request);
@@ -1037,7 +1038,6 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd,
                        goto out;
        }
 
-       req->rq_flags |= RQF_QUIET;
        ret = nvme_execute_rq(req, at_head);
        if (result && ret >= 0)
                *result = nvme_req(req)->result;
@@ -1227,7 +1227,6 @@ static void nvme_keep_alive_work(struct work_struct *work)
        rq->timeout = ctrl->kato * HZ;
        rq->end_io = nvme_keep_alive_end_io;
        rq->end_io_data = ctrl;
-       rq->rq_flags |= RQF_QUIET;
        blk_execute_rq_nowait(rq, false);
 }
 

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 31e577b01257d6196d71523b20575eea8d99e4a8..02b5578773a178d314bbe865b1229e71d05dda6e 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1436,7 +1436,6 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req)
 
        abort_req->end_io = abort_endio;
        abort_req->end_io_data = NULL;
-       abort_req->rq_flags |= RQF_QUIET;
        blk_execute_rq_nowait(abort_req, false);
 
        /*
@@ -2490,7 +2489,6 @@ static int nvme_delete_queue(struct nvme_queue *nvmeq, u8 opcode)
        req->end_io_data = nvmeq;
 
        init_completion(&nvmeq->delete_done);
-       req->rq_flags |= RQF_QUIET;
        blk_execute_rq_nowait(req, false);
        return 0;
 }