Messages in this thread Patch in this message | | | From | Logan Gunthorpe <> | Date | Fri, 25 Oct 2019 14:25:34 -0600 | Subject | [RFC PATCH 2/3] nvme: Create helper function to obtain command effects |
| |
Separate the code to obtain command effects from the code to start a passthru request and open code nvme_known_admin_effects() in the new helper.
The new helper function will be necessary for nvmet passthru code to determine if we need to change out of interrupt context to handle the effects.
Signed-off-by: Logan Gunthorpe <logang@deltatee.com> --- drivers/nvme/host/core.c | 41 +++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index c2bde988d1aa..2b4f0ea55f8d 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -886,22 +886,8 @@ static void *nvme_add_user_metadata(struct bio *bio, void __user *ubuf, return ERR_PTR(ret); } -static u32 nvme_known_admin_effects(u8 opcode) -{ - switch (opcode) { - case nvme_admin_format_nvm: - return NVME_CMD_EFFECTS_CSUPP | NVME_CMD_EFFECTS_LBCC | - NVME_CMD_EFFECTS_CSE_MASK; - case nvme_admin_sanitize_nvm: - return NVME_CMD_EFFECTS_CSE_MASK; - default: - break; - } - return 0; -} - -static u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns, - u8 opcode) +static u32 nvme_command_effects(struct nvme_ctrl *ctrl, struct nvme_ns *ns, + u8 opcode) { u32 effects = 0; @@ -917,7 +903,24 @@ static u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns, if (ctrl->effects) effects = le32_to_cpu(ctrl->effects->acs[opcode]); - effects |= nvme_known_admin_effects(opcode); + + switch (opcode) { + case nvme_admin_format_nvm: + effects |= NVME_CMD_EFFECTS_CSUPP | NVME_CMD_EFFECTS_LBCC | + NVME_CMD_EFFECTS_CSE_MASK; + break; + case nvme_admin_sanitize_nvm: + effects |= NVME_CMD_EFFECTS_CSE_MASK; + break; + default: + break; + } + + return effects; +} + +static void nvme_passthru_start(struct nvme_ctrl *ctrl, u32 effects) +{ /* * For simplicity, IO to all namespaces is quiesced even if the command @@ -931,7 +934,6 @@ static u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns, nvme_start_freeze(ctrl); nvme_wait_freeze(ctrl); } - return effects; } static void nvme_update_formats(struct nvme_ctrl *ctrl) @@ -975,7 +977,8 @@ static void nvme_execute_passthru_rq(struct request *rq) struct gendisk *disk = ns ? ns->disk : NULL; u32 effects; - effects = nvme_passthru_start(ctrl, ns, cmd->common.opcode); + effects = nvme_command_effects(ctrl, ns, cmd->common.opcode); + nvme_passthru_start(ctrl, effects); blk_execute_rq(rq->q, disk, rq, 0); nvme_passthru_end(ctrl, effects); } -- 2.20.1
| |