lkml.org 
[lkml]   [2021]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 26/40] nvme-core: add cancel tagset helpers
    Date
    From: Chao Leng <lengchao@huawei.com>

    [ Upstream commit 2547906982e2e6a0d42f8957f55af5bb51a7e55f ]

    Add nvme_cancel_tagset and nvme_cancel_admin_tagset for tear down and
    reconnection error handling.

    Signed-off-by: Chao Leng <lengchao@huawei.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvme/host/core.c | 20 ++++++++++++++++++++
    drivers/nvme/host/nvme.h | 2 ++
    2 files changed, 22 insertions(+)

    diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
    index c2cabd77884bf..95d77a17375e1 100644
    --- a/drivers/nvme/host/core.c
    +++ b/drivers/nvme/host/core.c
    @@ -317,6 +317,26 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved)
    }
    EXPORT_SYMBOL_GPL(nvme_cancel_request);

    +void nvme_cancel_tagset(struct nvme_ctrl *ctrl)
    +{
    + if (ctrl->tagset) {
    + blk_mq_tagset_busy_iter(ctrl->tagset,
    + nvme_cancel_request, ctrl);
    + blk_mq_tagset_wait_completed_request(ctrl->tagset);
    + }
    +}
    +EXPORT_SYMBOL_GPL(nvme_cancel_tagset);
    +
    +void nvme_cancel_admin_tagset(struct nvme_ctrl *ctrl)
    +{
    + if (ctrl->admin_tagset) {
    + blk_mq_tagset_busy_iter(ctrl->admin_tagset,
    + nvme_cancel_request, ctrl);
    + blk_mq_tagset_wait_completed_request(ctrl->admin_tagset);
    + }
    +}
    +EXPORT_SYMBOL_GPL(nvme_cancel_admin_tagset);
    +
    bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
    enum nvme_ctrl_state new_state)
    {
    diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
    index e392d6cd92ced..62e5401865fee 100644
    --- a/drivers/nvme/host/nvme.h
    +++ b/drivers/nvme/host/nvme.h
    @@ -468,6 +468,8 @@ static inline void nvme_put_ctrl(struct nvme_ctrl *ctrl)

    void nvme_complete_rq(struct request *req);
    bool nvme_cancel_request(struct request *req, void *data, bool reserved);
    +void nvme_cancel_tagset(struct nvme_ctrl *ctrl);
    +void nvme_cancel_admin_tagset(struct nvme_ctrl *ctrl);
    bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
    enum nvme_ctrl_state new_state);
    bool nvme_wait_reset(struct nvme_ctrl *ctrl);
    --
    2.27.0
    \
     
     \ /
      Last update: 2021-02-24 15:21    [W:8.348 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site