Unverified Commit 46b93d6d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12501 nbd: fix race between timeout and normal completion 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Qixing <zhengqixing@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FPWKKIQQEZ2ANDSDBF6R3SRI7B6MT44V/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYQRD 
 
Link:https://gitee.com/openeuler/kernel/pulls/12501

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents a5fe3270 90578327

drivers/block/nbd.c

+12 −1
Original line number Diff line number Diff line
@@ -169,6 +169,17 @@ static void nbd_requeue_cmd(struct nbd_cmd *cmd) 
{

	struct request *req = blk_mq_rq_from_pdu(cmd);



	lockdep_assert_held(&cmd->lock);



	/*

	 * Clear INFLIGHT flag so that this cmd won't be completed in

	 * normal completion path

	 *

	 * INFLIGHT flag will be set when the cmd is queued to nbd next

	 * time.

	 */

	__clear_bit(NBD_CMD_INFLIGHT, &cmd->flags);



	if (!test_and_set_bit(NBD_CMD_REQUEUED, &cmd->flags))

		blk_mq_requeue_request(req, true);

}
@@ -434,8 +445,8 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req, 
					nbd_mark_nsock_dead(nbd, nsock, 1);

				mutex_unlock(&nsock->tx_lock);

			}

			mutex_unlock(&cmd->lock);

			nbd_requeue_cmd(cmd);

			mutex_unlock(&cmd->lock);

			nbd_config_put(nbd);

			return BLK_EH_DONE;

		}