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

Commit ea4a3a6a authored by Swen Schillig's avatar Swen Schillig Committed by James Bottomley
Browse files

[SCSI] zfcp: Redesign of the debug tracing final cleanup. 



This patch is the final cleanup of the redesign from the zfcp tracing.
Structures and elements which were used by multiple areas of the
former debug tracing are now changed to the new scheme.

Signed-off-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@suse.de>
parent 250a1352

drivers/s390/scsi/zfcp_aux.c

+2 −3
Original line number Diff line number Diff line
@@ -311,8 +311,7 @@ int zfcp_status_read_refill(struct zfcp_adapter *adapter) 
		if (zfcp_fsf_status_read(adapter->qdio)) {

			if (atomic_read(&adapter->stat_miss) >=

			    adapter->stat_read_buf_num) {

				zfcp_erp_adapter_reopen(adapter, 0, "axsref1",

							NULL);

				zfcp_erp_adapter_reopen(adapter, 0, "axsref1");

				return 1;

			}

			break;
@@ -459,7 +458,7 @@ void zfcp_adapter_unregister(struct zfcp_adapter *adapter) 
	sysfs_remove_group(&cdev->dev.kobj, &zfcp_sysfs_adapter_attrs);



	zfcp_erp_thread_kill(adapter);

	zfcp_dbf_adapter_unregister(adapter->dbf);

	zfcp_dbf_adapter_unregister(adapter);

	zfcp_qdio_destroy(adapter->qdio);



	zfcp_ccw_adapter_put(adapter); /* final put to release */

drivers/s390/scsi/zfcp_ccw.c

+7 −7
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static int zfcp_ccw_activate(struct ccw_device *cdev) 


	zfcp_erp_set_adapter_status(adapter, ZFCP_STATUS_COMMON_RUNNING);

	zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED,

				"ccresu2", NULL);

				"ccresu2");

	zfcp_erp_wait(adapter);

	flush_work(&adapter->scan_work);
@@ -182,7 +182,7 @@ static int zfcp_ccw_set_offline(struct ccw_device *cdev) 
	if (!adapter)

		return 0;



	zfcp_erp_adapter_shutdown(adapter, 0, "ccsoff1", NULL);

	zfcp_erp_adapter_shutdown(adapter, 0, "ccsoff1");

	zfcp_erp_wait(adapter);



	zfcp_ccw_adapter_put(adapter);
@@ -207,24 +207,24 @@ static int zfcp_ccw_notify(struct ccw_device *cdev, int event) 
	switch (event) {

	case CIO_GONE:

		dev_warn(&cdev->dev, "The FCP device has been detached\n");

		zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti1", NULL);

		zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti1");

		break;

	case CIO_NO_PATH:

		dev_warn(&cdev->dev,

			 "The CHPID for the FCP device is offline\n");

		zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti2", NULL);

		zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti2");

		break;

	case CIO_OPER:

		dev_info(&cdev->dev, "The FCP device is operational again\n");

		zfcp_erp_set_adapter_status(adapter,

					    ZFCP_STATUS_COMMON_RUNNING);

		zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED,

					"ccnoti4", NULL);

					"ccnoti4");

		break;

	case CIO_BOXED:

		dev_warn(&cdev->dev, "The FCP device did not respond within "

				     "the specified time\n");

		zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti5", NULL);

		zfcp_erp_adapter_shutdown(adapter, 0, "ccnoti5");

		break;

	}
@@ -243,7 +243,7 @@ static void zfcp_ccw_shutdown(struct ccw_device *cdev) 
	if (!adapter)

		return;



	zfcp_erp_adapter_shutdown(adapter, 0, "ccshut1", NULL);

	zfcp_erp_adapter_shutdown(adapter, 0, "ccshut1");

	zfcp_erp_wait(adapter);

	zfcp_erp_thread_kill(adapter);

drivers/s390/scsi/zfcp_cfdc.c

+4 −4
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ void zfcp_cfdc_adapter_access_changed(struct zfcp_adapter *adapter) 
		    (status & ZFCP_STATUS_COMMON_ACCESS_BOXED))

			zfcp_erp_port_reopen(port,

					     ZFCP_STATUS_COMMON_ERP_FAILED,

					     "cfaac_1", NULL);

					     "cfaac_1");

	}

	read_unlock_irqrestore(&adapter->port_list_lock, flags);
@@ -299,7 +299,7 @@ void zfcp_cfdc_adapter_access_changed(struct zfcp_adapter *adapter) 
		    (status & ZFCP_STATUS_COMMON_ACCESS_BOXED))

			zfcp_erp_lun_reopen(sdev,

					    ZFCP_STATUS_COMMON_ERP_FAILED,

					    "cfaac_2", NULL);

					    "cfaac_2");

	}

}
@@ -426,7 +426,7 @@ int zfcp_cfdc_open_lun_eval(struct scsi_device *sdev, 
			zfcp_scsi_dev_lun(sdev),

			(unsigned long long)zfcp_sdev->port->wwpn);

		zfcp_erp_set_lun_status(sdev, ZFCP_STATUS_COMMON_ERP_FAILED);

		zfcp_erp_lun_shutdown(sdev, 0, "fsouh_6", NULL);

		zfcp_erp_lun_shutdown(sdev, 0, "fsouh_6");

		return -EACCES;

	}
