Commit 5c64e3a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'queue' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 

Pull target fixes from Nicholas Bellinger:
 "A handful of fixes + minor changes this time around, along with one
  important >= v3.9 regression fix for IBLOCK backends.  The highlights
  include:

   - Use FD_MAX_SECTORS in FILEIO for block_device as
     well as files (agrover)

   - Fix processing of out-of-order CmdSNs with
     iSBD driver (shlomo)

   - Close long-standing target_put_sess_cmd() vs.
     core_tmr_abort_task() race with the addition of
     kref_put_spinlock_irqsave() (joern + greg-kh)

   - Fix IBLOCK WCE=1 + DPOFUA=1 backend WRITE
     regression in >= v3.9 (nab + bootc)

  Note these four patches are CC'ed to stable.

  Also, there is still some work left to be done on the active I/O
  shutdown path in target_wait_for_sess_cmds() used by tcm_qla2xxx +
  ib_isert fabrics that is still being discussed on the list, and will
  hopefully be resolved soon."

* 'queue' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target: close target_put_sess_cmd() vs. core_tmr_abort_task() race
  target: removed unused transport_state flag
  target/iblock: Fix WCE=1 + DPOFUA=1 backend WRITE regression
  MAINTAINERS: Update target git tree URL
  iscsi-target: Fix typos in RDMAEXTENSIONS macro usage
  target/rd: Add ramdisk bit for NULLIO operation
  iscsi-target: Fix processing of OOO commands
  iscsi-target: Make buf param of iscsit_do_crypto_hash_buf() const void *
  iscsi-target: Fix NULL pointer dereference in iscsit_send_reject
  target: Have dev/enable show if TCM device is configured
  target: Use FD_MAX_SECTORS/FD_BLOCKSIZE for blockdevs using fileio
  target: Remove unused struct members in se_dev_entry
parents c240a539 ccf5ae83

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -7854,7 +7854,7 @@ L: linux-scsi@vger.kernel.org 
L:	target-devel@vger.kernel.org

L:	http://groups.google.com/group/linux-iscsi-target-dev

W:	http://www.linux-iscsi.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core.git master

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master

S:	Supported

F:	drivers/target/

F:	include/target/

drivers/target/iscsi/iscsi_target.c

+26 −37
Original line number Diff line number Diff line
@@ -1250,7 +1250,7 @@ static u32 iscsit_do_crypto_hash_sg( 


static void iscsit_do_crypto_hash_buf(

	struct hash_desc *hash,

	unsigned char *buf,

	const void *buf,

	u32 payload_length,

	u32 padding,

	u8 *pad_bytes,
@@ -2524,9 +2524,8 @@ static int iscsit_send_conn_drop_async_message( 
	if (conn->conn_ops->HeaderDigest) {

		u32 *header_digest = (u32 *)&cmd->pdu[ISCSI_HDR_LEN];



		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash,

				(unsigned char *)hdr, ISCSI_HDR_LEN,

				0, NULL, (u8 *)header_digest);

		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash, hdr,

				ISCSI_HDR_LEN, 0, NULL, (u8 *)header_digest);



		cmd->tx_size += ISCSI_CRC_LEN;

		pr_debug("Attaching CRC32C HeaderDigest to"
@@ -2662,9 +2661,8 @@ static int iscsit_send_datain(struct iscsi_cmd *cmd, struct iscsi_conn *conn) 
	if (conn->conn_ops->HeaderDigest) {

		u32 *header_digest = (u32 *)&cmd->pdu[ISCSI_HDR_LEN];



		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash,

				(unsigned char *)cmd->pdu, ISCSI_HDR_LEN,

				0, NULL, (u8 *)header_digest);

		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash, cmd->pdu,

				ISCSI_HDR_LEN, 0, NULL, (u8 *)header_digest);



		iov[0].iov_len += ISCSI_CRC_LEN;

		tx_size += ISCSI_CRC_LEN;
@@ -2841,9 +2839,8 @@ iscsit_send_logout(struct iscsi_cmd *cmd, struct iscsi_conn *conn) 
	if (conn->conn_ops->HeaderDigest) {

		u32 *header_digest = (u32 *)&cmd->pdu[ISCSI_HDR_LEN];



		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash,

				(unsigned char *)&cmd->pdu[0], ISCSI_HDR_LEN,

				0, NULL, (u8 *)header_digest);

		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash, &cmd->pdu[0],

				ISCSI_HDR_LEN, 0, NULL, (u8 *)header_digest);



		iov[0].iov_len += ISCSI_CRC_LEN;

		tx_size += ISCSI_CRC_LEN;
@@ -2900,9 +2897,8 @@ static int iscsit_send_unsolicited_nopin( 
	if (conn->conn_ops->HeaderDigest) {

		u32 *header_digest = (u32 *)&cmd->pdu[ISCSI_HDR_LEN];



		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash,

				(unsigned char *)hdr, ISCSI_HDR_LEN,

				0, NULL, (u8 *)header_digest);

		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash, hdr,

				ISCSI_HDR_LEN, 0, NULL, (u8 *)header_digest);



		tx_size += ISCSI_CRC_LEN;

		pr_debug("Attaching CRC32C HeaderDigest to"
@@ -2949,9 +2945,8 @@ iscsit_send_nopin(struct iscsi_cmd *cmd, struct iscsi_conn *conn) 
	if (conn->conn_ops->HeaderDigest) {

		u32 *header_digest = (u32 *)&cmd->pdu[ISCSI_HDR_LEN];



		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash,

				(unsigned char *)hdr, ISCSI_HDR_LEN,

				0, NULL, (u8 *)header_digest);

		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash, hdr,

				ISCSI_HDR_LEN, 0, NULL, (u8 *)header_digest);



		iov[0].iov_len += ISCSI_CRC_LEN;

		tx_size += ISCSI_CRC_LEN;
@@ -3040,9 +3035,8 @@ static int iscsit_send_r2t( 
	if (conn->conn_ops->HeaderDigest) {

		u32 *header_digest = (u32 *)&cmd->pdu[ISCSI_HDR_LEN];



		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash,

				(unsigned char *)hdr, ISCSI_HDR_LEN,

				0, NULL, (u8 *)header_digest);

		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash, hdr,

				ISCSI_HDR_LEN, 0, NULL, (u8 *)header_digest);



		cmd->iov_misc[0].iov_len += ISCSI_CRC_LEN;

		tx_size += ISCSI_CRC_LEN;
@@ -3256,9 +3250,8 @@ static int iscsit_send_response(struct iscsi_cmd *cmd, struct iscsi_conn *conn) 
	if (conn->conn_ops->HeaderDigest) {

		u32 *header_digest = (u32 *)&cmd->pdu[ISCSI_HDR_LEN];



		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash,

				(unsigned char *)cmd->pdu, ISCSI_HDR_LEN,

				0, NULL, (u8 *)header_digest);

		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash, cmd->pdu,

				ISCSI_HDR_LEN, 0, NULL, (u8 *)header_digest);



		iov[0].iov_len += ISCSI_CRC_LEN;

		tx_size += ISCSI_CRC_LEN;
