Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 733db573 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SCSI target fixes from Nicholas Bellinger:
 "This series is larger than what I'd normally be conformable with
  sending for a -rc5 PULL request..

  However, the bulk of the series is localized to qla2xxx target
  specific fixes that address a number of real-world correctness issues,
  that have been outstanding on the list for ~6 weeks now.  They where
  submitted + verified + acked by the HW LLD vendor, contributed by a
  major production customer of the code, and are marked for v3.18.y
  stable code.

  That said, I don't see a good reason to wait another month to get
  these fixes into mainline.

  Beyond the qla2xx specific fixes, this series also includes:

   - bugfix for a long standing use-after-free in iscsi-target during
     TPG shutdown + demo-mode sessions.

   - bugfix for a >= v4.0 regression OOPs in iscsi-target during a
     iscsi_start_kthreads() failure.

   - bugfix for a >= v4.0 regression hang in iscsi-target for iser
     explicit session/connection logout.

   - bugfix for a iser-target bug where a early CMA REJECTED status
     during login triggers a NULL pointer dereference OOPs.

   - bugfixes for a handful of v4.2-rc1 specific regressions related to
     the larger set of recent backend configfs attribute changes.

  A big thanks to QLogic + Pure Storage for the qla2xxx target bugfixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (28 commits)
  Documentation/target: Fix tcm_mod_builder.py build breakage
  iser-target: Fix REJECT CM event use-after-free OOPs
  iscsi-target: Fix iser explicit logout TX kthread leak
  iscsi-target: Fix iscsit_start_kthreads failure OOPs
  iscsi-target: Fix use-after-free during TPG session shutdown
  qla2xxx: terminate exchange when command is aborted by LIO
  qla2xxx: drop cmds/tmrs arrived while session is being deleted
  qla2xxx: disable scsi_transport_fc registration in target mode
  qla2xxx: added sess generations to detect RSCN update races
  qla2xxx: Abort stale cmds on qla_tgt_wq when plogi arrives
  qla2xxx: delay plogi/prli ack until existing sessions are deleted
  qla2xxx: cleanup cmd in qla workqueue before processing TMR
  qla2xxx: kill sessions/log out initiator on RSCN and port down events
  qla2xxx: fix command initialization in target mode.
  qla2xxx: Remove msleep in qlt_send_term_exchange
  qla2xxx: adjust debug flags
  qla2xxx: release request queue reservation.
  qla2xxx: Add flush after updating ATIOQ consumer index.
  qla2xxx: Enable target mode for ISP27XX
  qla2xxx: Fix hardware lock/unlock issue causing kernel panic.
  ...
parents 956325bd c4cfdd81

Documentation/target/tcm_mod_builder.py

+14 −7
Original line number Diff line number Diff line
@@ -199,7 +199,8 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "#include <linux/string.h>\n"

	buf += "#include <linux/configfs.h>\n"

	buf += "#include <linux/ctype.h>\n"

	buf += "#include <asm/unaligned.h>\n\n"

	buf += "#include <asm/unaligned.h>\n"

	buf += "#include <scsi/scsi_proto.h>\n\n"

	buf += "#include <target/target_core_base.h>\n"

	buf += "#include <target/target_core_fabric.h>\n"

	buf += "#include <target/target_core_fabric_configfs.h>\n"
@@ -230,8 +231,14 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "	}\n"

	buf += "	tpg->" + fabric_mod_port + " = " + fabric_mod_port + ";\n"

	buf += "	tpg->" + fabric_mod_port + "_tpgt = tpgt;\n\n"

	buf += "	ret = core_tpg_register(&" + fabric_mod_name + "_ops, wwn,\n"

	buf += "				&tpg->se_tpg, SCSI_PROTOCOL_SAS);\n"



	if proto_ident == "FC":

		buf += "	ret = core_tpg_register(wwn, &tpg->se_tpg, SCSI_PROTOCOL_FCP);\n"

	elif proto_ident == "SAS":

		buf += "	ret = core_tpg_register(wwn, &tpg->se_tpg, SCSI_PROTOCOL_SAS);\n"

	elif proto_ident == "iSCSI":

		buf += "	ret = core_tpg_register(wwn, &tpg->se_tpg, SCSI_PROTOCOL_ISCSI);\n"



	buf += "	if (ret < 0) {\n"

	buf += "		kfree(tpg);\n"

	buf += "		return NULL;\n"
