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

Commit 287ac01a authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[SCSI] zfcp: Cleanup code in zfcp_erp.c 



Cleanup the code in zfcp_erp.c, move erp internal definititions to
this file and move FSF timeout handling to the FSF layer.

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

drivers/s390/scsi/zfcp_def.h

+0 −45
Original line number Original line Diff line number Diff line
@@ -91,17 +91,11 @@ zfcp_address_to_sg(void *address, struct scatterlist *list, unsigned int size) 
        /* max. number of (data buffer) SBALEs in largest SBAL chain

        /* max. number of (data buffer) SBALEs in largest SBAL chain

           multiplied with number of sectors per 4k block */

           multiplied with number of sectors per 4k block */





#define ZFCP_TYPE2_RECOVERY_TIME        8	/* seconds */



/********************* FSF SPECIFIC DEFINES *********************************/

/********************* FSF SPECIFIC DEFINES *********************************/





/* ATTENTION: value must not be used by hardware */

/* ATTENTION: value must not be used by hardware */

#define FSF_QTCB_UNSOLICITED_STATUS		0x6305

#define FSF_QTCB_UNSOLICITED_STATUS		0x6305





/* Do 1st retry in 1 second, then double the timeout for each following retry */

#define ZFCP_EXCHANGE_CONFIG_DATA_FIRST_SLEEP	1

#define ZFCP_EXCHANGE_CONFIG_DATA_RETRIES	7



/* timeout value for "default timer" for fsf requests */

/* timeout value for "default timer" for fsf requests */

#define ZFCP_FSF_REQUEST_TIMEOUT (60*HZ)

#define ZFCP_FSF_REQUEST_TIMEOUT (60*HZ)
@@ -349,45 +343,6 @@ struct zfcp_rc_entry { 
#define ZFCP_STATUS_FSFREQ_RETRY                0x00000800

#define ZFCP_STATUS_FSFREQ_RETRY                0x00000800

#define ZFCP_STATUS_FSFREQ_DISMISSED            0x00001000

#define ZFCP_STATUS_FSFREQ_DISMISSED            0x00001000





/*********************** ERROR RECOVERY PROCEDURE DEFINES ********************/



#define ZFCP_MAX_ERPS                   3



#define ZFCP_ERP_FSFREQ_TIMEOUT		(30 * HZ)

#define ZFCP_ERP_MEMWAIT_TIMEOUT	HZ



#define ZFCP_STATUS_ERP_TIMEDOUT	0x10000000

#define ZFCP_STATUS_ERP_CLOSE_ONLY	0x01000000

#define ZFCP_STATUS_ERP_DISMISSING	0x00100000

#define ZFCP_STATUS_ERP_DISMISSED	0x00200000

#define ZFCP_STATUS_ERP_LOWMEM		0x00400000



#define ZFCP_ERP_STEP_UNINITIALIZED	0x00000000

#define ZFCP_ERP_STEP_FSF_XCONFIG	0x00000001

#define ZFCP_ERP_STEP_PHYS_PORT_CLOSING	0x00000010

#define ZFCP_ERP_STEP_PORT_CLOSING	0x00000100

#define ZFCP_ERP_STEP_NAMESERVER_OPEN	0x00000200

#define ZFCP_ERP_STEP_NAMESERVER_LOOKUP	0x00000400

#define ZFCP_ERP_STEP_PORT_OPENING	0x00000800

#define ZFCP_ERP_STEP_UNIT_CLOSING	0x00001000

#define ZFCP_ERP_STEP_UNIT_OPENING	0x00002000



/* Ordered by escalation level (necessary for proper erp-code operation) */

#define ZFCP_ERP_ACTION_REOPEN_ADAPTER		0x4

#define ZFCP_ERP_ACTION_REOPEN_PORT_FORCED	0x3

#define ZFCP_ERP_ACTION_REOPEN_PORT		0x2

#define ZFCP_ERP_ACTION_REOPEN_UNIT		0x1



#define ZFCP_ERP_ACTION_RUNNING			0x1

#define ZFCP_ERP_ACTION_READY			0x2



#define ZFCP_ERP_SUCCEEDED	0x0

#define ZFCP_ERP_FAILED		0x1

#define ZFCP_ERP_CONTINUES	0x2

#define ZFCP_ERP_EXIT		0x3

#define ZFCP_ERP_DISMISSED	0x4

#define ZFCP_ERP_NOMEM		0x5



/************************* STRUCTURE DEFINITIONS *****************************/

/************************* STRUCTURE DEFINITIONS *****************************/





struct zfcp_fsf_req;

struct zfcp_fsf_req;

drivers/s390/scsi/zfcp_erp.c

+1301 −2199

File changed.

Preview size limit exceeded, changes collapsed.

drivers/s390/scsi/zfcp_ext.h

+10 −15
Original line number Original line Diff line number Diff line
@@ -67,8 +67,6 @@ extern int zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *, 
                                             struct fsf_qtcb_bottom_port *);

                                             struct fsf_qtcb_bottom_port *);

