Commit 71e4634e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SCSI target updates from Nicholas Bellinger:
 "The highlights this round include:

   - Introduce configfs support for unlocked configfs_depend_item()
     (krzysztof + andrezej)
   - Conversion of usb-gadget target driver to new function registration
     interface (andrzej + sebastian)
   - Enable qla2xxx FC target mode support for Extended Logins (himansu +
     giridhar)
   - Enable qla2xxx FC target mode support for Exchange Offload (himansu +
     giridhar)
   - Add qla2xxx FC target mode irq affinity notification + selective
     command queuing.  (quinn + himanshu)
   - Fix iscsi-target deadlock in se_node_acl configfs deletion (sagi +
     nab)
   - Convert se_node_acl configfs deletion + se_node_acl->queue_depth to
     proper se_session->sess_kref + target_get_session() usage.  (hch +
     sagi + nab)
   - Fix long-standing race between se_node_acl->acl_kref get and
     get_initiator_node_acl() lookup.  (hch + nab)
   - Fix target/user block-size handling, and make sure netlink reaches
     all network namespaces (sheng + andy)

  Note there is an outstanding bug-fix series for remote I_T nexus port
  TMR LUN_RESET has been posted and still being tested, and will likely
  become post -rc1 material at this point"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (56 commits)
  scsi: qla2xxxx: avoid type mismatch in comparison
  target/user: Make sure netlink would reach all network namespaces
  target: Obtain se_node_acl->acl_kref during get_initiator_node_acl
  target: Convert ACL change queue_depth se_session reference usage
  iscsi-target: Fix potential dead-lock during node acl delete
  ib_srpt: Convert acl lookup to modern get_initiator_node_acl usage
  tcm_fc: Convert acl lookup to modern get_initiator_node_acl usage
  tcm_fc: Wait for command completion before freeing a session
  target: Fix a memory leak in target_dev_lba_map_store()
  target: Support aborting tasks with a 64-bit tag
  usb/gadget: Remove set-but-not-used variables
  target: Remove an unused variable
  target: Fix indentation in target_core_configfs.c
  target/user: Allow user to set block size before enabling device
  iser-target: Fix non negative ERR_PTR isert_device_get usage
  target/fcoe: Add tag support to tcm_fc
  qla2xxx: Check for online flag instead of active reset when transmitting responses
  qla2xxx: Set all queues to 4k
  qla2xxx: Disable ZIO at start time.
  qla2xxx: Move atioq to a different lock to reduce lock contention
  ...
parents 19a3dd76 fab683eb

Documentation/ABI/testing/configfs-usb-gadget-tcm

0 → 100644
+6 −0
Original line number Diff line number Diff line 
What:		/config/usb-gadget/gadget/functions/tcm.name

Date:		Dec 2015

KernelVersion:	4.5

Description:

		There are no attributes because all the configuration

		is performed in the "target" subsystem of configfs.

drivers/infiniband/ulp/isert/ib_isert.c

+5 −2
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ isert_create_device_ib_res(struct isert_device *device) 
	dev_attr = &device->dev_attr;

	ret = isert_query_device(device->ib_device, dev_attr);

	if (ret)

		return ret;

		goto out;



	/* asign function handlers */

	if (dev_attr->device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS &&
@@ -366,7 +366,7 @@ isert_create_device_ib_res(struct isert_device *device) 


	ret = isert_alloc_comps(device, dev_attr);

	if (ret)

		return ret;

		goto out;



	device->pd = ib_alloc_pd(device->ib_device);

	if (IS_ERR(device->pd)) {
@@ -384,6 +384,9 @@ isert_create_device_ib_res(struct isert_device *device) 


out_cq:

	isert_free_comps(device);

out:

	if (ret > 0)

		ret = -EINVAL;

	return ret;

}

drivers/infiniband/ulp/srpt/ib_srpt.c

+30 −73
Original line number Diff line number Diff line
@@ -2370,31 +2370,6 @@ static void srpt_release_channel_work(struct work_struct *w) 
	kfree(ch);

}



static struct srpt_node_acl *__srpt_lookup_acl(struct srpt_port *sport,

					       u8 i_port_id[16])

{

	struct srpt_node_acl *nacl;



	list_for_each_entry(nacl, &sport->port_acl_list, list)

		if (memcmp(nacl->i_port_id, i_port_id,

			   sizeof(nacl->i_port_id)) == 0)

			return nacl;



	return NULL;

}



static struct srpt_node_acl *srpt_lookup_acl(struct srpt_port *sport,

					     u8 i_port_id[16])

{

	struct srpt_node_acl *nacl;



	spin_lock_irq(&sport->port_acl_lock);

	nacl = __srpt_lookup_acl(sport, i_port_id);

	spin_unlock_irq(&sport->port_acl_lock);



	return nacl;

}