@@ -292,7 +299,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 


	buf += "static const struct target_core_fabric_ops " + fabric_mod_name + "_ops = {\n"

	buf += "	.module				= THIS_MODULE,\n"

	buf += "	.name				= " + fabric_mod_name + ",\n"

	buf += "	.name				= \"" + fabric_mod_name + "\",\n"

	buf += "	.get_fabric_name		= " + fabric_mod_name + "_get_fabric_name,\n"

	buf += "	.tpg_get_wwn			= " + fabric_mod_name + "_get_fabric_wwn,\n"

	buf += "	.tpg_get_tag			= " + fabric_mod_name + "_get_tag,\n"
@@ -322,17 +329,17 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "	.fabric_make_tpg		= " + fabric_mod_name + "_make_tpg,\n"

	buf += "	.fabric_drop_tpg		= " + fabric_mod_name + "_drop_tpg,\n"

	buf += "\n"

	buf += "	.tfc_wwn_attrs			= " + fabric_mod_name + "_wwn_attrs;\n"

	buf += "	.tfc_wwn_attrs			= " + fabric_mod_name + "_wwn_attrs,\n"

	buf += "};\n\n"



	buf += "static int __init " + fabric_mod_name + "_init(void)\n"

	buf += "{\n"

	buf += "	return target_register_template(" + fabric_mod_name + "_ops);\n"

	buf += "	return target_register_template(&" + fabric_mod_name + "_ops);\n"

	buf += "};\n\n"



	buf += "static void __exit " + fabric_mod_name + "_exit(void)\n"

	buf += "{\n"

	buf += "	target_unregister_template(" + fabric_mod_name + "_ops);\n"

	buf += "	target_unregister_template(&" + fabric_mod_name + "_ops);\n"

	buf += "};\n\n"



	buf += "MODULE_DESCRIPTION(\"" + fabric_mod_name.upper() + " series fabric driver\");\n"

drivers/infiniband/ulp/isert/ib_isert.c

+11 −5
Original line number Diff line number Diff line
@@ -775,6 +775,17 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event) 
	ret = isert_rdma_post_recvl(isert_conn);

	if (ret)

		goto out_conn_dev;

	/*

	 * Obtain the second reference now before isert_rdma_accept() to

	 * ensure that any initiator generated REJECT CM event that occurs

	 * asynchronously won't drop the last reference until the error path

	 * in iscsi_target_login_sess_out() does it's ->iscsit_free_conn() ->

	 * isert_free_conn() -> isert_put_conn() -> kref_put().

	 */

	if (!kref_get_unless_zero(&isert_conn->kref)) {

		isert_warn("conn %p connect_release is running\n", isert_conn);

		goto out_conn_dev;

	}



	ret = isert_rdma_accept(isert_conn);

	if (ret)
@@ -836,11 +847,6 @@ isert_connected_handler(struct rdma_cm_id *cma_id) 


	isert_info("conn %p\n", isert_conn);



	if (!kref_get_unless_zero(&isert_conn->kref)) {

		isert_warn("conn %p connect_release is running\n", isert_conn);

		return;

	}



	mutex_lock(&isert_conn->mutex);

	if (isert_conn->state != ISER_CONN_FULL_FEATURE)

		isert_conn->state = ISER_CONN_UP;

drivers/scsi/qla2xxx/qla_attr.c