extern struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter,

extern struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter,

					   struct zfcp_fsf_cfdc *fsf_cfdc);

					   struct zfcp_fsf_cfdc *fsf_cfdc);

extern void zfcp_fsf_start_timer(struct zfcp_fsf_req *, unsigned long);

extern void zfcp_erp_start_timer(struct zfcp_fsf_req *);

extern void zfcp_fsf_req_dismiss_all(struct zfcp_adapter *);

extern void zfcp_fsf_req_dismiss_all(struct zfcp_adapter *);

extern int  zfcp_fsf_status_read(struct zfcp_adapter *);

extern int  zfcp_fsf_status_read(struct zfcp_adapter *);

extern int zfcp_status_read_refill(struct zfcp_adapter *adapter);

extern int zfcp_status_read_refill(struct zfcp_adapter *adapter);
@@ -103,37 +101,34 @@ extern struct fc_function_template zfcp_transport_functions; 
/******************************** ERP ****************************************/

/******************************** ERP ****************************************/

extern void zfcp_erp_modify_adapter_status(struct zfcp_adapter *, u8, void *,

extern void zfcp_erp_modify_adapter_status(struct zfcp_adapter *, u8, void *,

					   u32, int);

					   u32, int);

extern int  zfcp_erp_adapter_reopen(struct zfcp_adapter *, int, u8, void *);

extern void zfcp_erp_adapter_reopen(struct zfcp_adapter *, int, u8, void *);

extern int  zfcp_erp_adapter_shutdown(struct zfcp_adapter *, int, u8, void *);

extern void zfcp_erp_adapter_shutdown(struct zfcp_adapter *, int, u8, void *);

extern void zfcp_erp_adapter_failed(struct zfcp_adapter *, u8, void *);

extern void zfcp_erp_adapter_failed(struct zfcp_adapter *, u8, void *);





extern void zfcp_erp_modify_port_status(struct zfcp_port *, u8, void *, u32,

extern void zfcp_erp_modify_port_status(struct zfcp_port *, u8, void *, u32,

					int);

					int);

extern int  zfcp_erp_port_reopen(struct zfcp_port *, int, u8, void *);

extern int  zfcp_erp_port_reopen(struct zfcp_port *, int, u8, void *);

extern int  zfcp_erp_port_shutdown(struct zfcp_port *, int, u8, void *);

extern void zfcp_erp_port_shutdown(struct zfcp_port *, int, u8, void *);

extern int  zfcp_erp_port_forced_reopen(struct zfcp_port *, int, u8, void *);

extern void zfcp_erp_port_forced_reopen(struct zfcp_port *, int, u8, void *);

extern void zfcp_erp_port_failed(struct zfcp_port *, u8, void *);

extern void zfcp_erp_port_failed(struct zfcp_port *, u8, void *);

extern int  zfcp_erp_port_reopen_all(struct zfcp_adapter *, int, u8, void *);





extern void zfcp_erp_modify_unit_status(struct zfcp_unit *, u8, void *, u32,

extern void zfcp_erp_modify_unit_status(struct zfcp_unit *, u8, void *, u32,

					int);

					int);

extern int  zfcp_erp_unit_reopen(struct zfcp_unit *, int, u8, void *);

extern void zfcp_erp_unit_reopen(struct zfcp_unit *, int, u8, void *);

extern int  zfcp_erp_unit_shutdown(struct zfcp_unit *, int, u8, void *);

extern void zfcp_erp_unit_shutdown(struct zfcp_unit *, int, u8, void *);

extern void zfcp_erp_unit_failed(struct zfcp_unit *, u8, void *);

extern void zfcp_erp_unit_failed(struct zfcp_unit *, u8, void *);





extern int  zfcp_erp_thread_setup(struct zfcp_adapter *);

extern int  zfcp_erp_thread_setup(struct zfcp_adapter *);

extern int  zfcp_erp_thread_kill(struct zfcp_adapter *);

extern void zfcp_erp_thread_kill(struct zfcp_adapter *);

extern int  zfcp_erp_wait(struct zfcp_adapter *);

