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

Commit 0406289e authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[SCSI] zfcp: Simplify zfcp data structures 



Reduce the size of zfcp data structures by removing unused and
redundant members. scsi_lun is only the mangled version of the
fcp_lun. So, remove the redundant field and use the fcp_lun instead.

Since the queue lock and the pci_batch indicator are only used in the
request queue, move them from the common queue struct to the adapter
struct.

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 a1b449de

drivers/s390/scsi/zfcp_aux.c

+1 −33
Original line number Diff line number Diff line
@@ -169,8 +169,6 @@ static int __init zfcp_module_init(void) 
		goto out_gid_cache;



	INIT_LIST_HEAD(&zfcp_data.adapter_list_head);

	INIT_LIST_HEAD(&zfcp_data.adapter_remove_lh);



	sema_init(&zfcp_data.config_sema, 1);

	rwlock_init(&zfcp_data.config_lock);
@@ -312,7 +310,6 @@ struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, u64 fcp_lun) 
	}



	zfcp_unit_get(unit);

	unit->scsi_lun = scsilun_to_int((struct scsi_lun *)&unit->fcp_lun);



	write_lock_irq(&zfcp_data.config_lock);

	list_add_tail(&unit->list, &port->unit_list_head);
@@ -321,7 +318,6 @@ struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, u64 fcp_lun) 


	write_unlock_irq(&zfcp_data.config_lock);



	port->units++;

	zfcp_port_get(port);



	return unit;
@@ -344,7 +340,6 @@ void zfcp_unit_dequeue(struct zfcp_unit *unit) 
	write_lock_irq(&zfcp_data.config_lock);

	list_del(&unit->list);

	write_unlock_irq(&zfcp_data.config_lock);

	unit->port->units--;

	zfcp_port_put(unit->port);

	sysfs_remove_group(&unit->sysfs_device.kobj, &zfcp_sysfs_unit_attrs);

	device_unregister(&unit->sysfs_device);
@@ -405,11 +400,6 @@ static void zfcp_free_low_mem_buffers(struct zfcp_adapter *adapter) 
		mempool_destroy(adapter->pool.data_gid_pn);

}



static void zfcp_dummy_release(struct device *dev)

{

	return;

}



/**

 * zfcp_status_read_refill - refill the long running status_read_requests

 * @adapter: ptr to struct zfcp_adapter for which the buffers should be refilled
@@ -484,7 +474,6 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device) 
	init_waitqueue_head(&adapter->erp_done_wqh);



	INIT_LIST_HEAD(&adapter->port_list_head);

	INIT_LIST_HEAD(&adapter->port_remove_lh);

	INIT_LIST_HEAD(&adapter->erp_ready_head);

	INIT_LIST_HEAD(&adapter->erp_running_head);
@@ -494,7 +483,7 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device) 
	spin_lock_init(&adapter->san_dbf_lock);

	spin_lock_init(&adapter->scsi_dbf_lock);

	spin_lock_init(&adapter->rec_dbf_lock);

	spin_lock_init(&adapter->req_q.lock);

	spin_lock_init(&adapter->req_q_lock);



	rwlock_init(&adapter->erp_lock);

	rwlock_init(&adapter->abort_lock);
@@ -513,28 +502,15 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device) 
			       &zfcp_sysfs_adapter_attrs))

		goto sysfs_failed;



	adapter->generic_services.parent = &adapter->ccw_device->dev;

	adapter->generic_services.release = zfcp_dummy_release;

	snprintf(adapter->generic_services.bus_id, BUS_ID_SIZE,

		 "generic_services");



	if (device_register(&adapter->generic_services))

		goto generic_services_failed;



	write_lock_irq(&zfcp_data.config_lock);

	atomic_clear_mask(ZFCP_STATUS_COMMON_REMOVE, &adapter->status);

	list_add_tail(&adapter->list, &zfcp_data.adapter_list_head);

	write_unlock_irq(&zfcp_data.config_lock);



	zfcp_data.adapters++;



	zfcp_fc_nameserver_init(adapter);



	return 0;



generic_services_failed:

	sysfs_remove_group(&ccw_device->dev.kobj,

			   &zfcp_sysfs_adapter_attrs);

sysfs_failed:

	zfcp_adapter_debug_unregister(adapter);

debug_register_failed:
@@ -561,7 +537,6 @@ void zfcp_adapter_dequeue(struct zfcp_adapter *adapter) 
	cancel_work_sync(&adapter->scan_work);

	cancel_work_sync(&adapter->stat_work);

	zfcp_adapter_scsi_unregister(adapter);

	device_unregister(&adapter->generic_services);

	sysfs_remove_group(&adapter->ccw_device->dev.kobj,

			   &zfcp_sysfs_adapter_attrs);

	dev_set_drvdata(&adapter->ccw_device->dev, NULL);
@@ -579,9 +554,6 @@ void zfcp_adapter_dequeue(struct zfcp_adapter *adapter) 
	list_del(&adapter->list);

	write_unlock_irq(&zfcp_data.config_lock);



	/* decrease number of adapters in list */

	zfcp_data.adapters--;



	zfcp_qdio_free(adapter);



	zfcp_free_low_mem_buffers(adapter);