@@ -3329,9 +3322,8 @@ iscsit_send_task_mgt_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn) 
	if (conn->conn_ops->HeaderDigest) {

		u32 *header_digest = (u32 *)&cmd->pdu[ISCSI_HDR_LEN];



		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash,

				(unsigned char *)hdr, ISCSI_HDR_LEN,

				0, NULL, (u8 *)header_digest);

		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash, hdr,

				ISCSI_HDR_LEN, 0, NULL, (u8 *)header_digest);



		cmd->iov_misc[0].iov_len += ISCSI_CRC_LEN;

		tx_size += ISCSI_CRC_LEN;
@@ -3504,9 +3496,8 @@ static int iscsit_send_text_rsp( 
	if (conn->conn_ops->HeaderDigest) {

		u32 *header_digest = (u32 *)&cmd->pdu[ISCSI_HDR_LEN];



		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash,

				(unsigned char *)hdr, ISCSI_HDR_LEN,

				0, NULL, (u8 *)header_digest);

		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash, hdr,

				ISCSI_HDR_LEN, 0, NULL, (u8 *)header_digest);



		iov[0].iov_len += ISCSI_CRC_LEN;

		tx_size += ISCSI_CRC_LEN;
@@ -3557,11 +3548,11 @@ static int iscsit_send_reject( 
	struct iscsi_cmd *cmd,

	struct iscsi_conn *conn)

{

	u32 iov_count = 0, tx_size = 0;

	struct iscsi_reject *hdr;

	struct iscsi_reject *hdr = (struct iscsi_reject *)&cmd->pdu[0];

	struct kvec *iov;

	u32 iov_count = 0, tx_size;



	iscsit_build_reject(cmd, conn, (struct iscsi_reject *)&cmd->pdu[0]);

	iscsit_build_reject(cmd, conn, hdr);



	iov = &cmd->iov_misc[0];

	iov[iov_count].iov_base = cmd->pdu;
@@ -3574,9 +3565,8 @@ static int iscsit_send_reject( 
	if (conn->conn_ops->HeaderDigest) {

		u32 *header_digest = (u32 *)&cmd->pdu[ISCSI_HDR_LEN];



		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash,

				(unsigned char *)hdr, ISCSI_HDR_LEN,

				0, NULL, (u8 *)header_digest);

		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash, hdr,

				ISCSI_HDR_LEN, 0, NULL, (u8 *)header_digest);



		iov[0].iov_len += ISCSI_CRC_LEN;

		tx_size += ISCSI_CRC_LEN;
@@ -3585,9 +3575,8 @@ static int iscsit_send_reject( 
	}



	if (conn->conn_ops->DataDigest) {

		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash,

				(unsigned char *)cmd->buf_ptr, ISCSI_HDR_LEN,

				0, NULL, (u8 *)&cmd->data_crc);

		iscsit_do_crypto_hash_buf(&conn->conn_tx_hash, cmd->buf_ptr,

				ISCSI_HDR_LEN, 0, NULL, (u8 *)&cmd->data_crc);



