History

nbd: don't clear 'NBD_CMD_INFLIGHT' flag if request is not completed

Otherwise io will hung because request will only be completed if the cmd has the flag 'NBD_CMD_INFLIGHT'.

Yu Kuai committed 4 years ago

Commit 2895f181 parent c55b2b91 file · +14 −4Browse files

Unified · Split

drivers/block/nbd.c+14−4
@@ -403,13 +403,14 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req, · 402 unmodified lines
403403 if (!mutex_trylock(&cmd->lock))
404404 return BLK_EH_RESET_TIMER;
405405
406− if (!__test_and_clear_bit(NBD_CMD_INFLIGHT, &cmd->flags)) {
406+ if (!test_bit(NBD_CMD_INFLIGHT, &cmd->flags)) {
407407 mutex_unlock(&cmd->lock);
408408 return BLK_EH_DONE;
409409 }
410410
411411 if (!refcount_inc_not_zero(&nbd->config_refs)) {
412412 cmd->status = BLK_STS_TIMEOUT;
413+ __clear_bit(NBD_CMD_INFLIGHT, &cmd->flags);
413414 mutex_unlock(&cmd->lock);
414415 goto done;
415416 }
@@ -478,6 +479,7 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req, · 62 unmodified lines
478479 dev_err_ratelimited(nbd_to_dev(nbd), "Connection timed out\n");
479480 set_bit(NBD_RT_TIMEDOUT, &config->runtime_flags);
480481 cmd->status = BLK_STS_IOERR;
482+ __clear_bit(NBD_CMD_INFLIGHT, &cmd->flags);
481483 mutex_unlock(&cmd->lock);
482484 sock_shutdown(nbd);
483485 nbd_config_put(nbd);
@@ -745,7 +747,7 @@ static struct nbd_cmd *nbd_handle_reply(struct nbd_device *nbd, int index, · 261 unmodified lines
745747 cmd = blk_mq_rq_to_pdu(req);
746748
747749 mutex_lock(&cmd->lock);
748− if (!__test_and_clear_bit(NBD_CMD_INFLIGHT, &cmd->flags)) {
750+ if (!test_bit(NBD_CMD_INFLIGHT, &cmd->flags)) {
749751 dev_err(disk_to_dev(nbd->disk), "Suspicious reply %d (status %u flags %lu)",
750752 tag, cmd->status, cmd->flags);
751753 ret = -ENOENT;
@@ -854,8 +856,16 @@ static void recv_work(struct work_struct *work) · 102 unmodified lines
854856 }
855857
856858 rq = blk_mq_rq_from_pdu(cmd);
857− if (likely(!blk_should_fake_timeout(rq->q)))
858− blk_mq_complete_request(rq);
859+ if (likely(!blk_should_fake_timeout(rq->q))) {
860+ bool complete;
861+
862+ mutex_lock(&cmd->lock);
863+ complete = __test_and_clear_bit(NBD_CMD_INFLIGHT,
864+ &cmd->flags);
865+ mutex_unlock(&cmd->lock);
866+ if (complete)
867+ blk_mq_complete_request(rq);
868+ }
859869 percpu_ref_put(&q->q_usage_counter);
860870 }
861871

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t