Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (590cf285) · Commits · 戴 / test

Documentation/scsi/cxgb3i.txt

0 → 100644

+85 −0

Original line number	Diff line number	Diff line
		Chelsio S3 iSCSI Driver for Linux

		Introduction
		============

		The Chelsio T3 ASIC based Adapters (S310, S320, S302, S304, Mezz cards, etc.
		series of products) supports iSCSI acceleration and iSCSI Direct Data Placement
		(DDP) where the hardware handles the expensive byte touching operations, such
		as CRC computation and verification, and direct DMA to the final host memory
		destination:

		- iSCSI PDU digest generation and verification

		On transmitting, Chelsio S3 h/w computes and inserts the Header and
		Data digest into the PDUs.
		On receiving, Chelsio S3 h/w computes and verifies the Header and
		Data digest of the PDUs.

		- Direct Data Placement (DDP)

		S3 h/w can directly place the iSCSI Data-In or Data-Out PDU's
		payload into pre-posted final destination host-memory buffers based
		on the Initiator Task Tag (ITT) in Data-In or Target Task Tag (TTT)
		in Data-Out PDUs.

		- PDU Transmit and Recovery

		On transmitting, S3 h/w accepts the complete PDU (header + data)
		from the host driver, computes and inserts the digests, decomposes
		the PDU into multiple TCP segments if necessary, and transmit all
		the TCP segments onto the wire. It handles TCP retransmission if
		needed.

		On receving, S3 h/w recovers the iSCSI PDU by reassembling TCP
		segments, separating the header and data, calculating and verifying
		the digests, then forwards the header to the host. The payload data,
		if possible, will be directly placed into the pre-posted host DDP
		buffer. Otherwise, the payload data will be sent to the host too.

		The cxgb3i driver interfaces with open-iscsi initiator and provides the iSCSI
		acceleration through Chelsio hardware wherever applicable.

		Using the cxgb3i Driver
		=======================

		The following steps need to be taken to accelerates the open-iscsi initiator:

		1. Load the cxgb3i driver: "modprobe cxgb3i"

		The cxgb3i module registers a new transport class "cxgb3i" with open-iscsi.

		* in the case of recompiling the kernel, the cxgb3i selection is located at
		Device Drivers
		SCSI device support --->
		[*] SCSI low-level drivers --->
		<M> Chelsio S3xx iSCSI support

		2. Create an interface file located under /etc/iscsi/ifaces/ for the new
		transport class "cxgb3i".

		The content of the file should be in the following format:
		iface.transport_name = cxgb3i
		iface.net_ifacename = <ethX>
		iface.ipaddress = <iscsi ip address>

		* if iface.ipaddress is specified, <iscsi ip address> needs to be either the
		same as the ethX's ip address or an address on the same subnet. Make
		sure the ip address is unique in the network.

		3. edit /etc/iscsi/iscsid.conf
		The default setting for MaxRecvDataSegmentLength (131072) is too big,
		replace "node.conn[0].iscsi.MaxRecvDataSegmentLength" to be a value no
		bigger than 15360 (for example 8192):

		node.conn[0].iscsi.MaxRecvDataSegmentLength = 8192

		* The login would fail for a normal session if MaxRecvDataSegmentLength is
		too big. A error message in the format of
		"cxgb3i: ERR! MaxRecvSegmentLength <X> too big. Need to be <= <Y>."
		would be logged to dmesg.

		4. To direct open-iscsi traffic to go through cxgb3i's accelerated path,
		"-I <iface file name>" option needs to be specified with most of the
		iscsiadm command. <iface file name> is the transport interface file created
		in step 2.

drivers/ata/libata-scsi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -517,7 +517,7 @@ int ata_cmd_ioctl(struct scsi_device scsidev, void __user arg)
		/* Good values for timeout and retries? Values below
		from scsi_ioctl_send_command() for default case... */
		cmd_result = scsi_execute(scsidev, scsi_cmd, data_dir, argbuf, argsize,
		sensebuf, (10*HZ), 5, 0);
		sensebuf, (10*HZ), 5, 0, NULL);

		if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */
		u8 *desc = sensebuf + 8;
		@@ -603,7 +603,7 @@ int ata_task_ioctl(struct scsi_device scsidev, void __user arg)
		/* Good values for timeout and retries? Values below
		from scsi_ioctl_send_command() for default case... */
		cmd_result = scsi_execute(scsidev, scsi_cmd, DMA_NONE, NULL, 0,
		sensebuf, (10*HZ), 5, 0);
		sensebuf, (10*HZ), 5, 0, NULL);

		if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */
		u8 *desc = sensebuf + 8;

drivers/infiniband/ulp/iser/iscsi_iser.c

+25 −23

