Commit 1ecae9d3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Li Lingfeng
Browse files

Revert "scsi: core: Use a structure member to track the SCSI command submitter" 

stable inclusion
from stable-v5.10.207
commit cea19678bf55f8d087bf617478f249208432156c
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8ZD3X
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.207&id=cea19678bf55f8d087bf617478f249208432156c

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

This reverts commit f2d30198c0530b8da155697d8723e19ac72c15fe which is
commit bf23e619 upstream.

As reported, a lot of scsi changes were made just to resolve a 2 line
patch, so let's revert them all and then manually fix up the 2 line
fixup so that things are simpler and potential abi changes are not an
issue.

Link: https://lore.kernel.org/r/ZZ042FejzwMM5vDW@duo.ucw.cz


Reported-by: default avatarPavel Machek <pavel@ucw.cz>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Benjamin Block <bblock@linux.ibm.com>
Cc: Bean Huo <beanhuo@micron.com>
Cc: Bart Van Assche <bvanassche@acm.org>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
parent 49cc41c8

drivers/scsi/scsi_error.c

+11 −6
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ 


#include <asm/unaligned.h>



static void scsi_eh_done(struct scsi_cmnd *scmd);



/*

 * These should *probably* be handled by the host itself.

 * Since it is allowed to sleep, it probably should.
@@ -498,8 +500,7 @@ int scsi_check_sense(struct scsi_cmnd *scmd) 
		/* handler does not care. Drop down to default handling */

	}



	if (scmd->cmnd[0] == TEST_UNIT_READY &&

	    scmd->submitter != SUBMITTED_BY_SCSI_ERROR_HANDLER)

	if (scmd->cmnd[0] == TEST_UNIT_READY && scmd->scsi_done != scsi_eh_done)

		/*

		 * nasty: for mid-layer issued TURs, we need to return the

		 * actual sense data without any recovery attempt.  For eh
@@ -767,7 +768,7 @@ static int scsi_eh_completed_normally(struct scsi_cmnd *scmd) 
 * scsi_eh_done - Completion function for error handling.

 * @scmd:	Cmd that is done.

 */

void scsi_eh_done(struct scsi_cmnd *scmd)

static void scsi_eh_done(struct scsi_cmnd *scmd)

{

	struct completion *eh_action;
@@ -1067,7 +1068,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd, 
	shost->eh_action = &done;



	scsi_log_send(scmd);

	scmd->submitter = SUBMITTED_BY_SCSI_ERROR_HANDLER;

	scmd->scsi_done = scsi_eh_done;



	/*

	 * Lock sdev->state_mutex to avoid that scsi_device_quiesce() can
@@ -1094,7 +1095,6 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd, 
	if (rtn) {

		if (timeleft > stall_for) {

			scsi_eh_restore_cmnd(scmd, &ses);



			timeleft -= stall_for;

			msleep(jiffies_to_msecs(stall_for));

			goto retry;
@@ -2322,6 +2322,11 @@ void scsi_report_device_reset(struct Scsi_Host *shost, int channel, int target) 
}

EXPORT_SYMBOL(scsi_report_device_reset);



static void

scsi_reset_provider_done_command(struct scsi_cmnd *scmd)

{

}



/**

 * scsi_ioctl_reset: explicitly reset a host/bus/target/device

 * @dev:	scsi_device to operate on
@@ -2358,7 +2363,7 @@ scsi_ioctl_reset(struct scsi_device *dev, int __user *arg) 
	scmd->request = rq;

	scmd->cmnd = scsi_req(rq)->cmd;



	scmd->submitter = SUBMITTED_BY_SCSI_RESET_IOCTL;

	scmd->scsi_done		= scsi_reset_provider_done_command;

	memset(&scmd->sdb, 0, sizeof(scmd->sdb));



	scmd->cmd_len			= 0;

drivers/scsi/scsi_lib.c

+0 −10
Original line number Diff line number Diff line
@@ -1599,15 +1599,6 @@ static blk_status_t scsi_prepare_cmd(struct request *req) 


static void scsi_mq_done(struct scsi_cmnd *cmd)

{

	switch (cmd->submitter) {

	case SUBMITTED_BY_BLOCK_LAYER:

		break;

	case SUBMITTED_BY_SCSI_ERROR_HANDLER:

		return scsi_eh_done(cmd);

	case SUBMITTED_BY_SCSI_RESET_IOCTL:

		return;

	}



	if (unlikely(blk_should_fake_timeout(scsi_cmd_to_rq(cmd)->q)))

		return;

	if (unlikely(test_and_set_bit(SCMD_STATE_COMPLETE, &cmd->state)))
@@ -1697,7 +1688,6 @@ static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx, 


	scsi_set_resid(cmd, 0);

	memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);

	cmd->submitter = SUBMITTED_BY_BLOCK_LAYER;

	cmd->scsi_done = scsi_mq_done;



	blk_mq_start_request(req);

drivers/scsi/scsi_priv.h

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ void scsi_eh_ready_devs(struct Scsi_Host *shost, 
int scsi_eh_get_sense(struct list_head *work_q,

		      struct list_head *done_q);

int scsi_noretry_cmd(struct scsi_cmnd *scmd);

void scsi_eh_done(struct scsi_cmnd *scmd);



/* scsi_lib.c */

extern int scsi_maybe_unblock_host(struct scsi_device *sdev);

include/scsi/scsi_cmnd.h

+0 −7
Original line number Diff line number Diff line
@@ -66,12 +66,6 @@ struct scsi_pointer { 
#define SCMD_STATE_COMPLETE	0

#define SCMD_STATE_INFLIGHT	1



enum scsi_cmnd_submitter {

	SUBMITTED_BY_BLOCK_LAYER = 0,

	SUBMITTED_BY_SCSI_ERROR_HANDLER = 1,

	SUBMITTED_BY_SCSI_RESET_IOCTL = 2,

} __packed;



struct scsi_cmnd {

	struct scsi_request req;

	struct scsi_device *device;
@@ -95,7 +89,6 @@ struct scsi_cmnd { 
	unsigned char prot_op;

	unsigned char prot_type;

	unsigned char prot_flags;

	enum scsi_cmnd_submitter submitter;



	unsigned short cmd_len;

	enum dma_data_direction sc_data_direction;