@@ -437,7 +437,7 @@ int zfcp_cfdc_open_lun_eval(struct scsi_device *sdev, 
			zfcp_scsi_dev_lun(sdev),

			(unsigned long long)zfcp_sdev->port->wwpn);

		zfcp_erp_set_lun_status(sdev, ZFCP_STATUS_COMMON_ERP_FAILED);

		zfcp_erp_lun_shutdown(sdev, 0, "fsosh_8", NULL);

		zfcp_erp_lun_shutdown(sdev, 0, "fsosh_8");

		return -EACCES;

	}

drivers/s390/scsi/zfcp_dbf.c

+36 −34
Original line number Diff line number Diff line
@@ -377,26 +377,37 @@ void zfcp_dbf_scsi(char *tag, struct scsi_cmnd *sc, struct zfcp_fsf_req *fsf) 
		}

	}



	debug_event(adapter->dbf->scsi, 1, rec, sizeof(*rec));

	debug_event(dbf->scsi, 1, rec, sizeof(*rec));

	spin_unlock_irqrestore(&dbf->scsi_lock, flags);

}



static debug_info_t *zfcp_dbf_reg(const char *name, int level,

				  struct debug_view *view, int size)

static debug_info_t *zfcp_dbf_reg(const char *name, int size, int rec_size)

{

	struct debug_info *d;



	d = debug_register(name, dbfsize, level, size);

	d = debug_register(name, size, 1, rec_size);

	if (!d)

		return NULL;



	debug_register_view(d, &debug_hex_ascii_view);

	debug_register_view(d, view);

	debug_set_level(d, level);

	debug_set_level(d, 3);



	return d;

}



static void zfcp_dbf_unregister(struct zfcp_dbf *dbf)

{

	if (!dbf)

		return;



	debug_unregister(dbf->scsi);

	debug_unregister(dbf->san);

	debug_unregister(dbf->hba);

	debug_unregister(dbf->pay);

	debug_unregister(dbf->rec);

	kfree(dbf);

}



/**

 * zfcp_adapter_debug_register - registers debug feature for an adapter

 * @adapter: pointer to adapter for which debug features should be registered
@@ -404,15 +415,13 @@ static debug_info_t *zfcp_dbf_reg(const char *name, int level, 
 */

int zfcp_dbf_adapter_register(struct zfcp_adapter *adapter)

{

	char dbf_name[DEBUG_MAX_NAME_LEN];

	char name[DEBUG_MAX_NAME_LEN];

	struct zfcp_dbf *dbf;



	dbf = kzalloc(sizeof(struct zfcp_dbf), GFP_KERNEL);

	if (!dbf)

		return -ENOMEM;



	dbf->adapter = adapter;



	spin_lock_init(&dbf->pay_lock);

	spin_lock_init(&dbf->hba_lock);

	spin_lock_init(&dbf->san_lock);
@@ -420,59 +429,52 @@ int zfcp_dbf_adapter_register(struct zfcp_adapter *adapter) 
	spin_lock_init(&dbf->rec_lock);



	/* debug feature area which records recovery activity */

	sprintf(dbf_name, "zfcp_%s_rec", dev_name(&adapter->ccw_device->dev));

	dbf->rec = zfcp_dbf_reg(dbf_name, 3, NULL, sizeof(struct zfcp_dbf_rec));

	sprintf(name, "zfcp_%s_rec", dev_name(&adapter->ccw_device->dev));

	dbf->rec = zfcp_dbf_reg(name, dbfsize, sizeof(struct zfcp_dbf_rec));

	if (!dbf->rec)

		goto err_out;



	/* debug feature area which records HBA (FSF and QDIO) conditions */

	sprintf(dbf_name, "zfcp_%s_hba", dev_name(&adapter->ccw_device->dev));

	dbf->hba = zfcp_dbf_reg(dbf_name, 3, NULL, sizeof(struct zfcp_dbf_hba));

	sprintf(name, "zfcp_%s_hba", dev_name(&adapter->ccw_device->dev));

	dbf->hba = zfcp_dbf_reg(name, dbfsize, sizeof(struct zfcp_dbf_hba));

	if (!dbf->hba)

		goto err_out;



	/* debug feature area which records payload info */

	sprintf(dbf_name, "zfcp_%s_pay", dev_name(&adapter->ccw_device->dev));

	dbf->pay = zfcp_dbf_reg(dbf_name, 3, NULL,

				sizeof(struct zfcp_dbf_pay));

	sprintf(name, "zfcp_%s_pay", dev_name(&adapter->ccw_device->dev));

	dbf->pay = zfcp_dbf_reg(name, dbfsize * 2, sizeof(struct zfcp_dbf_pay));

	if (!dbf->pay)

		goto err_out;



	/* debug feature area which records SAN command failures and recovery */

	sprintf(dbf_name, "zfcp_%s_san", dev_name(&adapter->ccw_device->dev));

	dbf->san = zfcp_dbf_reg(dbf_name, 3, NULL, sizeof(struct zfcp_dbf_san));

	sprintf(name, "zfcp_%s_san", dev_name(&adapter->ccw_device->dev));

	dbf->san = zfcp_dbf_reg(name, dbfsize, sizeof(struct zfcp_dbf_san));

	if (!dbf->san)

		goto err_out;



	/* debug feature area which records SCSI command failures and recovery */

	sprintf(dbf_name, "zfcp_%s_scsi", dev_name(&adapter->ccw_device->dev));

	dbf->scsi = zfcp_dbf_reg(dbf_name, 3, NULL,

				 sizeof(struct zfcp_dbf_scsi));

	sprintf(name, "zfcp_%s_scsi", dev_name(&adapter->ccw_device->dev));

	dbf->scsi = zfcp_dbf_reg(name, dbfsize, sizeof(struct zfcp_dbf_scsi));

	if (!dbf->scsi)

		goto err_out;



	adapter->dbf = dbf;

	return 0;



	return 0;

err_out:

	zfcp_dbf_adapter_unregister(dbf);

	zfcp_dbf_unregister(dbf);

	return -ENOMEM;

}



