Commit abccec1f authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Jim Harris
Browse files

iscsi: Factor out check data segment length into a helper function 



The operation to read data segment of PDU will be enhanced to
support DIF insert operation ofr write I/O.

This patch factors out check data segment length operation into a
function to make the enhancement easier.

Change-Id: I4fbc3bd440192b3723435c9acf3b6b46d3ce4939
Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/446342


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 4d3a9847

lib/iscsi/iscsi.c

+41 −30
Original line number Diff line number Diff line
@@ -344,6 +344,46 @@ spdk_iscsi_pdu_calc_data_digest(struct spdk_iscsi_pdu *pdu) 
	return crc32c;

}



static bool

spdk_iscsi_check_data_segment_length(struct spdk_iscsi_conn *conn,

				     struct spdk_iscsi_pdu *pdu, int data_len)

{

	int max_segment_len;



	/*

	 * Determine the maximum segment length expected for this PDU.

	 *  This will be used to make sure the initiator did not send

	 *  us too much immediate data.

	 *

	 * This value is specified separately by the initiator and target,

	 *  and not negotiated.  So we can use the #define safely here,

	 *  since the value is not dependent on the initiator's maximum

	 *  segment lengths (FirstBurstLength/MaxRecvDataSegmentLength),

	 *  and SPDK currently does not allow configuration of these values

	 *  at runtime.

	 */

	if (conn->sess == NULL) {

		/*

		 * If the connection does not yet have a session, then

		 *  login is not complete and we use the 8KB default

		 *  FirstBurstLength as our maximum data segment length

		 *  value.

		 */

		max_segment_len = SPDK_ISCSI_FIRST_BURST_LENGTH;

	} else if (pdu->bhs.opcode == ISCSI_OP_SCSI_DATAOUT ||

		   pdu->bhs.opcode == ISCSI_OP_NOPOUT) {

		max_segment_len = SPDK_ISCSI_MAX_RECV_DATA_SEGMENT_LENGTH;

	} else {

		max_segment_len = spdk_get_immediate_data_buffer_size();

	}

	if (data_len <= max_segment_len) {

		return true;

	} else {

		SPDK_ERRLOG("Data(%d) > MaxSegment(%d)\n", data_len, max_segment_len);

		return false;

	}

}



int

spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu)

{
@@ -352,7 +392,6 @@ spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu) 
	uint32_t crc32c;

	int ahs_len;

	int data_len;

	int max_segment_len;

	int rc;



	if (conn->pdu_in_progress == NULL) {
@@ -492,35 +531,7 @@ spdk_iscsi_read_pdu(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu **_pdu) 


	/* Data Segment */

	if (data_len != 0) {

		/*

		 * Determine the maximum segment length expected for this PDU.

		 *  This will be used to make sure the initiator did not send

		 *  us too much immediate data.

		 *

		 * This value is specified separately by the initiator and target,

		 *  and not negotiated.  So we can use the #define safely here,

		 *  since the value is not dependent on the initiator's maximum

		 *  segment lengths (FirstBurstLength/MaxRecvDataSegmentLength),

		 *  and SPDK currently does not allow configuration of these values

		 *  at runtime.

		 */

		if (conn->sess == NULL) {

			/*

			 * If the connection does not yet have a session, then

			 *  login is not complete and we use the 8KB default

			 *  FirstBurstLength as our maximum data segment length

			 *  value.

			 */

			max_segment_len = SPDK_ISCSI_FIRST_BURST_LENGTH;

		} else if (pdu->bhs.opcode == ISCSI_OP_SCSI_DATAOUT) {

			max_segment_len = SPDK_ISCSI_MAX_RECV_DATA_SEGMENT_LENGTH;

		} else if (pdu->bhs.opcode == ISCSI_OP_NOPOUT) {

			max_segment_len = SPDK_ISCSI_MAX_RECV_DATA_SEGMENT_LENGTH;

		} else {

			max_segment_len = spdk_get_immediate_data_buffer_size();

		}

		if (data_len > max_segment_len) {

			SPDK_ERRLOG("Data(%d) > MaxSegment(%d)\n", data_len, max_segment_len);

		if (!spdk_iscsi_check_data_segment_length(conn, pdu, data_len)) {

			rc = spdk_iscsi_reject(conn, pdu, ISCSI_REASON_PROTOCOL_ERROR);

			spdk_put_pdu(pdu);