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

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

[SCSI] zfcp: Move FSF request tracking code to new file 



Move the code for tracking FSF requests to new file to have this code
in one place. The functions for adding and removing requests on the
I/O path are already inline. The alloc and free functions are only
called once, so it does not hurt to inline them and add them to the
same file.

Reviewed-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 e60a6d69

drivers/s390/scsi/zfcp_aux.c

+3 −33
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/seq_file.h>

#include "zfcp_ext.h"

#include "zfcp_fc.h"

#include "zfcp_reqlist.h"



#define ZFCP_BUS_ID_SIZE	20
@@ -49,36 +50,6 @@ static struct kmem_cache *zfcp_cache_hw_align(const char *name, 
	return kmem_cache_create(name, size, roundup_pow_of_two(size), 0, NULL);

}



static int zfcp_reqlist_alloc(struct zfcp_adapter *adapter)

{

	int idx;



	adapter->req_list = kcalloc(REQUEST_LIST_SIZE, sizeof(struct list_head),

				    GFP_KERNEL);

	if (!adapter->req_list)

		return -ENOMEM;



	for (idx = 0; idx < REQUEST_LIST_SIZE; idx++)

		INIT_LIST_HEAD(&adapter->req_list[idx]);

	return 0;

}



/**

 * zfcp_reqlist_isempty - is the request list empty

 * @adapter: pointer to struct zfcp_adapter

 *

 * Returns: true if list is empty, false otherwise

 */

int zfcp_reqlist_isempty(struct zfcp_adapter *adapter)

{

	unsigned int idx;



	for (idx = 0; idx < REQUEST_LIST_SIZE; idx++)

		if (!list_empty(&adapter->req_list[idx]))

			return 0;

	return 1;

}



static void __init zfcp_init_device_configure(char *busid, u64 wwpn, u64 lun)

{

	struct ccw_device *cdev;
@@ -539,7 +510,8 @@ struct zfcp_adapter *zfcp_adapter_enqueue(struct ccw_device *ccw_device) 
	if (zfcp_allocate_low_mem_buffers(adapter))

		goto failed;



	if (zfcp_reqlist_alloc(adapter))

	adapter->req_list = zfcp_reqlist_alloc();

	if (!adapter->req_list)

		goto failed;



	if (zfcp_dbf_adapter_register(adapter))
@@ -560,8 +532,6 @@ struct zfcp_adapter *zfcp_adapter_enqueue(struct ccw_device *ccw_device) 
	INIT_LIST_HEAD(&adapter->erp_ready_head);

	INIT_LIST_HEAD(&adapter->erp_running_head);



	spin_lock_init(&adapter->req_list_lock);



	rwlock_init(&adapter->erp_lock);

	rwlock_init(&adapter->abort_lock);

drivers/s390/scsi/zfcp_ccw.c

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt



#include "zfcp_ext.h"

#include "zfcp_reqlist.h"



#define ZFCP_MODEL_PRIV 0x4
@@ -162,7 +163,7 @@ static int zfcp_ccw_set_online(struct ccw_device *cdev) 
	}



	/* initialize request counter */

	BUG_ON(!zfcp_reqlist_isempty(adapter));

	BUG_ON(!zfcp_reqlist_isempty(adapter->req_list));

	adapter->req_no = 0;



	zfcp_erp_modify_adapter_status(adapter, "ccsonl1", NULL,

drivers/s390/scsi/zfcp_def.h

+2 −32
Original line number Diff line number Diff line
@@ -39,9 +39,7 @@ 
#include <asm/sysinfo.h>

#include "zfcp_fsf.h"



/********************* GENERAL DEFINES *********************************/



#define REQUEST_LIST_SIZE 128

struct zfcp_reqlist;



/********************* SCSI SPECIFIC DEFINES *********************************/

#define ZFCP_SCSI_ER_TIMEOUT                    (10*HZ)
@@ -206,8 +204,7 @@ struct zfcp_adapter { 
	struct list_head	port_list;	   /* remote port list */

	rwlock_t		port_list_lock;    /* port list lock */

	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_reqlist	*req_list;

	u32			fsf_req_seq_no;	   /* FSF cmnd seq number */

	rwlock_t		abort_lock;        /* Protects against SCSI

						      stack abort/command
@@ -351,31 +348,4 @@ struct zfcp_data { 
#define ZFCP_SET                0x00000100

#define ZFCP_CLEAR              0x00000200



/*

 * Helper functions for request ID management.

 */

static inline int zfcp_reqlist_hash(unsigned long req_id)

{

	return req_id % REQUEST_LIST_SIZE;

}



static inline void zfcp_reqlist_remove(struct zfcp_adapter *adapter,

				       struct zfcp_fsf_req *fsf_req)

{

	list_del(&fsf_req->list);

}



static inline struct zfcp_fsf_req *

zfcp_reqlist_find(struct zfcp_adapter *adapter, unsigned long req_id)

{

	struct zfcp_fsf_req *request;

	unsigned int idx;



	idx = zfcp_reqlist_hash(req_id);

	list_for_each_entry(request, &adapter->req_list[idx], list)

		if (request->req_id == req_id)

			return request;

	return NULL;

}



#endif /* ZFCP_DEF_H */

drivers/s390/scsi/zfcp_erp.c

+4 −3
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#include <linux/kthread.h>

#include "zfcp_ext.h"

#include "zfcp_reqlist.h"



#define ZFCP_MAX_ERPS                   3
@@ -483,8 +484,8 @@ static void zfcp_erp_strategy_check_fsfreq(struct zfcp_erp_action *act) 
	if (!act->fsf_req_id)

		return;



	spin_lock(&adapter->req_list_lock);

	req = zfcp_reqlist_find(adapter, act->fsf_req_id);

	spin_lock(&adapter->req_list->lock);

	req = _zfcp_reqlist_find(adapter->req_list, act->fsf_req_id);

	if (req && req->erp_action == act) {

		if (act->status & (ZFCP_STATUS_ERP_DISMISSED |

				   ZFCP_STATUS_ERP_TIMEDOUT)) {
@@ -498,7 +499,7 @@ static void zfcp_erp_strategy_check_fsfreq(struct zfcp_erp_action *act) 
			act->fsf_req_id = 0;

	} else

		act->fsf_req_id = 0;

	spin_unlock(&adapter->req_list_lock);

	spin_unlock(&adapter->req_list->lock);

}



/**

drivers/s390/scsi/zfcp_ext.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ extern struct zfcp_adapter *zfcp_adapter_enqueue(struct ccw_device *); 
extern struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *, u64, u32,

					   u32);

extern struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *, u64);

extern int zfcp_reqlist_isempty(struct zfcp_adapter *);

extern void zfcp_sg_free_table(struct scatterlist *, int);

extern int zfcp_sg_setup_table(struct scatterlist *, int);

extern void zfcp_device_unregister(struct device *,