		iov[iov_count].iov_base = &cmd->data_crc;

		iov[iov_count++].iov_len  = ISCSI_CRC_LEN;

drivers/target/iscsi/iscsi_target_erl1.c

+4 −3
Original line number Diff line number Diff line
@@ -823,7 +823,7 @@ static int iscsit_attach_ooo_cmdsn( 
		/*

		 * CmdSN is greater than the tail of the list.

		 */

		if (ooo_tail->cmdsn < ooo_cmdsn->cmdsn)

		if (iscsi_sna_lt(ooo_tail->cmdsn, ooo_cmdsn->cmdsn))

			list_add_tail(&ooo_cmdsn->ooo_list,

					&sess->sess_ooo_cmdsn_list);

		else {
@@ -833,11 +833,12 @@ static int iscsit_attach_ooo_cmdsn( 
			 */

			list_for_each_entry(ooo_tmp, &sess->sess_ooo_cmdsn_list,

						ooo_list) {

				if (ooo_tmp->cmdsn < ooo_cmdsn->cmdsn)

				if (iscsi_sna_lt(ooo_tmp->cmdsn, ooo_cmdsn->cmdsn))

					continue;



				/* Insert before this entry */

				list_add(&ooo_cmdsn->ooo_list,

					&ooo_tmp->ooo_list);

					ooo_tmp->ooo_list.prev);

				break;

			}

		}

drivers/target/iscsi/iscsi_target_parameters.c

+4 −4
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ int iscsi_create_default_params(struct iscsi_param_list **param_list_ptr) 
	/*

	 * Extra parameters for ISER from RFC-5046

	 */

	param = iscsi_set_default_param(pl, RDMAEXTENTIONS, INITIAL_RDMAEXTENTIONS,

	param = iscsi_set_default_param(pl, RDMAEXTENSIONS, INITIAL_RDMAEXTENSIONS,

			PHASE_OPERATIONAL, SCOPE_SESSION_WIDE, SENDER_BOTH,

			TYPERANGE_BOOL_AND, USE_LEADING_ONLY);

	if (!param)
@@ -529,7 +529,7 @@ int iscsi_set_keys_to_negotiate( 
			SET_PSTATE_NEGOTIATE(param);

		} else if (!strcmp(param->name, OFMARKINT)) {

			SET_PSTATE_NEGOTIATE(param);

		} else if (!strcmp(param->name, RDMAEXTENTIONS)) {

		} else if (!strcmp(param->name, RDMAEXTENSIONS)) {

			if (iser == true)

				SET_PSTATE_NEGOTIATE(param);

		} else if (!strcmp(param->name, INITIATORRECVDATASEGMENTLENGTH)) {
@@ -580,7 +580,7 @@ int iscsi_set_keys_irrelevant_for_discovery( 
			param->state &= ~PSTATE_NEGOTIATE;

		else if (!strcmp(param->name, OFMARKINT))

			param->state &= ~PSTATE_NEGOTIATE;

		else if (!strcmp(param->name, RDMAEXTENTIONS))

		else if (!strcmp(param->name, RDMAEXTENSIONS))

			param->state &= ~PSTATE_NEGOTIATE;

		else if (!strcmp(param->name, INITIATORRECVDATASEGMENTLENGTH))

			param->state &= ~PSTATE_NEGOTIATE;
@@ -1977,7 +1977,7 @@ void iscsi_set_session_parameters( 
			ops->SessionType = !strcmp(param->value, DISCOVERY);

			pr_debug("SessionType:                  %s\n",

				param->value);

		} else if (!strcmp(param->name, RDMAEXTENTIONS)) {

		} else if (!strcmp(param->name, RDMAEXTENSIONS)) {

			ops->RDMAExtensions = !strcmp(param->value, YES);

			pr_debug("RDMAExtensions:               %s\n",

				param->value);

drivers/target/iscsi/iscsi_target_parameters.h

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ extern void iscsi_set_session_parameters(struct iscsi_sess_ops *, 
/*

 * Parameter names of iSCSI Extentions for RDMA (iSER).  See RFC-5046

 */

#define RDMAEXTENTIONS			"RDMAExtensions"

#define RDMAEXTENSIONS			"RDMAExtensions"

#define INITIATORRECVDATASEGMENTLENGTH	"InitiatorRecvDataSegmentLength"

#define TARGETRECVDATASEGMENTLENGTH	"TargetRecvDataSegmentLength"
@@ -142,7 +142,7 @@ extern void iscsi_set_session_parameters(struct iscsi_sess_ops *, 
/*

 * Initial values for iSER parameters following RFC-5046 Section 6

 */

#define INITIAL_RDMAEXTENTIONS			NO

#define INITIAL_RDMAEXTENSIONS			NO

#define INITIAL_INITIATORRECVDATASEGMENTLENGTH	"262144"

#define INITIAL_TARGETRECVDATASEGMENTLENGTH	"8192"

CRA Git | Maintained and supported by SUSTech CRA and CCSE