[OS-BUILD PATCHv3 1/5] nvme: Return BLK_STS_TARGET if the DNR bit is set

From: Mike Snitzer <snitzer(a)redhat.com&gt; nvme: Return BLK_STS_TARGET if the DNR bit is set BZ: 1948690 Upstream Status: RHEL-only Signed-off-by: Mike Snitzer <snitzer(a)redhat.com&gt; rhel-8.git commit ef4ab90c12db5e0e50800ec323736b95be7a6ff5 Author: Mike Snitzer <snitzer(a)redhat.com&gt; Date: Tue Aug 25 21:52:45 2020 -0400 [nvme] nvme: Return BLK_STS_TARGET if the DNR bit is set Message-id: <20200825215248.2291-8-snitzer(a)redhat.com&gt; Patchwork-id: 325178 Patchwork-instance: patchwork O-Subject: [RHEL8.3 PATCH 07/10] nvme: Return BLK_STS_TARGET if the DNR bit is set Bugzilla: 1843515 RH-Acked-by: David Milburn <dmilburn(a)redhat.com&gt; RH-Acked-by: Gopal Tiwari <gtiwari(a)redhat.com&gt; RH-Acked-by: Ewan Milne <emilne(a)redhat.com&gt; BZ: 1843515 Upstream Status: RHEL-only If the DNR bit is set we should not retry the command, even if the standard status evaluation indicates so. SUSE is carrying this patch in their kernel: https://lwn.net/Articles/800370/ Based on patch posted for upstream inclusion but rejected: v1: https://lore.kernel.org/linux-nvme/20190806111036.113233-1-hare@suse.de/ v2: https://lore.kernel.org/linux-nvme/20190807071208.101882-1-hare@suse.de/ v2-keith: https://lore.kernel.org/linux-nvme/20190807144725.GB25621@localhost.local... v3: https://lore.kernel.org/linux-nvme/20190812075147.79598-1-hare@suse.de/ v3-keith: https://lore.kernel.org/linux-nvme/20190813141510.GB32686@localhost.local... This commit's change is basically "v3-keith". Signed-off-by: Mike Snitzer <snitzer(a)redhat.com&gt; Signed-off-by: Frantisek Hrbata <fhrbata(a)redhat.com&gt; diff a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -237,6 +237,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) static blk_status_t nvme_error_status(u16 status) { + if (unlikely(status & NVME_SC_DNR)) + return BLK_STS_TARGET; + switch (status & 0x7ff) { case NVME_SC_SUCCESS: return BLK_STS_OK; -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1024