From: Chaitanya Kulkarni <kch@nvidia.com>

Date: Sun, 10 Apr 2022 20:12:49 -0700

Subject: nvme: don't print verbose errors for internal passthrough requests

Patch-mainline: v5.18-rc3

Git-commit: b42b6f4485e3f0970e11f73df6202eeaf9f53a3e

References: bsc#1202187

Use the RQF_QUIET flag to skip the newly added verbose error reporting,

and set the flag in __nvme_submit_sync_cmd, which is used for most

internal passthrough requests where we do expect errors (e.g. due to

probing for optional functionality).  This is similar to what the SCSI

verbose error logging does.

Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>

Reviewed-by: Alan Adamson <alan.adamson@oracle.com>

Reviewed-by: Keith Busch <kbusch@kernel.org>

Reviewed-by: Sagi Grimberg <sagi@grimberg.me>

Tested-by: Alan Adamson <alan.adamson@oracle.com>

Tested-by: Yi Zhang <yi.zhang@redhat.com>

Signed-off-by: Christoph Hellwig <hch@lst.de>

Acked-by: Daniel Wagner <dwagner@suse.de>

---

 drivers/nvme/host/core.c |    3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/nvme/host/core.c

+++ b/drivers/nvme/host/core.c

@@ -361,7 +361,7 @@ static inline void nvme_end_req(struct r

 {

 	blk_status_t status = nvme_error_status(nvme_req(req)->status);

-	if (unlikely(nvme_req(req)->status != NVME_SC_SUCCESS))

+	if (unlikely(nvme_req(req)->status && !(req->rq_flags & RQF_QUIET)))

 		nvme_log_error(req);

 	if (IS_ENABLED(CONFIG_BLK_DEV_ZONED) &&

@@ -1099,6 +1099,7 @@ int __nvme_submit_sync_cmd(struct reques

 			goto out;

 	}

+	req->rq_flags |= RQF_QUIET;

 	ret = nvme_execute_rq(NULL, req, at_head);

 	if (result && ret >= 0)

 		*result = nvme_req(req)->result;