* Re: [PATCH] nvme-fc: Only call nvme_cleanup_cmd() for normal operations
2020-05-29 11:37 [PATCH] nvme-fc: Only call nvme_cleanup_cmd() for normal operations Daniel Wagner
@ 2020-06-02 12:50 ` Hannes Reinecke
2020-06-02 16:30 ` James Smart
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Hannes Reinecke @ 2020-06-02 12:50 UTC (permalink / raw)
To: Daniel Wagner, linux-nvme
Cc: Keith Busch, Max Gurtovoy, linux-kernel, James Smart
On 5/29/20 1:37 PM, Daniel Wagner wrote:
> Asynchronous event notifications do not have an request
> associated. When fcp_io() fails we unconditionally call
> nvme_cleanup_cmd() which leads to a crash.
>
> Fixes: 16686f3a6c3c ("nvme: move common call to nvme_cleanup_cmd to core layer")
> Cc: Max Gurtovoy <maxg@mellanox.com>
> Signed-off-by: Daniel Wagner <dwagner@suse.de>
> ---
> drivers/nvme/host/fc.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
> index 7dfc4a2ecf1e..287a3e8ea317 100644
> --- a/drivers/nvme/host/fc.c
> +++ b/drivers/nvme/host/fc.c
> @@ -2300,10 +2300,11 @@ nvme_fc_start_fcp_op(struct nvme_fc_ctrl *ctrl, struct nvme_fc_queue *queue,
> opstate = atomic_xchg(&op->state, FCPOP_STATE_COMPLETE);
> __nvme_fc_fcpop_chk_teardowns(ctrl, op, opstate);
>
> - if (!(op->flags & FCOP_FLAGS_AEN))
> + if (!(op->flags & FCOP_FLAGS_AEN)) {
> nvme_fc_unmap_data(ctrl, op->rq, op);
> + nvme_cleanup_cmd(op->rq);
> + }
>
> - nvme_cleanup_cmd(op->rq);
> nvme_fc_ctrl_put(ctrl);
>
> if (ctrl->rport->remoteport.port_state == FC_OBJSTATE_ONLINE &&
>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Cheers,
Hannes
--
Dr. Hannes Reinecke Teamlead Storage & Networking
hare@suse.de +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] nvme-fc: Only call nvme_cleanup_cmd() for normal operations
2020-05-29 11:37 [PATCH] nvme-fc: Only call nvme_cleanup_cmd() for normal operations Daniel Wagner
2020-06-02 12:50 ` Hannes Reinecke
@ 2020-06-02 16:30 ` James Smart
2020-06-03 17:46 ` Himanshu Madhani
2020-06-09 14:14 ` Christoph Hellwig
3 siblings, 0 replies; 5+ messages in thread
From: James Smart @ 2020-06-02 16:30 UTC (permalink / raw)
To: Daniel Wagner, linux-nvme; +Cc: linux-kernel, Keith Busch, Max Gurtovoy
On 5/29/2020 4:37 AM, Daniel Wagner wrote:
> Asynchronous event notifications do not have an request
> associated. When fcp_io() fails we unconditionally call
> nvme_cleanup_cmd() which leads to a crash.
>
> Fixes: 16686f3a6c3c ("nvme: move common call to nvme_cleanup_cmd to core layer")
> Cc: Max Gurtovoy <maxg@mellanox.com>
> Signed-off-by: Daniel Wagner <dwagner@suse.de>
> ---
> drivers/nvme/host/fc.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
> index 7dfc4a2ecf1e..287a3e8ea317 100644
> --- a/drivers/nvme/host/fc.c
> +++ b/drivers/nvme/host/fc.c
> @@ -2300,10 +2300,11 @@ nvme_fc_start_fcp_op(struct nvme_fc_ctrl *ctrl, struct nvme_fc_queue *queue,
> opstate = atomic_xchg(&op->state, FCPOP_STATE_COMPLETE);
> __nvme_fc_fcpop_chk_teardowns(ctrl, op, opstate);
>
> - if (!(op->flags & FCOP_FLAGS_AEN))
> + if (!(op->flags & FCOP_FLAGS_AEN)) {
> nvme_fc_unmap_data(ctrl, op->rq, op);
> + nvme_cleanup_cmd(op->rq);
> + }
>
> - nvme_cleanup_cmd(op->rq);
> nvme_fc_ctrl_put(ctrl);
>
> if (ctrl->rport->remoteport.port_state == FC_OBJSTATE_ONLINE &&
Reviewed-by: James Smart <james.smart@broadcom.com>
-- james
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] nvme-fc: Only call nvme_cleanup_cmd() for normal operations
2020-05-29 11:37 [PATCH] nvme-fc: Only call nvme_cleanup_cmd() for normal operations Daniel Wagner
2020-06-02 12:50 ` Hannes Reinecke
2020-06-02 16:30 ` James Smart
@ 2020-06-03 17:46 ` Himanshu Madhani
2020-06-09 14:14 ` Christoph Hellwig
3 siblings, 0 replies; 5+ messages in thread
From: Himanshu Madhani @ 2020-06-03 17:46 UTC (permalink / raw)
To: Daniel Wagner, linux-nvme
Cc: Keith Busch, Max Gurtovoy, linux-kernel, James Smart
On 5/29/20 6:37 AM, Daniel Wagner wrote:
> Asynchronous event notifications do not have an request
> associated. When fcp_io() fails we unconditionally call
> nvme_cleanup_cmd() which leads to a crash.
>
> Fixes: 16686f3a6c3c ("nvme: move common call to nvme_cleanup_cmd to core layer")
> Cc: Max Gurtovoy <maxg@mellanox.com>
> Signed-off-by: Daniel Wagner <dwagner@suse.de>
> ---
> drivers/nvme/host/fc.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
> index 7dfc4a2ecf1e..287a3e8ea317 100644
> --- a/drivers/nvme/host/fc.c
> +++ b/drivers/nvme/host/fc.c
> @@ -2300,10 +2300,11 @@ nvme_fc_start_fcp_op(struct nvme_fc_ctrl *ctrl, struct nvme_fc_queue *queue,
> opstate = atomic_xchg(&op->state, FCPOP_STATE_COMPLETE);
> __nvme_fc_fcpop_chk_teardowns(ctrl, op, opstate);
>
> - if (!(op->flags & FCOP_FLAGS_AEN))
> + if (!(op->flags & FCOP_FLAGS_AEN)) {
> nvme_fc_unmap_data(ctrl, op->rq, op);
> + nvme_cleanup_cmd(op->rq);
> + }
>
> - nvme_cleanup_cmd(op->rq);
> nvme_fc_ctrl_put(ctrl);
>
> if (ctrl->rport->remoteport.port_state == FC_OBJSTATE_ONLINE &&
Reviewed-by: Himanshu Madhani <hmadhani2024@gmail.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] nvme-fc: Only call nvme_cleanup_cmd() for normal operations
2020-05-29 11:37 [PATCH] nvme-fc: Only call nvme_cleanup_cmd() for normal operations Daniel Wagner
` (2 preceding siblings ...)
2020-06-03 17:46 ` Himanshu Madhani
@ 2020-06-09 14:14 ` Christoph Hellwig
3 siblings, 0 replies; 5+ messages in thread
From: Christoph Hellwig @ 2020-06-09 14:14 UTC (permalink / raw)
To: Daniel Wagner
Cc: linux-nvme, Keith Busch, Max Gurtovoy, linux-kernel, James Smart
Thanks, applied to nvme-5.8 with some edits to the commit message.
^ permalink raw reply [flat|nested] 5+ messages in thread