@@ -620,9 +592,7 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn, 
		return ERR_PTR(-ENOMEM);



	init_waitqueue_head(&port->remove_wq);



	INIT_LIST_HEAD(&port->unit_list_head);

	INIT_LIST_HEAD(&port->unit_remove_lh);

	INIT_WORK(&port->gid_pn_work, zfcp_erp_port_strategy_open_lookup);



	port->adapter = adapter;
@@ -665,7 +635,6 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn, 
	list_add_tail(&port->list, &adapter->port_list_head);

	atomic_clear_mask(ZFCP_STATUS_COMMON_REMOVE, &port->status);

	atomic_set_mask(ZFCP_STATUS_COMMON_RUNNING, &port->status);

	adapter->ports++;



	write_unlock_irq(&zfcp_data.config_lock);
@@ -687,7 +656,6 @@ void zfcp_port_dequeue(struct zfcp_port *port) 
	wait_event(port->remove_wq, atomic_read(&port->refcount) == 0);

	write_lock_irq(&zfcp_data.config_lock);

	list_del(&port->list);

	port->adapter->ports--;

	write_unlock_irq(&zfcp_data.config_lock);

	if (port->rport)

		fc_remote_port_delete(port->rport);

drivers/s390/scsi/zfcp_ccw.c

+6 −4
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ static void zfcp_ccw_remove(struct ccw_device *ccw_device) 
	struct zfcp_adapter *adapter;

	struct zfcp_port *port, *p;

	struct zfcp_unit *unit, *u;

	LIST_HEAD(unit_remove_lh);

	LIST_HEAD(port_remove_lh);



	ccw_device_set_offline(ccw_device);

	down(&zfcp_data.config_sema);