extern void zfcp_erp_wait(struct zfcp_adapter *);

extern void zfcp_erp_async_handler(struct zfcp_erp_action *, unsigned long);

extern void zfcp_erp_notify(struct zfcp_erp_action *, unsigned long);





extern void zfcp_erp_port_boxed(struct zfcp_port *, u8 id, void *ref);

extern void zfcp_erp_port_boxed(struct zfcp_port *, u8 id, void *ref);

extern void zfcp_erp_unit_boxed(struct zfcp_unit *, u8 id, void *ref);

extern void zfcp_erp_unit_boxed(struct zfcp_unit *, u8 id, void *ref);

extern void zfcp_erp_port_access_denied(struct zfcp_port *, u8 id, void *ref);

extern void zfcp_erp_port_access_denied(struct zfcp_port *, u8 id, void *ref);

extern void zfcp_erp_unit_access_denied(struct zfcp_unit *, u8 id, void *ref);

extern void zfcp_erp_unit_access_denied(struct zfcp_unit *, u8 id, void *ref);

extern void zfcp_erp_adapter_access_changed(struct zfcp_adapter *, u8, void *);

extern void zfcp_erp_adapter_access_changed(struct zfcp_adapter *, u8, void *);

extern void zfcp_erp_port_access_changed(struct zfcp_port *, u8, void *);

extern void zfcp_erp_timeout_handler(unsigned long);

extern void zfcp_erp_unit_access_changed(struct zfcp_unit *, u8, void *);



/******************************** AUX ****************************************/

/******************************** AUX ****************************************/

extern void zfcp_sg_free_table(struct scatterlist *sg, int count);

extern void zfcp_sg_free_table(struct scatterlist *sg, int count);

extern int  zfcp_sg_setup_table(struct scatterlist *sg, int count);

extern int  zfcp_sg_setup_table(struct scatterlist *sg, int count);

drivers/s390/scsi/zfcp_fsf.c

+34 −9
Original line number Original line Diff line number Diff line
@@ -8,6 +8,31 @@ 




#include "zfcp_ext.h"

#include "zfcp_ext.h"





static void zfcp_fsf_request_timeout_handler(unsigned long data)

{

	struct zfcp_adapter *adapter = (struct zfcp_adapter *) data;

	zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED, 62,

				NULL);

}



static void zfcp_fsf_start_timer(struct zfcp_fsf_req *fsf_req,

				 unsigned long timeout)

{

	fsf_req->timer.function = zfcp_fsf_request_timeout_handler;

	fsf_req->timer.data = (unsigned long) fsf_req->adapter;

	fsf_req->timer.expires = jiffies + timeout;

	add_timer(&fsf_req->timer);

}



static void zfcp_fsf_start_erp_timer(struct zfcp_fsf_req *fsf_req)

{

	BUG_ON(!fsf_req->erp_action);

	fsf_req->timer.function = zfcp_erp_timeout_handler;

	fsf_req->timer.data = (unsigned long) fsf_req->erp_action;

	fsf_req->timer.expires = jiffies + 30 * HZ;

	add_timer(&fsf_req->timer);

}



/* association between FSF command and FSF QTCB type */

/* association between FSF command and FSF QTCB type */

static u32 fsf_qtcb_type[] = {

static u32 fsf_qtcb_type[] = {

	[FSF_QTCB_FCP_CMND] =             FSF_IO_COMMAND,

	[FSF_QTCB_FCP_CMND] =             FSF_IO_COMMAND,
@@ -485,7 +510,7 @@ void zfcp_fsf_req_complete(struct zfcp_fsf_req *req) 
	req->handler(req);

	req->handler(req);





	if (req->erp_action)

	if (req->erp_action)

		zfcp_erp_async_handler(req->erp_action, 0);

		zfcp_erp_notify(req->erp_action, 0);

	req->status |= ZFCP_STATUS_FSFREQ_COMPLETED;

	req->status |= ZFCP_STATUS_FSFREQ_COMPLETED;





	if (likely(req->status & ZFCP_STATUS_FSFREQ_CLEANUP))

	if (likely(req->status & ZFCP_STATUS_FSFREQ_CLEANUP))
@@ -1108,7 +1133,7 @@ int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool, 
	if (erp_action) {

	if (erp_action) {

		erp_action->fsf_req = req;

		erp_action->fsf_req = req;

		req->erp_action = erp_action;

		req->erp_action = erp_action;

		zfcp_erp_start_timer(req);

		zfcp_fsf_start_erp_timer(req);

	} else

	} else

		zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);

		zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);
