Commit 8122a583 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by zhaoxiaoqiang11
Browse files

nvmet: don't defer passthrough commands with trivial effects to the workqueue 

stable inclusion
from stable-v5.10.163
commit 57ae492f620ceaaad0188bd39ce3a3dc4bdac64c
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7PJ9N

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



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

[ Upstream commit 2a459f69 ]

Mask out the "Command Supported" and "Logical Block Content Change" bits
and only defer execution of commands that have non-trivial effects to
the workqueue for synchronous execution.  This allows to execute admin
commands asynchronously on controllers that provide a Command Supported
and Effects log page, and will keep allowing to execute Write commands
asynchronously once command effects on I/O commands are taken into
account.

Fixes: c1fef73f ("nvmet: add passthru code to process commands")
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarKanchan Joshi <joshi.k@samsung.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarzhaoxiaoqiang11 <zhaoxiaoqiang11@jd.com>
parent 3fb94892

drivers/nvme/target/passthru.c

+5 −6
Original line number Diff line number Diff line
@@ -259,14 +259,13 @@ static void nvmet_passthru_execute_cmd(struct nvmet_req *req) 
	}



	/*

	 * If there are effects for the command we are about to execute, or

	 * an end_req function we need to use nvme_execute_passthru_rq()

	 * synchronously in a work item seeing the end_req function and

	 * nvme_passthru_end() can't be called in the request done callback

	 * which is typically in interrupt context.

	 * If a command needs post-execution fixups, or there are any

	 * non-trivial effects, make sure to execute the command synchronously

	 * in a workqueue so that nvme_passthru_end gets called.

	 */

	effects = nvme_command_effects(ctrl, ns, req->cmd->common.opcode);

	if (req->p.use_workqueue || effects) {

	if (req->p.use_workqueue ||

	    (effects & ~(NVME_CMD_EFFECTS_CSUPP | NVME_CMD_EFFECTS_LBCC))) {

		INIT_WORK(&req->p.work, nvmet_passthru_execute_cmd_work);

		req->p.rq = rq;

		schedule_work(&req->p.work);