lkml.org 
[lkml]   [2020]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH v12 2/9] 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>
    Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
    ---
    drivers/nvme/host/core.c | 39 ++++++++++++++++++++++-----------------
    1 file changed, 22 insertions(+), 17 deletions(-)

    diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
    index f5283b300e87..fedcc5f18e03 100644
    --- a/drivers/nvme/host/core.c
    +++ b/drivers/nvme/host/core.c
    @@ -1317,22 +1317,8 @@ static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *uio)
    metadata, meta_len, lower_32_bits(io.slba), NULL, 0);
    }

    -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;

    @@ -1348,7 +1334,26 @@ 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 u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns,
    + u8 opcode)
    +{
    + u32 effects = nvme_command_effects(ctrl, ns, opcode);

    /*
    * For simplicity, IO to all namespaces is quiesced even if the command
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-04-20 18:48    [W:2.995 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site