/**

 * zfcp_adapter_debug_unregister - unregisters debug feature for an adapter

 * @dbf: pointer to dbf for which debug features should be unregistered

 * @adapter: pointer to adapter for which debug features should be unregistered

 */

void zfcp_dbf_adapter_unregister(struct zfcp_dbf *dbf)

void zfcp_dbf_adapter_unregister(struct zfcp_adapter *adapter)

{

	if (!dbf)

		return;

	debug_unregister(dbf->scsi);

	debug_unregister(dbf->san);

	debug_unregister(dbf->hba);

	debug_unregister(dbf->pay);

	debug_unregister(dbf->rec);

	dbf->adapter->dbf = NULL;

	kfree(dbf);

	struct zfcp_dbf *dbf = adapter->dbf;



	adapter->dbf = NULL;

	zfcp_dbf_unregister(dbf);

}

drivers/s390/scsi/zfcp_dbf.h

+20 −5
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
#include "zfcp_def.h"



#define ZFCP_DBF_TAG_LEN       7

#define ZFCP_DBF_TAG_SIZE      4

#define ZFCP_DBF_ID_SIZE       7



#define ZFCP_DBF_INVALID_LUN	0xFFFFFFFFFFFFFFFFull
@@ -233,13 +231,31 @@ struct zfcp_dbf_scsi { 
 * @data: unformatted data

 */

struct zfcp_dbf_pay {

	u8 counter;

	char area[ZFCP_DBF_TAG_LEN];

	char counter;

	u64 fsf_req_id;

#define ZFCP_DBF_PAY_MAX_REC 0x100

	char data[ZFCP_DBF_PAY_MAX_REC];

} __packed;



/**

 * struct zfcp_dbf - main dbf trace structure

 * @pay: reference to payload trace area

 * @rec: reference to recovery trace area

 * @hba: reference to hba trace area

 * @san: reference to san trace area

 * @scsi: reference to scsi trace area

 * @pay_lock: lock protecting payload trace buffer

 * @rec_lock: lock protecting recovery trace buffer

 * @hba_lock: lock protecting hba trace buffer

 * @san_lock: lock protecting san trace buffer

 * @scsi_lock: lock protecting scsi trace buffer

 * @pay_buf: pre-allocated buffer for payload

 * @rec_buf: pre-allocated buffer for recovery

 * @hba_buf: pre-allocated buffer for hba

 * @san_buf: pre-allocated buffer for san

 * @scsi_buf: pre-allocated buffer for scsi

 */

struct zfcp_dbf {

	debug_info_t			*pay;

	debug_info_t			*rec;
@@ -251,12 +267,11 @@ struct zfcp_dbf { 
	spinlock_t			hba_lock;

	spinlock_t			san_lock;

	spinlock_t			scsi_lock;

	struct zfcp_dbf_pay		pay_buf;

	struct zfcp_dbf_rec		rec_buf;

	struct zfcp_dbf_hba		hba_buf;

	struct zfcp_dbf_san		san_buf;

	struct zfcp_dbf_scsi		scsi_buf;

	struct zfcp_dbf_pay		pay_buf;

	struct zfcp_adapter		*adapter;

};



static inline