Commit eb10fec3 authored by Keith Busch's avatar Keith Busch Committed by sanglipeng
Browse files

nvme: ensure subsystem reset is single threaded 

stable inclusion
from stable-v5.10.156
commit 023435a095d22bcbbaeea7e3a8c534b5c57d0d82
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7MCG1

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

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

commit 1e866afd upstream.

The subsystem reset writes to a register, so we have to ensure the
device state is capable of handling that otherwise the driver may access
unmapped registers. Use the state machine to ensure the subsystem reset
doesn't try to write registers on a device already undergoing this type
of reset.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=214771


Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarOvidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 1ed498a2

drivers/nvme/host/nvme.h

+13 −3
Original line number Diff line number Diff line
@@ -552,11 +552,23 @@ static inline void nvme_fault_inject_fini(struct nvme_fault_inject *fault_inj) 
static inline void nvme_should_fail(struct request *req) {}

#endif



bool nvme_wait_reset(struct nvme_ctrl *ctrl);

int nvme_try_sched_reset(struct nvme_ctrl *ctrl);



static inline int nvme_reset_subsystem(struct nvme_ctrl *ctrl)

{

	int ret;



	if (!ctrl->subsystem)

		return -ENOTTY;

	return ctrl->ops->reg_write32(ctrl, NVME_REG_NSSR, 0x4E564D65);

	if (!nvme_wait_reset(ctrl))

		return -EBUSY;



	ret = ctrl->ops->reg_write32(ctrl, NVME_REG_NSSR, 0x4E564D65);

	if (ret)

		return ret;



	return nvme_try_sched_reset(ctrl);

}



/*
@@ -643,7 +655,6 @@ void nvme_cancel_tagset(struct nvme_ctrl *ctrl); 
void nvme_cancel_admin_tagset(struct nvme_ctrl *ctrl);

bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,

		enum nvme_ctrl_state new_state);

bool nvme_wait_reset(struct nvme_ctrl *ctrl);

int nvme_disable_ctrl(struct nvme_ctrl *ctrl);

int nvme_enable_ctrl(struct nvme_ctrl *ctrl);

int nvme_shutdown_ctrl(struct nvme_ctrl *ctrl);
@@ -696,7 +707,6 @@ int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count); 
void nvme_stop_keep_alive(struct nvme_ctrl *ctrl);

int nvme_reset_ctrl(struct nvme_ctrl *ctrl);

int nvme_reset_ctrl_sync(struct nvme_ctrl *ctrl);

int nvme_try_sched_reset(struct nvme_ctrl *ctrl);

int nvme_delete_ctrl(struct nvme_ctrl *ctrl);



int nvme_get_log(struct nvme_ctrl *ctrl, u32 nsid, u8 log_page, u8 lsp, u8 csi,