Commit 62c7b860 authored by Nilay Shroff's avatar Nilay Shroff Committed by Wen Zhiwei
Browse files

nvme: use helper nvme_ctrl_state in nvme_keep_alive_finish function 

stable inclusion
from stable-v6.6.70
commit 801acf741c879a09f05df9b49f78142407d630c2
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBOHV1

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=801acf741c879a09f05df9b49f78142407d630c2



--------------------------------

[ Upstream commit 599d9f3a10eec69ef28a90161763e4bd7c9c02bf ]

We no more need acquiring ctrl->lock before accessing the
NVMe controller state and instead we can now use the helper
nvme_ctrl_state. So replace the use of ctrl->lock from
nvme_keep_alive_finish function with nvme_ctrl_state call.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNilay Shroff <nilay@linux.ibm.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Stable-dep-of: 84488282166d ("Revert "nvme: make keep-alive synchronous operation"")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 304719b1

drivers/nvme/host/core.c

+2 −8
Original line number Diff line number Diff line
@@ -1181,10 +1181,9 @@ static void nvme_queue_keep_alive_work(struct nvme_ctrl *ctrl) 
static void nvme_keep_alive_finish(struct request *rq,

		blk_status_t status, struct nvme_ctrl *ctrl)

{

	unsigned long flags;

	bool startka = false;

	unsigned long rtt = jiffies - (rq->deadline - rq->timeout);

	unsigned long delay = nvme_keep_alive_work_period(ctrl);

	enum nvme_ctrl_state state = nvme_ctrl_state(ctrl);



	/*

	 * Subtract off the keepalive RTT so nvme_keep_alive_work runs
@@ -1207,12 +1206,7 @@ static void nvme_keep_alive_finish(struct request *rq, 


	ctrl->ka_last_check_time = jiffies;

	ctrl->comp_seen = false;

	spin_lock_irqsave(&ctrl->lock, flags);

	if (ctrl->state == NVME_CTRL_LIVE ||

	    ctrl->state == NVME_CTRL_CONNECTING)

		startka = true;

	spin_unlock_irqrestore(&ctrl->lock, flags);

	if (startka)

	if (state == NVME_CTRL_LIVE || state == NVME_CTRL_CONNECTING)

		queue_delayed_work(nvme_wq, &ctrl->ka_work, delay);

}