/**

 * srpt_cm_req_recv() - Process the event IB_CM_REQ_RECEIVED.

 *
@@ -2412,10 +2387,10 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id, 
	struct srp_login_rej *rej;

	struct ib_cm_rep_param *rep_param;

	struct srpt_rdma_ch *ch, *tmp_ch;

	struct srpt_node_acl *nacl;

	struct se_node_acl *se_acl;

	u32 it_iu_len;

	int i;

	int ret = 0;

	int i, ret = 0;

	unsigned char *p;



	WARN_ON_ONCE(irqs_disabled());
@@ -2565,33 +2540,47 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id, 
		       " RTR failed (error code = %d)\n", ret);

		goto destroy_ib;

	}



	/*

	 * Use the initator port identifier as the session name.

	 * Use the initator port identifier as the session name, when

	 * checking against se_node_acl->initiatorname[] this can be

	 * with or without preceeding '0x'.

	 */

	snprintf(ch->sess_name, sizeof(ch->sess_name), "0x%016llx%016llx",

			be64_to_cpu(*(__be64 *)ch->i_port_id),

			be64_to_cpu(*(__be64 *)(ch->i_port_id + 8)));



	pr_debug("registering session %s\n", ch->sess_name);

	p = &ch->sess_name[0];



	nacl = srpt_lookup_acl(sport, ch->i_port_id);

	if (!nacl) {

	ch->sess = transport_init_session(TARGET_PROT_NORMAL);

	if (IS_ERR(ch->sess)) {

		rej->reason = cpu_to_be32(

				SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);

		pr_debug("Failed to create session\n");

		goto destroy_ib;

	}



try_again:

	se_acl = core_tpg_get_initiator_node_acl(&sport->port_tpg_1, p);

	if (!se_acl) {

		pr_info("Rejected login because no ACL has been"

			" configured yet for initiator %s.\n", ch->sess_name);

		/*

		 * XXX: Hack to retry of ch->i_port_id without leading '0x'

		 */

		if (p == &ch->sess_name[0]) {

			p += 2;

			goto try_again;

		}

		rej->reason = cpu_to_be32(

				SRP_LOGIN_REJ_CHANNEL_LIMIT_REACHED);

		transport_free_session(ch->sess);

		goto destroy_ib;

	}

	ch->sess->se_node_acl = se_acl;



	ch->sess = transport_init_session(TARGET_PROT_NORMAL);

	if (IS_ERR(ch->sess)) {

		rej->reason = cpu_to_be32(

			      SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);

		pr_debug("Failed to create session\n");

		goto deregister_session;

	}

	ch->sess->se_node_acl = &nacl->nacl;

	transport_register_session(&sport->port_tpg_1, &nacl->nacl, ch->sess, ch);

	transport_register_session(&sport->port_tpg_1, se_acl, ch->sess, ch);



	pr_debug("Establish connection sess=%p name=%s cm_id=%p\n", ch->sess,

		 ch->sess_name, ch->cm_id);
@@ -2635,8 +2624,6 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id, 
release_channel:

	srpt_set_ch_state(ch, CH_RELEASING);

	transport_deregister_session_configfs(ch->sess);



deregister_session:

	transport_deregister_session(ch->sess);

	ch->sess = NULL;
@@ -3273,8 +3260,6 @@ static void srpt_add_one(struct ib_device *device) 
		sport->port_attrib.srp_max_rsp_size = DEFAULT_MAX_RSP_SIZE;

		sport->port_attrib.srp_sq_size = DEF_SRPT_SQ_SIZE;

		INIT_WORK(&sport->work, srpt_refresh_port_work);

		INIT_LIST_HEAD(&sport->port_acl_list);

		spin_lock_init(&sport->port_acl_lock);



		if (srpt_refresh_port(sport)) {

			pr_err("MAD registration failed for %s-%d.\n",
@@ -3508,42 +3493,15 @@ out: 
 */

static int srpt_init_nodeacl(struct se_node_acl *se_nacl, const char *name)

{

	struct srpt_port *sport =

		container_of(se_nacl->se_tpg, struct srpt_port, port_tpg_1);

	struct srpt_node_acl *nacl =

		container_of(se_nacl, struct srpt_node_acl, nacl);

	u8 i_port_id[16];



	if (srpt_parse_i_port_id(i_port_id, name) < 0) {

		pr_err("invalid initiator port ID %s\n", name);

		return -EINVAL;

	}



	memcpy(&nacl->i_port_id[0], &i_port_id[0], 16);

	nacl->sport = sport;



	spin_lock_irq(&sport->port_acl_lock);

	list_add_tail(&nacl->list, &sport->port_acl_list);

	spin_unlock_irq(&sport->port_acl_lock);



	return 0;

}



/*

 * configfs callback function invoked for

 * rmdir /sys/kernel/config/target/$driver/$port/$tpg/acls/$i_port_id

 */

static void srpt_cleanup_nodeacl(struct se_node_acl *se_nacl)

{

	struct srpt_node_acl *nacl =

		container_of(se_nacl, struct srpt_node_acl, nacl);

	struct srpt_port *sport = nacl->sport;



	spin_lock_irq(&sport->port_acl_lock);

	list_del(&nacl->list);

	spin_unlock_irq(&sport->port_acl_lock);

}



static ssize_t srpt_tpg_attrib_srp_max_rdma_size_show(struct config_item *item,

		char *page)

{
@@ -3820,7 +3778,6 @@ static const struct target_core_fabric_ops srpt_template = { 
	.fabric_make_tpg		= srpt_make_tpg,

	.fabric_drop_tpg		= srpt_drop_tpg,

	.fabric_init_nodeacl		= srpt_init_nodeacl,

	.fabric_cleanup_nodeacl		= srpt_cleanup_nodeacl,



	.tfc_wwn_attrs			= srpt_wwn_attrs,

	.tfc_tpg_base_attrs		= srpt_tpg_attrs,

drivers/infiniband/ulp/srpt/ib_srpt.h

+0 −8
Original line number Diff line number Diff line
@@ -364,11 +364,9 @@ struct srpt_port { 
	u16			sm_lid;

	u16			lid;

	union ib_gid		gid;

	spinlock_t		port_acl_lock;

	struct work_struct	work;

	struct se_portal_group	port_tpg_1;

	struct se_wwn		port_wwn;

	struct list_head	port_acl_list;

	struct srpt_port_attrib port_attrib;

};
@@ -409,15 +407,9 @@ struct srpt_device { 
/**

 * struct srpt_node_acl - Per-initiator ACL data (managed via configfs).

 * @nacl:      Target core node ACL information.

 * @i_port_id: 128-bit SRP initiator port ID.

 * @sport:     port information.

 * @list:      Element of the per-HCA ACL list.

 */

struct srpt_node_acl {

	struct se_node_acl	nacl;

	u8			i_port_id[16];

	struct srpt_port	*sport;

	struct list_head	list;

};



#endif				/* IB_SRPT_H */

drivers/scsi/qla2xxx/qla_attr.c

+36 −0
Original line number Diff line number Diff line
@@ -823,6 +823,41 @@ static struct bin_attribute sysfs_reset_attr = { 
	.write = qla2x00_sysfs_write_reset,

};



static ssize_t

qla2x00_issue_logo(struct file *filp, struct kobject *kobj,

			struct bin_attribute *bin_attr,

			char *buf, loff_t off, size_t count)

{

	struct scsi_qla_host *vha = shost_priv(dev_to_shost(container_of(kobj,

	    struct device, kobj)));

	int type;

	int rval = 0;

	port_id_t did;



	type = simple_strtol(buf, NULL, 10);



	did.b.domain = (type & 0x00ff0000) >> 16;

	did.b.area = (type & 0x0000ff00) >> 8;

	did.b.al_pa = (type & 0x000000ff);



	ql_log(ql_log_info, vha, 0x70e3, "portid=%02x%02x%02x done\n",

	    did.b.domain, did.b.area, did.b.al_pa);



	ql_log(ql_log_info, vha, 0x70e4, "%s: %d\n", __func__, type);



	rval = qla24xx_els_dcmd_iocb(vha, ELS_DCMD_LOGO, did);

	return count;

}



static struct bin_attribute sysfs_issue_logo_attr = {

	.attr = {

		.name = "issue_logo",

		.mode = S_IWUSR,

	},

	.size = 0,

	.write = qla2x00_issue_logo,

};



static ssize_t

qla2x00_sysfs_read_xgmac_stats(struct file *filp, struct kobject *kobj,

		       struct bin_attribute *bin_attr,
@@ -937,6 +972,7 @@ static struct sysfs_entry { 
	{ "vpd", &sysfs_vpd_attr, 1 },

	{ "sfp", &sysfs_sfp_attr, 1 },

	{ "reset", &sysfs_reset_attr, },

	{ "issue_logo", &sysfs_issue_logo_attr, },

	{ "xgmac_stats", &sysfs_xgmac_stats_attr, 3 },

	{ "dcbx_tlv", &sysfs_dcbx_tlv_attr, 3 },

	{ NULL },

CRA Git | Maintained and supported by SUSTech CRA and CCSE