[SCSI] zfcp: Improve request allocation through mempools

Remove the special case for NO_QTCB requests and optimize the
mempool and cache processing for fsfreqs. Especially use seperate
mempools for the zfcp_fsf_req and zfcp_qtcb structs.

Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 18 insertions, 13 deletions

diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index 944f67754ee..1e27ed5d90e 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -264,12 +264,13 @@ struct zfcp_fsf_req;
 
 /* holds various memory pools of an adapter */
 struct zfcp_adapter_mempool {
-        mempool_t *fsf_req_erp;
-        mempool_t *fsf_req_scsi;
-        mempool_t *fsf_req_abort;
-        mempool_t *fsf_req_status_read;
-        mempool_t *data_status_read;
-        mempool_t *data_gid_pn;
+        mempool_t *erp_req;
+        mempool_t *scsi_req;
+        mempool_t *scsi_abort;
+        mempool_t *status_read_req;
+        mempool_t *status_read_data;
+        mempool_t *gid_pn_data;
+        mempool_t *qtcb_pool;
 };
 
 /*
@@ -303,6 +304,15 @@ struct ct_iu_gid_pn_resp {
         u32 d_id;
 } __attribute__ ((packed));
 
+struct ct_iu_gpn_ft_req {
+        struct ct_hdr header;
+        u8 flags;
+        u8 domain_id_scope;
+        u8 area_id_scope;
+        u8 fc4_type;
+} __attribute__ ((packed));
+
+
 /**
  * struct zfcp_send_ct - used to pass parameters to function zfcp_fsf_send_ct
  * @wka_port: port where the request is sent to
@@ -559,18 +569,13 @@ struct zfcp_data {
                                                        lists */
         struct semaphore        config_sema;        /* serialises configuration
                                                        changes */
-        struct kmem_cache       *fsf_req_qtcb_cache;
+        struct kmem_cache       *gpn_ft_cache;
+        struct kmem_cache       *qtcb_cache;
         struct kmem_cache       *sr_buffer_cache;
         struct kmem_cache       *gid_pn_cache;
         struct workqueue_struct *work_queue;
 };
 
-/* struct used by memory pools for fsf_requests */
-struct zfcp_fsf_req_qtcb {
-        struct zfcp_fsf_req fsf_req;
-        struct fsf_qtcb qtcb;
-};
-
 /********************** ZFCP SPECIFIC DEFINES ********************************/
 
 #define ZFCP_SET                0x00000100