Original line number	Diff line number	Diff line
		@@ -119,6 +119,14 @@ error:
		iscsi_conn_failure(conn, rc);
		}

		static int iscsi_iser_pdu_alloc(struct iscsi_task *task, uint8_t opcode)
		{
		struct iscsi_iser_task *iser_task = task->dd_data;

		task->hdr = (struct iscsi_hdr *)&iser_task->desc.iscsi_header;
		task->hdr_max = sizeof(iser_task->desc.iscsi_header);
		return 0;
		}

		/**
		* iscsi_iser_task_init - Initialize task
		@@ -180,25 +188,26 @@ static int
		iscsi_iser_task_xmit_unsol_data(struct iscsi_conn *conn,
		struct iscsi_task *task)
		{
		struct iscsi_r2t_info *r2t = &task->unsol_r2t;
		struct iscsi_data hdr;
		int error = 0;

		/* Send data-out PDUs while there's still unsolicited data to send */
		while (task->unsol_count > 0) {
		iscsi_prep_unsolicit_data_pdu(task, &hdr);
		while (iscsi_task_has_unsol_data(task)) {
		iscsi_prep_data_out_pdu(task, r2t, &hdr);
		debug_scsi("Sending data-out: itt 0x%x, data count %d\n",
		hdr.itt, task->data_count);
		hdr.itt, r2t->data_count);

		/* the buffer description has been passed with the command */
		/* Send the command */
		error = iser_send_data_out(conn, task, &hdr);
		if (error) {
		task->unsol_datasn--;
		r2t->datasn--;
		goto iscsi_iser_task_xmit_unsol_data_exit;
		}
		task->unsol_count -= task->data_count;
		r2t->sent += r2t->data_count;
		debug_scsi("Need to send %d more as data-out PDUs\n",
		task->unsol_count);
		r2t->data_length - r2t->sent);
		}

		iscsi_iser_task_xmit_unsol_data_exit:
		@@ -220,7 +229,7 @@ iscsi_iser_task_xmit(struct iscsi_task *task)

		debug_scsi("cmd [itt %x total %d imm %d unsol_data %d\n",
		task->itt, scsi_bufflen(task->sc),
		task->imm_count, task->unsol_count);
		task->imm_count, task->unsol_r2t.data_length);
		}

		debug_scsi("task deq [cid %d itt 0x%x]\n",
		@@ -235,7 +244,7 @@ iscsi_iser_task_xmit(struct iscsi_task *task)
		}

		/* Send unsolicited data-out PDU(s) if necessary */
		if (task->unsol_count)
		if (iscsi_task_has_unsol_data(task))
		error = iscsi_iser_task_xmit_unsol_data(conn, task);

		iscsi_iser_task_xmit_exit:
		@@ -244,13 +253,15 @@ iscsi_iser_task_xmit(struct iscsi_task *task)
		return error;
		}

		static void
		iscsi_iser_cleanup_task(struct iscsi_conn conn, struct iscsi_task task)
		static void iscsi_iser_cleanup_task(struct iscsi_task *task)
		{
		struct iscsi_iser_task *iser_task = task->dd_data;

		/* mgmt tasks do not need special cleanup */
		if (!task->sc)
		/*
		* mgmt tasks do not need special cleanup and we do not
		* allocate anything in the init task callout
		*/
		if (!task->sc \|\| task->state == ISCSI_TASK_PENDING)
		return;

		if (iser_task->status == ISER_TASK_STATUS_STARTED) {
		@@ -391,9 +402,6 @@ iscsi_iser_session_create(struct iscsi_endpoint *ep,
		struct iscsi_cls_session *cls_session;
		struct iscsi_session *session;
		struct Scsi_Host *shost;
		int i;
		struct iscsi_task *task;
		struct iscsi_iser_task *iser_task;
		struct iser_conn *ib_conn;

		shost = iscsi_host_alloc(&iscsi_iser_sht, 0, ISCSI_MAX_CMD_PER_LUN);
		@@ -430,13 +438,6 @@ iscsi_iser_session_create(struct iscsi_endpoint *ep,
		session = cls_session->dd_data;

		shost->can_queue = session->scsi_cmds_max;
		/* libiscsi setup itts, data and pool so just set desc fields */
		for (i = 0; i < session->cmds_max; i++) {
		task = session->cmds[i];
		iser_task = task->dd_data;
		task->hdr = (struct iscsi_cmd *)&iser_task->desc.iscsi_header;
		task->hdr_max = sizeof(iser_task->desc.iscsi_header);
		}
		return cls_session;

		remove_host:
		@@ -652,6 +653,7 @@ static struct iscsi_transport iscsi_iser_transport = {
		.init_task = iscsi_iser_task_init,
		.xmit_task = iscsi_iser_task_xmit,
		.cleanup_task = iscsi_iser_cleanup_task,
		.alloc_pdu = iscsi_iser_pdu_alloc,
		/* recovery */
		.session_recovery_timedout = iscsi_session_recovery_timedout,

drivers/infiniband/ulp/iser/iser_initiator.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -353,8 +353,7 @@ int iser_send_command(struct iscsi_conn *conn,
		unsigned long edtl;
		int err = 0;
		struct iser_data_buf *data_buf;

		struct iscsi_cmd *hdr = task->hdr;
		struct iscsi_cmd hdr = (struct iscsi_cmd )task->hdr;
		struct scsi_cmnd *sc = task->sc;

		if (!iser_conn_state_comp(iser_conn->ib_conn, ISER_CONN_UP)) {
		@@ -393,7 +392,7 @@ int iser_send_command(struct iscsi_conn *conn,
		err = iser_prepare_write_cmd(task,
		task->imm_count,
		task->imm_count +
		task->unsol_count,
		task->unsol_r2t.data_length,
		edtl);
		if (err)
		goto send_command_error;

drivers/message/fusion/mptbase.c

+6 −9

Original line number	Diff line number	Diff line
		@@ -952,7 +952,6 @@ mpt_put_msg_frame_hi_pri(u8 cb_idx, MPT_ADAPTER ioc, MPT_FRAME_HDR mf)
		/=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=/
		/**
		* mpt_free_msg_frame - Place MPT request frame back on FreeQ.
		* @handle: Handle of registered MPT protocol driver
		* @ioc: Pointer to MPT adapter structure
		* @mf: Pointer to MPT request frame
		*
		@@ -4563,7 +4562,7 @@ WaitForDoorbellReply(MPT_ADAPTER *ioc, int howlong, int sleepFlag)
		failcnt++;
		hword = le16_to_cpu(CHIPREG_READ32(&ioc->chip->Doorbell) & 0x0000FFFF);
		/* don't overflow our IOC hs_reply[] buffer! */
		if (u16cnt < sizeof(ioc->hs_reply) / sizeof(ioc->hs_reply[0]))
		if (u16cnt < ARRAY_SIZE(ioc->hs_reply))
		hs_reply[u16cnt] = hword;
		CHIPREG_WRITE32(&ioc->chip->IntStatus, 0);
		}
		@@ -5422,7 +5421,6 @@ mpt_raid_phys_disk_pg0(MPT_ADAPTER *ioc, u8 phys_disk_num, pRaidPhysDiskPage0_t
		/**
		* mpt_findImVolumes - Identify IDs of hidden disks and RAID Volumes
		* @ioc: Pointer to a Adapter Strucutre
		* @portnum: IOC port number
		*
		* Return:
		* 0 on success
		@@ -6939,7 +6937,6 @@ mpt_fc_log_info(MPT_ADAPTER *ioc, u32 log_info)
		/**
		* mpt_spi_log_info - Log information returned from SCSI Parallel IOC.
		* @ioc: Pointer to MPT_ADAPTER structure
		* @mr: Pointer to MPT reply frame
		* @log_info: U32 LogInfo word from the IOC
		*
		* Refer to lsi/sp_log.h.
		@@ -7176,7 +7173,7 @@ union loginfo_type {

		sas_loginfo.loginfo = log_info;
		if ((sas_loginfo.dw.bus_type != 3 /SAS/) &&
		(sas_loginfo.dw.originator < sizeof(originator_str)/sizeof(char*)))
		(sas_loginfo.dw.originator < ARRAY_SIZE(originator_str)))
		return;

		originator_desc = originator_str[sas_loginfo.dw.originator];
		@@ -7185,21 +7182,21 @@ union loginfo_type {

		case 0: /* IOP */
		if (sas_loginfo.dw.code <
		sizeof(iop_code_str)/sizeof(char*))
		ARRAY_SIZE(iop_code_str))
		code_desc = iop_code_str[sas_loginfo.dw.code];
		break;
		case 1: /* PL */
		if (sas_loginfo.dw.code <
		sizeof(pl_code_str)/sizeof(char*))
		ARRAY_SIZE(pl_code_str))
		code_desc = pl_code_str[sas_loginfo.dw.code];
		break;
		case 2: /* IR */
		if (sas_loginfo.dw.code >=
		sizeof(ir_code_str)/sizeof(char*))
		ARRAY_SIZE(ir_code_str))
		break;
		code_desc = ir_code_str[sas_loginfo.dw.code];
		if (sas_loginfo.dw.subcode >=
		sizeof(raid_sub_code_str)/sizeof(char*))
		ARRAY_SIZE(raid_sub_code_str))
		break;
		if (sas_loginfo.dw.code == 0)
		sub_code_desc =

Admin message