Skip to content

Commit 0a8a2c8

Browse files
sagigrimbergChristoph Hellwig
authored andcommitted
nvme-tcp: avoid repeated request completion
The request may be executed asynchronously, and rq->state may be changed to IDLE. To avoid repeated request completion, only MQ_RQ_COMPLETE of rq->state is checked in nvme_tcp_complete_timed_out. It is not safe, so need adding check IDLE for rq->state. Signed-off-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Chao Leng <lengchao@huawei.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
1 parent fdf58e0 commit 0a8a2c8

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/nvme/host/tcp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2168,7 +2168,7 @@ static void nvme_tcp_complete_timed_out(struct request *rq)
21682168
struct nvme_ctrl *ctrl = &req->queue->ctrl->ctrl;
21692169

21702170
nvme_tcp_stop_queue(ctrl, nvme_tcp_queue_id(req->queue));
2171-
if (!blk_mq_request_completed(rq)) {
2171+
if (blk_mq_request_started(rq) && !blk_mq_request_completed(rq)) {
21722172
nvme_req(rq)->status = NVME_SC_HOST_ABORTED_CMD;
21732173
blk_mq_complete_request(rq);
21742174
}

0 commit comments

Comments
 (0)