Commit ae3d56d8 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: remove bidirectional command support 



No real need for bidi support once the OSD code is gone.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 19fcae3d

drivers/scsi/cxgbi/libcxgbi.c

+5 −8
Original line number Diff line number Diff line
@@ -1211,7 +1211,7 @@ scmd_get_params(struct scsi_cmnd *sc, struct scatterlist **sgl, 
		unsigned int *sgcnt, unsigned int *dlen,

		unsigned int prot)

{

	struct scsi_data_buffer *sdb = prot ? scsi_prot(sc) : scsi_out(sc);

	struct scsi_data_buffer *sdb = prot ? scsi_prot(sc) : &sc->sdb;



	*sgl = sdb->table.sgl;

	*sgcnt = sdb->table.nents;
@@ -1427,8 +1427,7 @@ static void task_release_itt(struct iscsi_task *task, itt_t hdr_itt) 
	log_debug(1 << CXGBI_DBG_DDP,

		  "cdev 0x%p, task 0x%p, release tag 0x%x.\n",

		  cdev, task, tag);

	if (sc &&

	    (scsi_bidi_cmnd(sc) || sc->sc_data_direction == DMA_FROM_DEVICE) &&

	if (sc && sc->sc_data_direction == DMA_FROM_DEVICE &&

	    cxgbi_ppm_is_ddp_tag(ppm, tag)) {

		struct cxgbi_task_data *tdata = iscsi_task_cxgbi_data(task);

		struct cxgbi_task_tag_info *ttinfo = &tdata->ttinfo;
@@ -1460,9 +1459,7 @@ static int task_reserve_itt(struct iscsi_task *task, itt_t *hdr_itt) 
	u32 tag = 0;

	int err = -EINVAL;



	if (sc &&

	    (scsi_bidi_cmnd(sc) || sc->sc_data_direction == DMA_FROM_DEVICE)

	) {

	if (sc && sc->sc_data_direction == DMA_FROM_DEVICE) {

		struct cxgbi_task_data *tdata = iscsi_task_cxgbi_data(task);

		struct cxgbi_task_tag_info *ttinfo = &tdata->ttinfo;
@@ -1896,7 +1893,7 @@ int cxgbi_conn_alloc_pdu(struct iscsi_task *task, u8 opcode) 
	if (SKB_MAX_HEAD(cdev->skb_tx_rsvd) > (512 * MAX_SKB_FRAGS) &&

	    (opcode == ISCSI_OP_SCSI_DATA_OUT ||

	     (opcode == ISCSI_OP_SCSI_CMD &&

	      (scsi_bidi_cmnd(sc) || sc->sc_data_direction == DMA_TO_DEVICE))))

	      sc->sc_data_direction == DMA_TO_DEVICE)))

		/* data could goes into skb head */

		headroom += min_t(unsigned int,

				SKB_MAX_HEAD(cdev->skb_tx_rsvd),
@@ -1971,7 +1968,7 @@ int cxgbi_conn_init_pdu(struct iscsi_task *task, unsigned int offset, 
		return 0;



	if (task->sc) {

		struct scsi_data_buffer *sdb = scsi_out(task->sc);

		struct scsi_data_buffer *sdb = &task->sc->sdb;

		struct scatterlist *sg = NULL;

		int err;

drivers/scsi/iscsi_tcp.c

+1 −8
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ static int iscsi_sw_tcp_pdu_init(struct iscsi_task *task, 
	if (!task->sc)

		iscsi_sw_tcp_send_linear_data_prep(conn, task->data, count);

	else {

		struct scsi_data_buffer *sdb = scsi_out(task->sc);

		struct scsi_data_buffer *sdb = &task->sc->sdb;



		err = iscsi_sw_tcp_send_data_prep(conn, sdb->table.sgl,

						  sdb->table.nents, offset,
@@ -952,12 +952,6 @@ static umode_t iscsi_sw_tcp_attr_is_visible(int param_type, int param) 
	return 0;

}



static int iscsi_sw_tcp_slave_alloc(struct scsi_device *sdev)

{

	blk_queue_flag_set(QUEUE_FLAG_BIDI, sdev->request_queue);

	return 0;

}



static int iscsi_sw_tcp_slave_configure(struct scsi_device *sdev)

{

	struct iscsi_sw_tcp_host *tcp_sw_host = iscsi_host_priv(sdev->host);
@@ -985,7 +979,6 @@ static struct scsi_host_template iscsi_sw_tcp_sht = { 
	.eh_device_reset_handler= iscsi_eh_device_reset,

	.eh_target_reset_handler = iscsi_eh_recover_target,

	.dma_boundary		= PAGE_SIZE - 1,

	.slave_alloc            = iscsi_sw_tcp_slave_alloc,

	.slave_configure        = iscsi_sw_tcp_slave_configure,

	.target_alloc		= iscsi_target_alloc,

	.proc_name		= "iscsi_tcp",

drivers/scsi/libiscsi.c

+6 −58
Original line number Diff line number Diff line
@@ -228,32 +228,6 @@ static int iscsi_prep_ecdb_ahs(struct iscsi_task *task) 
	return 0;

}



static int iscsi_prep_bidi_ahs(struct iscsi_task *task)

{

	struct scsi_cmnd *sc = task->sc;

	struct iscsi_rlength_ahdr *rlen_ahdr;

	int rc;



	rlen_ahdr = iscsi_next_hdr(task);

	rc = iscsi_add_hdr(task, sizeof(*rlen_ahdr));

	if (rc)

		return rc;



	rlen_ahdr->ahslength =

		cpu_to_be16(sizeof(rlen_ahdr->read_length) +

						  sizeof(rlen_ahdr->reserved));

	rlen_ahdr->ahstype = ISCSI_AHSTYPE_RLENGTH;

	rlen_ahdr->reserved = 0;

	rlen_ahdr->read_length = cpu_to_be32(scsi_in(sc)->length);



	ISCSI_DBG_SESSION(task->conn->session,

			  "bidi-in rlen_ahdr->read_length(%d) "

		          "rlen_ahdr->ahslength(%d)\n",

		          be32_to_cpu(rlen_ahdr->read_length),

		          be16_to_cpu(rlen_ahdr->ahslength));

	return 0;

}



/**

 * iscsi_check_tmf_restrictions - check if a task is affected by TMF

 * @task: iscsi task
@@ -392,13 +366,6 @@ static int iscsi_prep_scsi_cmd_pdu(struct iscsi_task *task) 
	memcpy(hdr->cdb, sc->cmnd, cmd_len);



	task->imm_count = 0;

	if (scsi_bidi_cmnd(sc)) {

		hdr->flags |= ISCSI_FLAG_CMD_READ;

		rc = iscsi_prep_bidi_ahs(task);

		if (rc)

			return rc;

	}



	if (scsi_get_prot_op(sc) != SCSI_PROT_NORMAL)

		task->protected = true;
@@ -473,12 +440,10 @@ static int iscsi_prep_scsi_cmd_pdu(struct iscsi_task *task) 


	conn->scsicmd_pdus_cnt++;

	ISCSI_DBG_SESSION(session, "iscsi prep [%s cid %d sc %p cdb 0x%x "

			  "itt 0x%x len %d bidi_len %d cmdsn %d win %d]\n",

			  scsi_bidi_cmnd(sc) ? "bidirectional" :

			  "itt 0x%x len %d cmdsn %d win %d]\n",

			  sc->sc_data_direction == DMA_TO_DEVICE ?

			  "write" : "read", conn->id, sc, sc->cmnd[0],

			  task->itt, transfer_length,

			  scsi_bidi_cmnd(sc) ? scsi_in(sc)->length : 0,

			  session->cmdsn,

			  session->max_cmdsn - session->exp_cmdsn + 1);

	return 0;
@@ -647,12 +612,7 @@ static void fail_scsi_task(struct iscsi_task *task, int err) 
		state = ISCSI_TASK_ABRT_TMF;



	sc->result = err << 16;

	if (!scsi_bidi_cmnd(sc))

	scsi_set_resid(sc, scsi_bufflen(sc));

	else {

		scsi_out(sc)->resid = scsi_out(sc)->length;

		scsi_in(sc)->resid = scsi_in(sc)->length;

	}



	/* regular RX path uses back_lock */

	spin_lock_bh(&conn->session->back_lock);
@@ -907,13 +867,6 @@ static void iscsi_scsi_cmd_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr, 


	if (rhdr->flags & (ISCSI_FLAG_CMD_BIDI_UNDERFLOW |

			   ISCSI_FLAG_CMD_BIDI_OVERFLOW)) {

		int res_count = be32_to_cpu(rhdr->bi_residual_count);



		if (scsi_bidi_cmnd(sc) && res_count > 0 &&

				(rhdr->flags & ISCSI_FLAG_CMD_BIDI_OVERFLOW ||

				 res_count <= scsi_in(sc)->length))

			scsi_in(sc)->resid = res_count;

		else

		sc->result = (DID_BAD_TARGET << 16) | rhdr->cmd_status;

	}
@@ -961,8 +914,8 @@ iscsi_data_in_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr, 


		if (res_count > 0 &&

		    (rhdr->flags & ISCSI_FLAG_CMD_OVERFLOW ||

		     res_count <= scsi_in(sc)->length))

			scsi_in(sc)->resid = res_count;

		     res_count <= sc->sdb.length))

			sc->sdb.resid = res_count;

		else

			sc->result = (DID_BAD_TARGET << 16) | rhdr->cmd_status;

	}
@@ -1804,12 +1757,7 @@ int iscsi_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc) 
	spin_unlock_bh(&session->frwd_lock);

	ISCSI_DBG_SESSION(session, "iscsi: cmd 0x%x is not queued (%d)\n",

			  sc->cmnd[0], reason);

	if (!scsi_bidi_cmnd(sc))

	scsi_set_resid(sc, scsi_bufflen(sc));

	else {

		scsi_out(sc)->resid = scsi_out(sc)->length;

		scsi_in(sc)->resid = scsi_in(sc)->length;

	}

	sc->scsi_done(sc);

	return 0;

}

drivers/scsi/libiscsi_tcp.c

+4 −4
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ static int iscsi_tcp_data_in(struct iscsi_conn *conn, struct iscsi_task *task) 
	struct iscsi_tcp_task *tcp_task = task->dd_data;

	struct iscsi_data_rsp *rhdr = (struct iscsi_data_rsp *)tcp_conn->in.hdr;

	int datasn = be32_to_cpu(rhdr->datasn);

	unsigned total_in_length = scsi_in(task->sc)->length;

	unsigned total_in_length = task->sc->sdb.length;



	/*

	 * lib iscsi will update this in the completion handling if there
@@ -580,11 +580,11 @@ static int iscsi_tcp_r2t_rsp(struct iscsi_conn *conn, struct iscsi_task *task) 
			      data_length, session->max_burst);



	data_offset = be32_to_cpu(rhdr->data_offset);

	if (data_offset + data_length > scsi_out(task->sc)->length) {

	if (data_offset + data_length > task->sc->sdb.length) {

		iscsi_conn_printk(KERN_ERR, conn,

				  "invalid R2T with data len %u at offset %u "

				  "and total length %d\n", data_length,

				  data_offset, scsi_out(task->sc)->length);

				  data_offset, task->sc->sdb.length);

		return ISCSI_ERR_DATALEN;

	}
@@ -696,7 +696,7 @@ iscsi_tcp_hdr_dissect(struct iscsi_conn *conn, struct iscsi_hdr *hdr) 
		if (tcp_conn->in.datalen) {

			struct iscsi_tcp_task *tcp_task = task->dd_data;

			struct ahash_request *rx_hash = NULL;

			struct scsi_data_buffer *sdb = scsi_in(task->sc);

			struct scsi_data_buffer *sdb = &task->sc->sdb;



			/*

			 * Setup copy of Data-In into the struct scsi_cmnd

drivers/scsi/scsi_debug.c

+8 −77
Original line number Diff line number Diff line
@@ -430,7 +430,6 @@ static int resp_rsup_opcodes(struct scsi_cmnd *, struct sdebug_dev_info *); 
static int resp_rsup_tmfs(struct scsi_cmnd *, struct sdebug_dev_info *);

static int resp_write_same_10(struct scsi_cmnd *, struct sdebug_dev_info *);

static int resp_write_same_16(struct scsi_cmnd *, struct sdebug_dev_info *);

static int resp_xdwriteread_10(struct scsi_cmnd *, struct sdebug_dev_info *);

static int resp_comp_write(struct scsi_cmnd *, struct sdebug_dev_info *);

static int resp_write_buffer(struct scsi_cmnd *, struct sdebug_dev_info *);

static int resp_sync_cache(struct scsi_cmnd *, struct sdebug_dev_info *);
@@ -600,9 +599,6 @@ static const struct opcode_info_t opcode_info_arr[SDEB_I_LAST_ELEMENT + 1] = { 
	{0, 0x42, 0, F_D_OUT | FF_MEDIA_IO, resp_unmap, NULL, /* UNMAP */

	    {10,  0x1, 0, 0, 0, 0, 0x3f, 0xff, 0xff, 0xc7, 0, 0, 0, 0, 0, 0} },

/* 25 */

	{0, 0x53, 0, F_D_IN | F_D_OUT | FF_MEDIA_IO, resp_xdwriteread_10,

	    NULL, {10,  0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xc7,

		   0, 0, 0, 0, 0, 0} },		/* XDWRITEREAD(10) */

	{0, 0x3b, 0, F_D_OUT_MAYBE, resp_write_buffer, NULL,

	    {10,  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc7, 0, 0,

	     0, 0, 0, 0} },			/* WRITE_BUFFER */
@@ -1010,11 +1006,11 @@ static int fill_from_dev_buffer(struct scsi_cmnd *scp, unsigned char *arr, 
				int arr_len)

{

	int act_len;

	struct scsi_data_buffer *sdb = scsi_in(scp);

	struct scsi_data_buffer *sdb = &scp->sdb;



	if (!sdb->length)

		return 0;

	if (!(scsi_bidi_cmnd(scp) || scp->sc_data_direction == DMA_FROM_DEVICE))

	if (scp->sc_data_direction != DMA_FROM_DEVICE)

		return DID_ERROR << 16;



	act_len = sg_copy_from_buffer(sdb->table.sgl, sdb->table.nents,
@@ -1033,12 +1029,12 @@ static int p_fill_from_dev_buffer(struct scsi_cmnd *scp, const void *arr, 
				  int arr_len, unsigned int off_dst)

{

	int act_len, n;

	struct scsi_data_buffer *sdb = scsi_in(scp);

	struct scsi_data_buffer *sdb = &scp->sdb;

	off_t skip = off_dst;



	if (sdb->length <= off_dst)

		return 0;

	if (!(scsi_bidi_cmnd(scp) || scp->sc_data_direction == DMA_FROM_DEVICE))

	if (scp->sc_data_direction != DMA_FROM_DEVICE)

		return DID_ERROR << 16;



	act_len = sg_pcopy_from_buffer(sdb->table.sgl, sdb->table.nents,
@@ -1058,7 +1054,7 @@ static int fetch_to_dev_buffer(struct scsi_cmnd *scp, unsigned char *arr, 
{

	if (!scsi_bufflen(scp))

		return 0;

	if (!(scsi_bidi_cmnd(scp) || scp->sc_data_direction == DMA_TO_DEVICE))

	if (scp->sc_data_direction != DMA_TO_DEVICE)

		return -1;



	return scsi_sg_copy_to_buffer(scp, arr, arr_len);
@@ -2477,21 +2473,19 @@ static int do_device_access(struct scsi_cmnd *scmd, u32 sg_skip, u64 lba, 
{

	int ret;

	u64 block, rest = 0;

	struct scsi_data_buffer *sdb;

	struct scsi_data_buffer *sdb = &scmd->sdb;

	enum dma_data_direction dir;



	if (do_write) {

		sdb = scsi_out(scmd);

		dir = DMA_TO_DEVICE;

		write_since_sync = true;

	} else {

		sdb = scsi_in(scmd);

		dir = DMA_FROM_DEVICE;

	}



	if (!sdb->length)

		return 0;

	if (!(scsi_bidi_cmnd(scmd) || scmd->sc_data_direction == dir))

	if (scmd->sc_data_direction != dir)

		return -1;



	block = do_div(lba, sdebug_store_sectors);
@@ -2774,7 +2768,7 @@ static int resp_read_dt0(struct scsi_cmnd *scp, struct sdebug_dev_info *devip) 
	if (unlikely(ret == -1))

		return DID_ERROR << 16;



	scsi_in(scp)->resid = scsi_bufflen(scp) - ret;

	scp->sdb.resid = scsi_bufflen(scp) - ret;



	if (unlikely(sqcp)) {

		if (sqcp->inj_recovered) {
@@ -3718,68 +3712,6 @@ static int resp_report_luns(struct scsi_cmnd *scp, 
	return res;

}



static int resp_xdwriteread(struct scsi_cmnd *scp, unsigned long long lba,

			    unsigned int num, struct sdebug_dev_info *devip)

{

	int j;

	unsigned char *kaddr, *buf;

	unsigned int offset;

	struct scsi_data_buffer *sdb = scsi_in(scp);

	struct sg_mapping_iter miter;



	/* better not to use temporary buffer. */

	buf = kzalloc(scsi_bufflen(scp), GFP_ATOMIC);

	if (!buf) {

		mk_sense_buffer(scp, ILLEGAL_REQUEST, INSUFF_RES_ASC,

				INSUFF_RES_ASCQ);

		return check_condition_result;

	}



	scsi_sg_copy_to_buffer(scp, buf, scsi_bufflen(scp));



	offset = 0;

	sg_miter_start(&miter, sdb->table.sgl, sdb->table.nents,

			SG_MITER_ATOMIC | SG_MITER_TO_SG);



	while (sg_miter_next(&miter)) {

		kaddr = miter.addr;

		for (j = 0; j < miter.length; j++)

			*(kaddr + j) ^= *(buf + offset + j);



		offset += miter.length;

	}

	sg_miter_stop(&miter);

	kfree(buf);



	return 0;

}



static int resp_xdwriteread_10(struct scsi_cmnd *scp,

			       struct sdebug_dev_info *devip)

{

	u8 *cmd = scp->cmnd;

	u64 lba;

	u32 num;

	int errsts;



	if (!scsi_bidi_cmnd(scp)) {

		mk_sense_buffer(scp, ILLEGAL_REQUEST, INSUFF_RES_ASC,

				INSUFF_RES_ASCQ);

		return check_condition_result;

	}

	errsts = resp_read_dt0(scp, devip);

	if (errsts)

		return errsts;

	if (!(cmd[1] & 0x4)) {		/* DISABLE_WRITE is not set */

		errsts = resp_write_dt0(scp, devip);

		if (errsts)

			return errsts;

	}

	lba = get_unaligned_be32(cmd + 2);

	num = get_unaligned_be16(cmd + 7);

	return resp_xdwriteread(scp, lba, num, devip);

}



static struct sdebug_queue *get_queue(struct scsi_cmnd *cmnd)

{

	u32 tag = blk_mq_unique_tag(cmnd->request);
@@ -3953,7 +3885,6 @@ static int scsi_debug_slave_alloc(struct scsi_device *sdp) 
	if (sdebug_verbose)

		pr_info("slave_alloc <%u %u %u %llu>\n",

		       sdp->host->host_no, sdp->channel, sdp->id, sdp->lun);

	blk_queue_flag_set(QUEUE_FLAG_BIDI, sdp->request_queue);

	return 0;

}