+1 −1
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj, 
		ql_log(ql_log_info, vha, 0x706f,

		    "Issuing MPI reset.\n");



		if (IS_QLA83XX(ha)) {

		if (IS_QLA83XX(ha) || IS_QLA27XX(ha)) {

			uint32_t idc_control;



			qla83xx_idc_lock(vha, 0);

drivers/scsi/qla2xxx/qla_dbg.c

+3 −3
Original line number Diff line number Diff line
@@ -67,10 +67,10 @@ 
 * |                              |                    | 0xd031-0xd0ff	|

 * |                              |                    | 0xd101-0xd1fe	|

 * |                              |                    | 0xd214-0xd2fe	|

 * | Target Mode		  |	  0xe079       |		|

 * | Target Mode Management	  |	  0xf072       | 0xf002		|

 * | Target Mode		  |	  0xe080       |		|

 * | Target Mode Management	  |	  0xf096       | 0xf002		|

 * |                              |                    | 0xf046-0xf049  |

 * | Target Mode Task Management  |	  0x1000b      |		|

 * | Target Mode Task Management  |	  0x1000d      |		|

 * ----------------------------------------------------------------------

 */

drivers/scsi/qla2xxx/qla_def.h

+16 −4
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ 
#define RESPONSE_ENTRY_CNT_FX00		256     /* Number of response entries.*/



struct req_que;

struct qla_tgt_sess;



/*

 * (sd.h is not exported, hence local inclusion)
@@ -2026,6 +2027,7 @@ typedef struct fc_port { 
	uint16_t port_id;



	unsigned long retry_delay_timestamp;

	struct qla_tgt_sess *tgt_session;

} fc_port_t;



#include "qla_mr.h"
@@ -3154,13 +3156,13 @@ struct qla_hw_data { 
/* Bit 21 of fw_attributes decides the MCTP capabilities */

#define IS_MCTP_CAPABLE(ha)	(IS_QLA2031(ha) && \

				((ha)->fw_attributes_ext[0] & BIT_0))

#define IS_PI_UNINIT_CAPABLE(ha)	(IS_QLA83XX(ha))

#define IS_PI_IPGUARD_CAPABLE(ha)	(IS_QLA83XX(ha))

#define IS_PI_UNINIT_CAPABLE(ha)	(IS_QLA83XX(ha) || IS_QLA27XX(ha))

#define IS_PI_IPGUARD_CAPABLE(ha)	(IS_QLA83XX(ha) || IS_QLA27XX(ha))

#define IS_PI_DIFB_DIX0_CAPABLE(ha)	(0)

#define IS_PI_SPLIT_DET_CAPABLE_HBA(ha)	(IS_QLA83XX(ha))

#define IS_PI_SPLIT_DET_CAPABLE_HBA(ha)	(IS_QLA83XX(ha) || IS_QLA27XX(ha))

#define IS_PI_SPLIT_DET_CAPABLE(ha)	(IS_PI_SPLIT_DET_CAPABLE_HBA(ha) && \

    (((ha)->fw_attributes_h << 16 | (ha)->fw_attributes) & BIT_22))

#define IS_ATIO_MSIX_CAPABLE(ha) (IS_QLA83XX(ha))

#define IS_ATIO_MSIX_CAPABLE(ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha))

#define IS_TGT_MODE_CAPABLE(ha)	(ha->tgt.atio_q_length)

#define IS_SHADOW_REG_CAPABLE(ha)  (IS_QLA27XX(ha))

#define IS_DPORT_CAPABLE(ha)  (IS_QLA83XX(ha) || IS_QLA27XX(ha))
@@ -3579,6 +3581,16 @@ typedef struct scsi_qla_host { 
	uint16_t	fcoe_fcf_idx;

	uint8_t		fcoe_vn_port_mac[6];



	/* list of commands waiting on workqueue */

	struct list_head	qla_cmd_list;

	struct list_head	qla_sess_op_cmd_list;

	spinlock_t		cmd_list_lock;



	/* Counter to detect races between ELS and RSCN events */

	atomic_t		generation_tick;

	/* Time when global fcport update has been scheduled */

	int			total_fcport_update_gen;



	uint32_t	vp_abort_cnt;



	struct fc_vport	*fc_vport;	/* holds fc_vport * for each vport */