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

Commit 8fdf30d5 authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[SCSI] zfcp: Send ELS ADISC from workqueue 



Issue ELS ADISC requests from workqueue. This allows the link test
request to be sent when the request queue is full due to I/O load for
other remote ports. It also simplifies request queue locking,
zfcp_fsf_send_fcp_command_task is now the only function that has
interrupts disabled from the caller. This is also a prereq for the FC
passthrough support that issues ELS requests from userspace.

Acked-by: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 63caf367

drivers/s390/scsi/zfcp_aux.c

+1 −0
Original line number Diff line number Diff line
@@ -604,6 +604,7 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn, 
	init_waitqueue_head(&port->remove_wq);

	INIT_LIST_HEAD(&port->unit_list_head);

	INIT_WORK(&port->gid_pn_work, zfcp_erp_port_strategy_open_lookup);

	INIT_WORK(&port->test_link_work, zfcp_fc_link_test_work);



	port->adapter = adapter;

	port->d_id = d_id;

drivers/s390/scsi/zfcp_def.h

+1 −0
Original line number Diff line number Diff line
@@ -513,6 +513,7 @@ struct zfcp_port { 
	u32                    maxframe_size;

	u32                    supported_classes;

	struct work_struct     gid_pn_work;

	struct work_struct     test_link_work;

};



struct zfcp_unit {

drivers/s390/scsi/zfcp_ext.h

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ extern void zfcp_fc_incoming_els(struct zfcp_fsf_req *); 
extern int zfcp_fc_ns_gid_pn(struct zfcp_erp_action *);

extern void zfcp_fc_plogi_evaluate(struct zfcp_port *, struct fsf_plogi *);

extern void zfcp_test_link(struct zfcp_port *);

extern void zfcp_fc_link_test_work(struct work_struct *);

extern void zfcp_fc_nameserver_init(struct zfcp_adapter *);



/* zfcp_fsf.c */

drivers/s390/scsi/zfcp_fc.c

+18 −10
Original line number Diff line number Diff line
@@ -421,6 +421,22 @@ static int zfcp_fc_adisc(struct zfcp_port *port) 
	return zfcp_fsf_send_els(&adisc->els);

}



void zfcp_fc_link_test_work(struct work_struct *work)

{

	struct zfcp_port *port =

		container_of(work, struct zfcp_port, test_link_work);

	int retval;



	retval = zfcp_fc_adisc(port);

	if (retval == 0)

		return;



	/* send of ADISC was not possible */

	zfcp_port_put(port);

	if (retval != -EBUSY)

		zfcp_erp_port_forced_reopen(port, 0, 65, NULL);

}



/**

 * zfcp_test_link - lightweight link test procedure

 * @port: port to be tested
@@ -431,17 +447,9 @@ static int zfcp_fc_adisc(struct zfcp_port *port) 
 */

void zfcp_test_link(struct zfcp_port *port)

{

	int retval;



	zfcp_port_get(port);

	retval = zfcp_fc_adisc(port);

	if (retval == 0)

		return;



	/* send of ADISC was not possible */

	if (!queue_work(zfcp_data.work_queue, &port->test_link_work))

		zfcp_port_put(port);

	if (retval != -EBUSY)

		zfcp_erp_port_forced_reopen(port, 0, 65, NULL);

}



static void zfcp_free_sg_env(struct zfcp_gpn_ft *gpn_ft, int buf_num)

drivers/s390/scsi/zfcp_fsf.c

+6 −12
Original line number Diff line number Diff line
@@ -647,14 +647,6 @@ static void zfcp_fsf_exchange_port_data_handler(struct zfcp_fsf_req *req) 
	}

}



static int zfcp_fsf_sbal_available(struct zfcp_adapter *adapter)

{

	if (atomic_read(&adapter->req_q.count) > 0)

		return 1;

	atomic_inc(&adapter->qdio_outb_full);

	return 0;

}



static int zfcp_fsf_req_sbal_get(struct zfcp_adapter *adapter)

	__releases(&adapter->req_q_lock)

	__acquires(&adapter->req_q_lock)
@@ -1177,8 +1169,8 @@ int zfcp_fsf_send_els(struct zfcp_send_els *els) 
		       ZFCP_STATUS_COMMON_UNBLOCKED)))

		return -EBUSY;



	spin_lock(&adapter->req_q_lock);

	if (!zfcp_fsf_sbal_available(adapter))

	spin_lock_bh(&adapter->req_q_lock);

	if (zfcp_fsf_req_sbal_get(adapter))

		goto out;

	req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_ELS,

				  ZFCP_REQ_AUTO_CLEANUP, NULL);
@@ -1211,7 +1203,7 @@ int zfcp_fsf_send_els(struct zfcp_send_els *els) 
failed_send:

	zfcp_fsf_req_free(req);

out:

	spin_unlock(&adapter->req_q_lock);

	spin_unlock_bh(&adapter->req_q_lock);

	return ret;

}
@@ -2324,8 +2316,10 @@ int zfcp_fsf_send_fcp_command_task(struct zfcp_unit *unit, 
		return -EBUSY;



	spin_lock(&adapter->req_q_lock);

	if (!zfcp_fsf_sbal_available(adapter))

	if (atomic_read(&adapter->req_q.count) <= 0) {

		atomic_inc(&adapter->qdio_outb_full);

		goto out;

	}

	req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND,

				  ZFCP_REQ_AUTO_CLEANUP,

				  adapter->pool.fsf_req_scsi);