@@ -1263,7 +1288,7 @@ int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *erp_action) 
	req->handler = zfcp_fsf_exchange_config_data_handler;

	req->handler = zfcp_fsf_exchange_config_data_handler;

	erp_action->fsf_req = req;

	erp_action->fsf_req = req;





	zfcp_erp_start_timer(req);

	zfcp_fsf_start_erp_timer(req);

	retval = zfcp_fsf_req_send(req);

	retval = zfcp_fsf_req_send(req);

	if (retval) {

	if (retval) {

		zfcp_fsf_req_free(req);

		zfcp_fsf_req_free(req);
@@ -1353,7 +1378,7 @@ int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action) 
	req->erp_action = erp_action;

	req->erp_action = erp_action;

	erp_action->fsf_req = req;

	erp_action->fsf_req = req;





	zfcp_erp_start_timer(req);

	zfcp_fsf_start_erp_timer(req);

	retval = zfcp_fsf_req_send(req);

	retval = zfcp_fsf_req_send(req);

	if (retval) {

	if (retval) {

		zfcp_fsf_req_free(req);

		zfcp_fsf_req_free(req);
@@ -1530,7 +1555,7 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action) 
	erp_action->fsf_req = req;

	erp_action->fsf_req = req;

	atomic_set_mask(ZFCP_STATUS_COMMON_OPENING, &erp_action->port->status);

	atomic_set_mask(ZFCP_STATUS_COMMON_OPENING, &erp_action->port->status);





	zfcp_erp_start_timer(req);

	zfcp_fsf_start_erp_timer(req);

	retval = zfcp_fsf_req_send(req);

	retval = zfcp_fsf_req_send(req);

	if (retval) {

	if (retval) {

		zfcp_fsf_req_free(req);

		zfcp_fsf_req_free(req);
@@ -1601,7 +1626,7 @@ int zfcp_fsf_close_port(struct zfcp_erp_action *erp_action) 
	erp_action->fsf_req = req;

	erp_action->fsf_req = req;

	atomic_set_mask(ZFCP_STATUS_COMMON_CLOSING, &erp_action->port->status);

	atomic_set_mask(ZFCP_STATUS_COMMON_CLOSING, &erp_action->port->status);





	zfcp_erp_start_timer(req);

	zfcp_fsf_start_erp_timer(req);

	retval = zfcp_fsf_req_send(req);

	retval = zfcp_fsf_req_send(req);

	if (retval) {

	if (retval) {

		zfcp_fsf_req_free(req);

		zfcp_fsf_req_free(req);
@@ -1699,7 +1724,7 @@ int zfcp_fsf_close_physical_port(struct zfcp_erp_action *erp_action) 
	atomic_set_mask(ZFCP_STATUS_PORT_PHYS_CLOSING,

	atomic_set_mask(ZFCP_STATUS_PORT_PHYS_CLOSING,

			&erp_action->port->status);

			&erp_action->port->status);





	zfcp_erp_start_timer(req);

	zfcp_fsf_start_erp_timer(req);

	retval = zfcp_fsf_req_send(req);

	retval = zfcp_fsf_req_send(req);

	if (retval) {

	if (retval) {

		zfcp_fsf_req_free(req);

		zfcp_fsf_req_free(req);
@@ -1878,7 +1903,7 @@ int zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action) 




	atomic_set_mask(ZFCP_STATUS_COMMON_OPENING, &erp_action->unit->status);

	atomic_set_mask(ZFCP_STATUS_COMMON_OPENING, &erp_action->unit->status);





	zfcp_erp_start_timer(req);

	zfcp_fsf_start_erp_timer(req);

	retval = zfcp_fsf_req_send(req);

	retval = zfcp_fsf_req_send(req);

	if (retval) {

	if (retval) {

		zfcp_fsf_req_free(req);

		zfcp_fsf_req_free(req);
@@ -1963,7 +1988,7 @@ int zfcp_fsf_close_unit(struct zfcp_erp_action *erp_action) 
	erp_action->fsf_req = req;

	erp_action->fsf_req = req;

	atomic_set_mask(ZFCP_STATUS_COMMON_CLOSING, &erp_action->unit->status);

	atomic_set_mask(ZFCP_STATUS_COMMON_CLOSING, &erp_action->unit->status);





	zfcp_erp_start_timer(req);

	zfcp_fsf_start_erp_timer(req);

	retval = zfcp_fsf_req_send(req);

	retval = zfcp_fsf_req_send(req);

	if (retval) {

	if (retval) {

		zfcp_fsf_req_free(req);

		zfcp_fsf_req_free(req);