@@ -55,18 +57,18 @@ static void zfcp_ccw_remove(struct ccw_device *ccw_device) 
	write_lock_irq(&zfcp_data.config_lock);

	list_for_each_entry_safe(port, p, &adapter->port_list_head, list) {

		list_for_each_entry_safe(unit, u, &port->unit_list_head, list) {

			list_move(&unit->list, &port->unit_remove_lh);

			list_move(&unit->list, &unit_remove_lh);

			atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE,

					&unit->status);

		}

		list_move(&port->list, &adapter->port_remove_lh);

		list_move(&port->list, &port_remove_lh);

		atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &port->status);

	}

	atomic_set_mask(ZFCP_STATUS_COMMON_REMOVE, &adapter->status);

	write_unlock_irq(&zfcp_data.config_lock);



	list_for_each_entry_safe(port, p, &adapter->port_remove_lh, list) {

		list_for_each_entry_safe(unit, u, &port->unit_remove_lh, list) {

	list_for_each_entry_safe(port, p, &port_remove_lh, list) {

		list_for_each_entry_safe(unit, u, &unit_remove_lh, list) {

			if (atomic_read(&unit->status) &

			    ZFCP_STATUS_UNIT_REGISTERED)

				scsi_remove_device(unit->device);

drivers/s390/scsi/zfcp_def.h

+6 −20
Original line number Diff line number Diff line
@@ -412,14 +412,9 @@ struct zfcp_wka_port { 
};



struct zfcp_qdio_queue {

	struct qdio_buffer *sbal[QDIO_MAX_BUFFERS_PER_Q]; /* SBALs */

	u8		   first;	      /* index of next free bfr

						 in queue (free_count>0) */

	atomic_t           count;	      /* number of free buffers

						 in queue */

	spinlock_t	   lock;	      /* lock for operations on queue */

	int                pci_batch;	      /* SBALs since PCI indication

						 was last set */

	struct qdio_buffer *sbal[QDIO_MAX_BUFFERS_PER_Q];

	u8		   first;	/* index of next free bfr in queue */

	atomic_t           count;	/* number of free buffers in queue */

};



struct zfcp_erp_action {
@@ -471,13 +466,13 @@ struct zfcp_adapter { 
	u16			timer_ticks;       /* time int for a tick */

	struct Scsi_Host	*scsi_host;	   /* Pointer to mid-layer */

	struct list_head	port_list_head;	   /* remote port list */

	struct list_head        port_remove_lh;    /* head of ports to be

						      removed */

	u32			ports;	           /* number of remote ports */

	unsigned long		req_no;		   /* unique FSF req number */

	struct list_head	*req_list;	   /* list of pending reqs */

	spinlock_t		req_list_lock;	   /* request list lock */

	struct zfcp_qdio_queue	req_q;		   /* request queue */

	spinlock_t		req_q_lock;	   /* for operations on queue */

	int			req_q_pci_batch;   /* SBALs since PCI indication

						      was last set */

	u32			fsf_req_seq_no;	   /* FSF cmnd seq number */

	wait_queue_head_t	request_wq;	   /* can be used to wait for

						      more avaliable SBALs */
@@ -516,7 +511,6 @@ struct zfcp_adapter { 
	struct zfcp_scsi_dbf_record	scsi_dbf_buf;

	struct zfcp_adapter_mempool	pool;      /* Adapter memory pools */

	struct qdio_initialize  qdio_init_data;    /* for qdio_establish */

	struct device           generic_services;  /* directory for WKA ports */

	struct fc_host_statistics *fc_stats;

	struct fsf_qtcb_bottom_port *stats_reset_data;

	unsigned long		stats_reset;
@@ -533,9 +527,6 @@ struct zfcp_port { 
						  refcount drop to zero */

	struct zfcp_adapter    *adapter;       /* adapter used to access port */

	struct list_head       unit_list_head; /* head of logical unit list */

	struct list_head       unit_remove_lh; /* head of luns to be removed

						  list */

	u32		       units;	       /* # of logical units in list */

	atomic_t	       status;	       /* status of this remote port */

	u64		       wwnn;	       /* WWNN if known */

	u64		       wwpn;	       /* WWPN */
@@ -556,7 +547,6 @@ struct zfcp_unit { 
						  refcount drop to zero */

	struct zfcp_port       *port;	       /* remote port of unit */

	atomic_t	       status;	       /* status of this logical unit */

	unsigned int	       scsi_lun;       /* own SCSI LUN */

	u64		       fcp_lun;	       /* own FCP_LUN */

	u32		       handle;	       /* handle assigned by FSF */

        struct scsi_device     *device;        /* scsi device struct pointer */
@@ -599,11 +589,7 @@ struct zfcp_fsf_req { 
struct zfcp_data {

	struct scsi_host_template scsi_host_template;

	struct scsi_transport_template *scsi_transport_template;

        atomic_t                status;             /* Module status flags */

	struct list_head	adapter_list_head;  /* head of adapter list */

	struct list_head	adapter_remove_lh;  /* head of adapters to be

						       removed */

	u32			adapters;	    /* # of adapters in list */

	rwlock_t                config_lock;        /* serialises changes

						       to adapter/port/unit

						       lists */

drivers/s390/scsi/zfcp_erp.c

+1 −1
Original line number Diff line number Diff line
@@ -1186,7 +1186,7 @@ static void zfcp_erp_scsi_scan(struct work_struct *work) 
	struct zfcp_unit *unit = p->unit;

	struct fc_rport *rport = unit->port->rport;

	scsi_scan_target(&rport->dev, 0, rport->scsi_target_id,

			 unit->scsi_lun, 0);

			 scsilun_to_int((struct scsi_lun *)&unit->fcp_lun), 0);

	atomic_clear_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING, &unit->status);

	zfcp_unit_put(unit);

	kfree(p);

drivers/s390/scsi/zfcp_fc.c

+2 −1
Original line number Diff line number Diff line
@@ -526,7 +526,8 @@ static void zfcp_validate_port(struct zfcp_port *port) 


	atomic_clear_mask(ZFCP_STATUS_COMMON_NOESC, &port->status);



	if ((port->supported_classes != 0) || (port->units != 0)) {

	if ((port->supported_classes != 0) ||

	    !list_empty(&port->unit_list_head)) {

		zfcp_port_put(port);

		return;

	}