[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    nvme: also return I/O command effects from nvme_command_effects
From:       Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date:       2022-12-30 0:53:49
Message-ID: git-mailbomb-linux-master-831ed60c2aca2d7c517b2da22897a90224a97d27 () kernel ! org
[Download RAW message or body]

Commit:     831ed60c2aca2d7c517b2da22897a90224a97d27
Parent:     2a459f6933e1c459bffb7cc73fd6c900edc714bd
Refname:    refs/heads/master
Web:        https://git.kernel.org/torvalds/c/831ed60c2aca2d7c517b2da22897a90224a97d27
Author:     Christoph Hellwig <hch@lst.de>
AuthorDate: Wed Dec 21 10:12:17 2022 +0100
Committer:  Christoph Hellwig <hch@lst.de>
CommitDate: Wed Dec 28 06:26:25 2022 -1000

    nvme: also return I/O command effects from nvme_command_effects
    
    To be able to use the Commands Supported and Effects Log for allowing
    unprivileged passtrough, it needs to be corretly reported for I/O
    commands as well.  Return the I/O command effects from
    nvme_command_effects, and also add a default list of effects for the
    NVM command set.  For other command sets, the Commands Supported and
    Effects log is required to be present already.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Keith Busch <kbusch@kernel.org>
    Reviewed-by: Kanchan Joshi <joshi.k@samsung.com>
---
 drivers/nvme/host/core.c | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index cda1361e6d4fb..d307ae4d8a575 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1074,6 +1074,18 @@ static u32 nvme_known_admin_effects(u8 opcode)
 	return 0;
 }
 
+static u32 nvme_known_nvm_effects(u8 opcode)
+{
+	switch (opcode) {
+	case nvme_cmd_write:
+	case nvme_cmd_write_zeroes:
+	case nvme_cmd_write_uncor:
+		 return NVME_CMD_EFFECTS_LBCC;
+	default:
+		return 0;
+	}
+}
+
 u32 nvme_command_effects(struct nvme_ctrl *ctrl, struct nvme_ns *ns, u8 opcode)
 {
 	u32 effects = 0;
@@ -1081,16 +1093,24 @@ u32 nvme_command_effects(struct nvme_ctrl *ctrl, struct nvme_ns *ns, u8 opcode)
 	if (ns) {
 		if (ns->head->effects)
 			effects = le32_to_cpu(ns->head->effects->iocs[opcode]);
+		if (ns->head->ids.csi == NVME_CAP_CSS_NVM)
+			effects |= nvme_known_nvm_effects(opcode);
 		if (effects & ~(NVME_CMD_EFFECTS_CSUPP | NVME_CMD_EFFECTS_LBCC))
 			dev_warn_once(ctrl->device,
-				"IO command:%02x has unhandled effects:%08x\n",
+				"IO command:%02x has unusual effects:%08x\n",
 				opcode, effects);
-		return 0;
-	}
 
-	if (ctrl->effects)
-		effects = le32_to_cpu(ctrl->effects->acs[opcode]);
-	effects |= nvme_known_admin_effects(opcode);
+		/*
+		 * NVME_CMD_EFFECTS_CSE_MASK causes a freeze all I/O queues,
+		 * which would deadlock when done on an I/O command.  Note that
+		 * We already warn about an unusual effect above.
+		 */
+		effects &= ~NVME_CMD_EFFECTS_CSE_MASK;
+	} else {
+		if (ctrl->effects)
+			effects = le32_to_cpu(ctrl->effects->acs[opcode]);
+		effects |= nvme_known_admin_effects(opcode);
+	}
 
 	return effects;
 }
[prev in list] [next in list] [prev in thread] [next in thread]