Skip to content

L
linux
Commit 7c7dc196 authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files
Options

[SCSI] zfcp: Simplify handling of ct and els requests 

Remove some redundancies in FC related code and trace:
- drop redundant data from SAN trace (local s_id that only changes
  during link down, ls_code that is already part of payload, d_id in
  ct response trace that is always the same as in ct request trace)
- use one common fsf struct to hold zfcp data for ct and els requests
- leverage common fsf struct for FC passthrough job data, allocate it
  with dd_bsg_data for passthrough requests and unify common code for
  ct and els passthrough request
- simplify callback handling in zfcp_fc
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 800c0cad
Expand all Show whitespace changes
Inline Side-by-side
Showing with 160 additions and 285 deletions
drivers/s390/scsi/zfcp_dbf.c
View file @ 7c7dc196
...@@ -179,7 +179,6 @@ void _zfcp_dbf_hba_fsf_response(const char *tag2, int level, ...@@ -179,7 +179,6 @@ void _zfcp_dbf_hba_fsf_response(const char *tag2, int level,
case FSF_QTCB_SEND_ELS: case FSF_QTCB_SEND_ELS:
send_els = (struct zfcp_send_els *)fsf_req->data; send_els = (struct zfcp_send_els *)fsf_req->data;
response->u.els.d_id = ntoh24(qtcb->bottom.support.d_id); response->u.els.d_id = ntoh24(qtcb->bottom.support.d_id);
response->u.els.ls_code = send_els->ls_code >> 24;
break; break;
case FSF_QTCB_ABORT_FCP_CMND: case FSF_QTCB_ABORT_FCP_CMND:
...@@ -349,7 +348,6 @@ static void zfcp_dbf_hba_view_response(char **p, ...@@ -349,7 +348,6 @@ static void zfcp_dbf_hba_view_response(char **p,
case FSF_QTCB_SEND_ELS: case FSF_QTCB_SEND_ELS:
zfcp_dbf_out(p, "d_id", "0x%06x", r->u.els.d_id); zfcp_dbf_out(p, "d_id", "0x%06x", r->u.els.d_id);
zfcp_dbf_out(p, "ls_code", "0x%02x", r->u.els.ls_code);
break; break;
case FSF_QTCB_ABORT_FCP_CMND: case FSF_QTCB_ABORT_FCP_CMND:
...@@ -678,12 +676,12 @@ void zfcp_dbf_rec_action(char *id2, struct zfcp_erp_action *erp_action) ...@@ -678,12 +676,12 @@ void zfcp_dbf_rec_action(char *id2, struct zfcp_erp_action *erp_action)
/** /**
* zfcp_dbf_san_ct_request - trace event for issued CT request * zfcp_dbf_san_ct_request - trace event for issued CT request
* @fsf_req: request containing issued CT data * @fsf_req: request containing issued CT data
* @d_id: destination id where ct request is sent to
*/ */
void zfcp_dbf_san_ct_request(struct zfcp_fsf_req *fsf_req) void zfcp_dbf_san_ct_request(struct zfcp_fsf_req *fsf_req, u32 d_id)
{ {
struct zfcp_send_ct *ct = (struct zfcp_send_ct *)fsf_req->data; struct zfcp_fsf_ct_els *ct = (struct zfcp_fsf_ct_els *)fsf_req->data;
struct zfcp_fc_wka_port *wka_port = ct->wka_port; struct zfcp_adapter *adapter = fsf_req->adapter;
struct zfcp_adapter *adapter = wka_port->adapter;
struct zfcp_dbf *dbf = adapter->dbf; struct zfcp_dbf *dbf = adapter->dbf;
struct fc_ct_hdr *hdr = sg_virt(ct->req); struct fc_ct_hdr *hdr = sg_virt(ct->req);
struct zfcp_dbf_san_record *r = &dbf->san_buf; struct zfcp_dbf_san_record *r = &dbf->san_buf;
...@@ -696,8 +694,7 @@ void zfcp_dbf_san_ct_request(struct zfcp_fsf_req *fsf_req) ...@@ -696,8 +694,7 @@ void zfcp_dbf_san_ct_request(struct zfcp_fsf_req *fsf_req)
strncpy(r->tag, "octc", ZFCP_DBF_TAG_SIZE); strncpy(r->tag, "octc", ZFCP_DBF_TAG_SIZE);
r->fsf_reqid = fsf_req->req_id; r->fsf_reqid = fsf_req->req_id;
r->fsf_seqno = fsf_req->seq_no; r->fsf_seqno = fsf_req->seq_no;
r->s_id = fc_host_port_id(adapter->scsi_host); oct->d_id = d_id;
r->d_id = wka_port->d_id;
oct->cmd_req_code = hdr->ct_cmd; oct->cmd_req_code = hdr->ct_cmd;
oct->revision = hdr->ct_rev; oct->revision = hdr->ct_rev;
oct->gs_type = hdr->ct_fs_type; oct->gs_type = hdr->ct_fs_type;
...@@ -718,9 +715,8 @@ void zfcp_dbf_san_ct_request(struct zfcp_fsf_req *fsf_req) ...@@ -718,9 +715,8 @@ void zfcp_dbf_san_ct_request(struct zfcp_fsf_req *fsf_req)
*/ */
void zfcp_dbf_san_ct_response(struct zfcp_fsf_req *fsf_req) void zfcp_dbf_san_ct_response(struct zfcp_fsf_req *fsf_req)
{ {
struct zfcp_send_ct *ct = (struct zfcp_send_ct *)fsf_req->data; struct zfcp_fsf_ct_els *ct = (struct zfcp_fsf_ct_els *)fsf_req->data;
struct zfcp_fc_wka_port *wka_port = ct->wka_port; struct zfcp_adapter *adapter = fsf_req->adapter;
struct zfcp_adapter *adapter = wka_port->adapter;
struct fc_ct_hdr *hdr = sg_virt(ct->resp); struct fc_ct_hdr *hdr = sg_virt(ct->resp);
struct zfcp_dbf *dbf = adapter->dbf; struct zfcp_dbf *dbf = adapter->dbf;
struct zfcp_dbf_san_record *r = &dbf->san_buf; struct zfcp_dbf_san_record *r = &dbf->san_buf;
...@@ -733,8 +729,6 @@ void zfcp_dbf_san_ct_response(struct zfcp_fsf_req *fsf_req) ...@@ -733,8 +729,6 @@ void zfcp_dbf_san_ct_response(struct zfcp_fsf_req *fsf_req)
strncpy(r->tag, "rctc", ZFCP_DBF_TAG_SIZE); strncpy(r->tag, "rctc", ZFCP_DBF_TAG_SIZE);
r->fsf_reqid = fsf_req->req_id; r->fsf_reqid = fsf_req->req_id;
r->fsf_seqno = fsf_req->seq_no; r->fsf_seqno = fsf_req->seq_no;
r->s_id = wka_port->d_id;
r->d_id = fc_host_port_id(adapter->scsi_host);
rct->cmd_rsp_code = hdr->ct_cmd; rct->cmd_rsp_code = hdr->ct_cmd;
rct->revision = hdr->ct_rev; rct->revision = hdr->ct_rev;
rct->reason_code = hdr->ct_reason; rct->reason_code = hdr->ct_reason;
...@@ -750,8 +744,8 @@ void zfcp_dbf_san_ct_response(struct zfcp_fsf_req *fsf_req) ...@@ -750,8 +744,8 @@ void zfcp_dbf_san_ct_response(struct zfcp_fsf_req *fsf_req)
} }
static void zfcp_dbf_san_els(const char *tag, int level, static void zfcp_dbf_san_els(const char *tag, int level,
struct zfcp_fsf_req *fsf_req, u32 s_id, u32 d_id, struct zfcp_fsf_req *fsf_req, u32 d_id,
u8 ls_code, void *buffer, int buflen) void *buffer, int buflen)
{ {
struct zfcp_adapter *adapter = fsf_req->adapter; struct zfcp_adapter *adapter = fsf_req->adapter;
struct zfcp_dbf *dbf = adapter->dbf; struct zfcp_dbf *dbf = adapter->dbf;
...@@ -763,9 +757,7 @@ static void zfcp_dbf_san_els(const char *tag, int level, ...@@ -763,9 +757,7 @@ static void zfcp_dbf_san_els(const char *tag, int level,
strncpy(rec->tag, tag, ZFCP_DBF_TAG_SIZE); strncpy(rec->tag, tag, ZFCP_DBF_TAG_SIZE);
rec->fsf_reqid = fsf_req->req_id; rec->fsf_reqid = fsf_req->req_id;
rec->fsf_seqno = fsf_req->seq_no; rec->fsf_seqno = fsf_req->seq_no;
rec->s_id = s_id; rec->u.els.d_id = d_id;
rec->d_id = d_id;
rec->u.els.ls_code = ls_code;
debug_event(dbf->san, level, rec, sizeof(*rec)); debug_event(dbf->san, level, rec, sizeof(*rec));
zfcp_dbf_hexdump(dbf->san, rec, sizeof(*rec), level, zfcp_dbf_hexdump(dbf->san, rec, sizeof(*rec), level,
buffer, min(buflen, ZFCP_DBF_SAN_MAX_PAYLOAD)); buffer, min(buflen, ZFCP_DBF_SAN_MAX_PAYLOAD));
...@@ -778,11 +770,10 @@ static void zfcp_dbf_san_els(const char *tag, int level, ...@@ -778,11 +770,10 @@ static void zfcp_dbf_san_els(const char *tag, int level,
*/ */
void zfcp_dbf_san_els_request(struct zfcp_fsf_req *fsf_req) void zfcp_dbf_san_els_request(struct zfcp_fsf_req *fsf_req)
{ {
struct zfcp_send_els *els = (struct zfcp_send_els *)fsf_req->data; struct zfcp_fsf_ct_els *els = (struct zfcp_fsf_ct_els *)fsf_req->data;
u32 d_id = ntoh24(fsf_req->qtcb->bottom.support.d_id);
zfcp_dbf_san_els("oels", 2, fsf_req, zfcp_dbf_san_els("oels", 2, fsf_req, d_id,
fc_host_port_id(els->adapter->scsi_host),
els->d_id, *(u8 *) sg_virt(els->req),
sg_virt(els->req), els->req->length); sg_virt(els->req), els->req->length);
} }
...@@ -792,12 +783,11 @@ void zfcp_dbf_san_els_request(struct zfcp_fsf_req *fsf_req) ...@@ -792,12 +783,11 @@ void zfcp_dbf_san_els_request(struct zfcp_fsf_req *fsf_req)
*/ */
void zfcp_dbf_san_els_response(struct zfcp_fsf_req *fsf_req) void zfcp_dbf_san_els_response(struct zfcp_fsf_req *fsf_req)
{ {
struct zfcp_send_els *els = (struct zfcp_send_els *)fsf_req->data; struct zfcp_fsf_ct_els *els = (struct zfcp_fsf_ct_els *)fsf_req->data;
u32 d_id = ntoh24(fsf_req->qtcb->bottom.support.d_id);
zfcp_dbf_san_els("rels", 2, fsf_req, els->d_id, zfcp_dbf_san_els("rels", 2, fsf_req, d_id,
fc_host_port_id(els->adapter->scsi_host), sg_virt(els->resp), els->resp->length);
*(u8 *)sg_virt(els->req), sg_virt(els->resp),
els->resp->length);
} }
/** /**
...@@ -806,16 +796,13 @@ void zfcp_dbf_san_els_response(struct zfcp_fsf_req *fsf_req) ...@@ -806,16 +796,13 @@ void zfcp_dbf_san_els_response(struct zfcp_fsf_req *fsf_req)
*/ */
void zfcp_dbf_san_incoming_els(struct zfcp_fsf_req *fsf_req) void zfcp_dbf_san_incoming_els(struct zfcp_fsf_req *fsf_req)
{ {
struct zfcp_adapter *adapter = fsf_req->adapter;
struct fsf_status_read_buffer *buf = struct fsf_status_read_buffer *buf =
(struct fsf_status_read_buffer *)fsf_req->data; (struct fsf_status_read_buffer *)fsf_req->data;
int length = (int)buf->length - int length = (int)buf->length -
(int)((void *)&buf->payload - (void *)buf); (int)((void *)&buf->payload - (void *)buf);
zfcp_dbf_san_els("iels", 1, fsf_req, ntoh24(buf->d_id), zfcp_dbf_san_els("iels", 1, fsf_req, ntoh24(buf->d_id),
fc_host_port_id(adapter->scsi_host), (void *)buf->payload.data, length);
buf->payload.data[0], (void *)buf->payload.data,
length);
} }
static int zfcp_dbf_san_view_format(debug_info_t *id, struct debug_view *view, static int zfcp_dbf_san_view_format(debug_info_t *id, struct debug_view *view,
...@@ -830,11 +817,10 @@ static int zfcp_dbf_san_view_format(debug_info_t *id, struct debug_view *view, ...@@ -830,11 +817,10 @@ static int zfcp_dbf_san_view_format(debug_info_t *id, struct debug_view *view,
zfcp_dbf_tag(&p, "tag", r->tag); zfcp_dbf_tag(&p, "tag", r->tag);
zfcp_dbf_out(&p, "fsf_reqid", "0x%0Lx", r->fsf_reqid); zfcp_dbf_out(&p, "fsf_reqid", "0x%0Lx", r->fsf_reqid);
zfcp_dbf_out(&p, "fsf_seqno", "0x%08x", r->fsf_seqno); zfcp_dbf_out(&p, "fsf_seqno", "0x%08x", r->fsf_seqno);
zfcp_dbf_out(&p, "s_id", "0x%06x", r->s_id);
zfcp_dbf_out(&p, "d_id", "0x%06x", r->d_id);
if (strncmp(r->tag, "octc", ZFCP_DBF_TAG_SIZE) == 0) { if (strncmp(r->tag, "octc", ZFCP_DBF_TAG_SIZE) == 0) {
struct zfcp_dbf_san_record_ct_request *ct = &r->u.ct_req; struct zfcp_dbf_san_record_ct_request *ct = &r->u.ct_req;
zfcp_dbf_out(&p, "d_id", "0x%06x", ct->d_id);
zfcp_dbf_out(&p, "cmd_req_code", "0x%04x", ct->cmd_req_code); zfcp_dbf_out(&p, "cmd_req_code", "0x%04x", ct->cmd_req_code);
zfcp_dbf_out(&p, "revision", "0x%02x", ct->revision); zfcp_dbf_out(&p, "revision", "0x%02x", ct->revision);
zfcp_dbf_out(&p, "gs_type", "0x%02x", ct->gs_type); zfcp_dbf_out(&p, "gs_type", "0x%02x", ct->gs_type);
...@@ -853,7 +839,7 @@ static int zfcp_dbf_san_view_format(debug_info_t *id, struct debug_view *view, ...@@ -853,7 +839,7 @@ static int zfcp_dbf_san_view_format(debug_info_t *id, struct debug_view *view,
strncmp(r->tag, "rels", ZFCP_DBF_TAG_SIZE) == 0 || strncmp(r->tag, "rels", ZFCP_DBF_TAG_SIZE) == 0 ||
strncmp(r->tag, "iels", ZFCP_DBF_TAG_SIZE) == 0) { strncmp(r->tag, "iels", ZFCP_DBF_TAG_SIZE) == 0) {
struct zfcp_dbf_san_record_els *els = &r->u.els; struct zfcp_dbf_san_record_els *els = &r->u.els;
zfcp_dbf_out(&p, "ls_code", "0x%02x", els->ls_code); zfcp_dbf_out(&p, "d_id", "0x%06x", els->d_id);
} }
return p - out_buf; return p - out_buf;
} }
......
drivers/s390/scsi/zfcp_dbf.h
View file @ 7c7dc196
...@@ -123,7 +123,6 @@ struct zfcp_dbf_hba_record_response { ...@@ -123,7 +123,6 @@ struct zfcp_dbf_hba_record_response {
} unit; } unit;
struct { struct {
u32 d_id; u32 d_id;
u8 ls_code;
} els; } els;
} u; } u;
} __attribute__ ((packed)); } __attribute__ ((packed));
...@@ -167,6 +166,7 @@ struct zfcp_dbf_san_record_ct_request { ...@@ -167,6 +166,7 @@ struct zfcp_dbf_san_record_ct_request {
u8 options; u8 options;
u16 max_res_size; u16 max_res_size;
u32 len; u32 len;
u32 d_id;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct zfcp_dbf_san_record_ct_response { struct zfcp_dbf_san_record_ct_response {
...@@ -180,16 +180,13 @@ struct zfcp_dbf_san_record_ct_response { ...@@ -180,16 +180,13 @@ struct zfcp_dbf_san_record_ct_response {
} __attribute__ ((packed)); } __attribute__ ((packed));
struct zfcp_dbf_san_record_els { struct zfcp_dbf_san_record_els {
u8 ls_code; u32 d_id;
u32 len;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct zfcp_dbf_san_record { struct zfcp_dbf_san_record {
u8 tag[ZFCP_DBF_TAG_SIZE]; u8 tag[ZFCP_DBF_TAG_SIZE];
u64 fsf_reqid; u64 fsf_reqid;
u32 fsf_seqno; u32 fsf_seqno;
u32 s_id;
u32 d_id;
union { union {
struct zfcp_dbf_san_record_ct_request ct_req; struct zfcp_dbf_san_record_ct_request ct_req;
struct zfcp_dbf_san_record_ct_response ct_resp; struct zfcp_dbf_san_record_ct_response ct_resp;
......
drivers/s390/scsi/zfcp_def.h
View file @ 7c7dc196
...@@ -132,52 +132,6 @@ struct zfcp_adapter_mempool { ...@@ -132,52 +132,6 @@ struct zfcp_adapter_mempool {
mempool_t *qtcb_pool; mempool_t *qtcb_pool;
}; };
/**
* struct zfcp_send_ct - used to pass parameters to function zfcp_fsf_send_ct
* @wka_port: port where the request is sent to
* @req: scatter-gather list for request
* @resp: scatter-gather list for response
* @handler: handler function (called for response to the request)
* @handler_data: data passed to handler function
* @completion: completion for synchronization purposes
* @status: used to pass error status to calling function
*/
struct zfcp_send_ct {
struct zfcp_fc_wka_port *wka_port;
struct scatterlist *req;
struct scatterlist *resp;
void (*handler)(unsigned long);
unsigned long handler_data;
struct completion *completion;
int status;
};
/**
* struct zfcp_send_els - used to pass parameters to function zfcp_fsf_send_els
* @adapter: adapter where request is sent from
* @port: port where ELS is destinated (port reference count has to be increased)
* @d_id: destiniation id of port where request is sent to
* @req: scatter-gather list for request
* @resp: scatter-gather list for response
* @handler: handler function (called for response to the request)
* @handler_data: data passed to handler function
* @completion: completion for synchronization purposes
* @ls_code: hex code of ELS command
* @status: used to pass error status to calling function
*/
struct zfcp_send_els {
struct zfcp_adapter *adapter;
struct zfcp_port *port;
u32 d_id;
struct scatterlist *req;
struct scatterlist *resp;
void (*handler)(unsigned long);
unsigned long handler_data;
struct completion *completion;
int ls_code;
int status;
};
struct zfcp_qdio_queue { struct zfcp_qdio_queue {
struct qdio_buffer *sbal[QDIO_MAX_BUFFERS_PER_Q]; struct qdio_buffer *sbal[QDIO_MAX_BUFFERS_PER_Q];
u8 first; /* index of next free bfr in queue */ u8 first; /* index of next free bfr in queue */
......
drivers/s390/scsi/zfcp_ext.h
View file @ 7c7dc196
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <scsi/fc/fc_els.h> #include <scsi/fc/fc_els.h>
#include "zfcp_def.h" #include "zfcp_def.h"
#include "zfcp_fc.h"
/* zfcp_aux.c */ /* zfcp_aux.c */
extern struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *, u64); extern struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *, u64);
...@@ -55,7 +56,7 @@ extern void _zfcp_dbf_hba_fsf_unsol(const char *, int level, struct zfcp_dbf *, ...@@ -55,7 +56,7 @@ extern void _zfcp_dbf_hba_fsf_unsol(const char *, int level, struct zfcp_dbf *,
struct fsf_status_read_buffer *); struct fsf_status_read_buffer *);
extern void zfcp_dbf_hba_qdio(struct zfcp_dbf *, unsigned int, int, int); extern void zfcp_dbf_hba_qdio(struct zfcp_dbf *, unsigned int, int, int);
extern void zfcp_dbf_hba_berr(struct zfcp_dbf *, struct zfcp_fsf_req *); extern void zfcp_dbf_hba_berr(struct zfcp_dbf *, struct zfcp_fsf_req *);
extern void zfcp_dbf_san_ct_request(struct zfcp_fsf_req *); extern void zfcp_dbf_san_ct_request(struct zfcp_fsf_req *, u32);
extern void zfcp_dbf_san_ct_response(struct zfcp_fsf_req *); extern void zfcp_dbf_san_ct_response(struct zfcp_fsf_req *);
extern void zfcp_dbf_san_els_request(struct zfcp_fsf_req *); extern void zfcp_dbf_san_els_request(struct zfcp_fsf_req *);
extern void zfcp_dbf_san_els_response(struct zfcp_fsf_req *); extern void zfcp_dbf_san_els_response(struct zfcp_fsf_req *);
...@@ -106,8 +107,7 @@ extern void zfcp_fc_link_test_work(struct work_struct *); ...@@ -106,8 +107,7 @@ extern void zfcp_fc_link_test_work(struct work_struct *);
extern void zfcp_fc_wka_ports_force_offline(struct zfcp_fc_wka_ports *); extern void zfcp_fc_wka_ports_force_offline(struct zfcp_fc_wka_ports *);
extern int zfcp_fc_gs_setup(struct zfcp_adapter *); extern int zfcp_fc_gs_setup(struct zfcp_adapter *);
extern void zfcp_fc_gs_destroy(struct zfcp_adapter *); extern void zfcp_fc_gs_destroy(struct zfcp_adapter *);
extern int zfcp_fc_execute_els_fc_job(struct fc_bsg_job *); extern int zfcp_fc_exec_bsg_job(struct fc_bsg_job *);
extern int zfcp_fc_execute_ct_fc_job(struct fc_bsg_job *);
/* zfcp_fsf.c */ /* zfcp_fsf.c */
extern int zfcp_fsf_open_port(struct zfcp_erp_action *); extern int zfcp_fsf_open_port(struct zfcp_erp_action *);
...@@ -128,8 +128,10 @@ extern struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *, ...@@ -128,8 +128,10 @@ extern struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *,
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_qdio *); extern int zfcp_fsf_status_read(struct zfcp_qdio *);
extern int zfcp_status_read_refill(struct zfcp_adapter *adapter); extern int zfcp_status_read_refill(struct zfcp_adapter *adapter);
extern int zfcp_fsf_send_ct(struct zfcp_send_ct *, mempool_t *); extern int zfcp_fsf_send_ct(struct zfcp_fc_wka_port *, struct zfcp_fsf_ct_els *,
extern int zfcp_fsf_send_els(struct zfcp_send_els *); mempool_t *);
extern int zfcp_fsf_send_els(struct zfcp_adapter *, u32,
struct zfcp_fsf_ct_els *);
extern int zfcp_fsf_send_fcp_command_task(struct zfcp_unit *, extern int zfcp_fsf_send_fcp_command_task(struct zfcp_unit *,
struct scsi_cmnd *); struct scsi_cmnd *);
extern void zfcp_fsf_req_free(struct zfcp_fsf_req *); extern void zfcp_fsf_req_free(struct zfcp_fsf_req *);
......
drivers/s390/scsi/zfcp_fc.c
View file @ 7c7dc196
This diff is collapsed.
drivers/s390/scsi/zfcp_fc.h
View file @ 7c7dc196
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <scsi/fc/fc_ns.h> #include <scsi/fc/fc_ns.h>
#include <scsi/scsi_cmnd.h> #include <scsi/scsi_cmnd.h>
#include <scsi/scsi_tcq.h> #include <scsi/scsi_tcq.h>
#include "zfcp_fsf.h"
#define ZFCP_FC_CT_SIZE_PAGE (PAGE_SIZE - sizeof(struct fc_ct_hdr)) #define ZFCP_FC_CT_SIZE_PAGE (PAGE_SIZE - sizeof(struct fc_ct_hdr))
#define ZFCP_FC_GPN_FT_ENT_PAGE (ZFCP_FC_CT_SIZE_PAGE \ #define ZFCP_FC_GPN_FT_ENT_PAGE (ZFCP_FC_CT_SIZE_PAGE \
...@@ -55,7 +56,7 @@ struct zfcp_fc_gid_pn_resp { ...@@ -55,7 +56,7 @@ struct zfcp_fc_gid_pn_resp {
* @gid_pn_resp: GID_PN response data * @gid_pn_resp: GID_PN response data
*/ */
struct zfcp_fc_gid_pn { struct zfcp_fc_gid_pn {
struct zfcp_send_ct ct; struct zfcp_fsf_ct_els ct;
struct scatterlist sg_req; struct scatterlist sg_req;
struct scatterlist sg_resp; struct scatterlist sg_resp;
struct zfcp_fc_gid_pn_req gid_pn_req; struct zfcp_fc_gid_pn_req gid_pn_req;
...@@ -90,7 +91,7 @@ struct zfcp_fc_gpn_ft_resp { ...@@ -90,7 +91,7 @@ struct zfcp_fc_gpn_ft_resp {
* @sg_resp: scatter list entries for gpn_ft responses (per memory page) * @sg_resp: scatter list entries for gpn_ft responses (per memory page)
*/ */
struct zfcp_fc_gpn_ft { struct zfcp_fc_gpn_ft {
struct zfcp_send_ct ct; struct zfcp_fsf_ct_els ct;
struct scatterlist sg_req; struct scatterlist sg_req;
struct scatterlist sg_resp[ZFCP_FC_GPN_FT_NUM_BUFS]; struct scatterlist sg_resp[ZFCP_FC_GPN_FT_NUM_BUFS];
}; };
...@@ -104,7 +105,7 @@ struct zfcp_fc_gpn_ft { ...@@ -104,7 +105,7 @@ struct zfcp_fc_gpn_ft {
* @adisc_resp: ELS ADISC response data * @adisc_resp: ELS ADISC response data
*/ */
struct zfcp_fc_els_adisc { struct zfcp_fc_els_adisc {
struct zfcp_send_els els; struct zfcp_fsf_ct_els els;
struct scatterlist req; struct scatterlist req;
struct scatterlist resp; struct scatterlist resp;
struct fc_els_adisc adisc_req; struct fc_els_adisc adisc_req;
......
drivers/s390/scsi/zfcp_fsf.c
View file @ 7c7dc196
...@@ -961,10 +961,10 @@ struct zfcp_fsf_req *zfcp_fsf_abort_fcp_command(unsigned long old_req_id, ...@@ -961,10 +961,10 @@ struct zfcp_fsf_req *zfcp_fsf_abort_fcp_command(unsigned long old_req_id,
static void zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *req) static void zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *req)
{ {
struct zfcp_adapter *adapter = req->adapter; struct zfcp_adapter *adapter = req->adapter;
struct zfcp_send_ct *send_ct = req->data; struct zfcp_fsf_ct_els *ct = req->data;
struct fsf_qtcb_header *header = &req->qtcb->header; struct fsf_qtcb_header *header = &req->qtcb->header;
send_ct->status = -EINVAL; ct->status = -EINVAL;
if (req->status & ZFCP_STATUS_FSFREQ_ERROR) if (req->status & ZFCP_STATUS_FSFREQ_ERROR)
goto skip_fsfstatus; goto skip_fsfstatus;
...@@ -972,7 +972,7 @@ static void zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *req) ...@@ -972,7 +972,7 @@ static void zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *req)
switch (header->fsf_status) { switch (header->fsf_status) {
case FSF_GOOD: case FSF_GOOD:
zfcp_dbf_san_ct_response(req); zfcp_dbf_san_ct_response(req);
send_ct->status = 0; ct->status = 0;
break; break;
case FSF_SERVICE_CLASS_NOT_SUPPORTED: case FSF_SERVICE_CLASS_NOT_SUPPORTED:
zfcp_fsf_class_not_supp(req); zfcp_fsf_class_not_supp(req);
...@@ -1004,8 +1004,8 @@ static void zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *req) ...@@ -1004,8 +1004,8 @@ static void zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *req)
} }
skip_fsfstatus: skip_fsfstatus:
if (send_ct->handler) if (ct->handler)
send_ct->handler(send_ct->handler_data); ct->handler(ct->handler_data);
} }
static void zfcp_fsf_setup_ct_els_unchained(struct qdio_buffer_element *sbale, static void zfcp_fsf_setup_ct_els_unchained(struct qdio_buffer_element *sbale,
...@@ -1094,9 +1094,9 @@ static int zfcp_fsf_setup_ct_els(struct zfcp_fsf_req *req, ...@@ -1094,9 +1094,9 @@ static int zfcp_fsf_setup_ct_els(struct zfcp_fsf_req *req,
* @ct: pointer to struct zfcp_send_ct with data for request * @ct: pointer to struct zfcp_send_ct with data for request
* @pool: if non-null this mempool is used to allocate struct zfcp_fsf_req * @pool: if non-null this mempool is used to allocate struct zfcp_fsf_req
*/ */
int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool) int zfcp_fsf_send_ct(struct zfcp_fc_wka_port *wka_port,
struct zfcp_fsf_ct_els *ct, mempool_t *pool)
{ {
struct zfcp_fc_wka_port *wka_port = ct->wka_port;
struct zfcp_qdio *qdio = wka_port->adapter->qdio; struct zfcp_qdio *qdio = wka_port->adapter->qdio;
struct zfcp_fsf_req *req; struct zfcp_fsf_req *req;
int ret = -EIO; int ret = -EIO;
...@@ -1122,7 +1122,7 @@ int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool) ...@@ -1122,7 +1122,7 @@ int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool)
req->qtcb->header.port_handle = wka_port->handle; req->qtcb->header.port_handle = wka_port->handle;
req->data = ct; req->data = ct;
zfcp_dbf_san_ct_request(req); zfcp_dbf_san_ct_request(req, wka_port->d_id);
ret = zfcp_fsf_req_send(req); ret = zfcp_fsf_req_send(req);
if (ret) if (ret)
...@@ -1139,7 +1139,7 @@ int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool) ...@@ -1139,7 +1139,7 @@ int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool)
static void zfcp_fsf_send_els_handler(struct zfcp_fsf_req *req) static void zfcp_fsf_send_els_handler(struct zfcp_fsf_req *req)
{ {
struct zfcp_send_els *send_els = req->data; struct zfcp_fsf_ct_els *send_els = req->data;
struct zfcp_port *port = send_els->port; struct zfcp_port *port = send_els->port;
struct fsf_qtcb_header *header = &req->qtcb->header; struct fsf_qtcb_header *header = &req->qtcb->header;
...@@ -1159,9 +1159,6 @@ static void zfcp_fsf_send_els_handler(struct zfcp_fsf_req *req) ...@@ -1159,9 +1159,6 @@ static void zfcp_fsf_send_els_handler(struct zfcp_fsf_req *req)
case FSF_ADAPTER_STATUS_AVAILABLE: case FSF_ADAPTER_STATUS_AVAILABLE:
switch (header->fsf_status_qual.word[0]){ switch (header->fsf_status_qual.word[0]){
case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE: case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:
if (port && (send_els->ls_code != ELS_ADISC))
zfcp_fc_test_link(port);
/*fall through */
case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED: case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:
case FSF_SQ_RETRY_IF_POSSIBLE: case FSF_SQ_RETRY_IF_POSSIBLE:
req->status |= ZFCP_STATUS_FSFREQ_ERROR; req->status |= ZFCP_STATUS_FSFREQ_ERROR;
...@@ -1193,10 +1190,11 @@ static void zfcp_fsf_send_els_handler(struct zfcp_fsf_req *req) ...@@ -1193,10 +1190,11 @@ static void zfcp_fsf_send_els_handler(struct zfcp_fsf_req *req)
* zfcp_fsf_send_els - initiate an ELS command (FC-FS) * zfcp_fsf_send_els - initiate an ELS command (FC-FS)
* @els: pointer to struct zfcp_send_els with data for the command * @els: pointer to struct zfcp_send_els with data for the command
*/ */
int zfcp_fsf_send_els(struct zfcp_send_els *els) int zfcp_fsf_send_els(struct zfcp_adapter *adapter, u32 d_id,
struct zfcp_fsf_ct_els *els)
{ {
struct zfcp_fsf_req *req; struct zfcp_fsf_req *req;
struct zfcp_qdio *qdio = els->adapter->qdio; struct zfcp_qdio *qdio = adapter->qdio;
int ret = -EIO; int ret = -EIO;
spin_lock_bh(&qdio->req_q_lock); spin_lock_bh(&qdio->req_q_lock);
...@@ -1216,7 +1214,7 @@ int zfcp_fsf_send_els(struct zfcp_send_els *els) ...@@ -1216,7 +1214,7 @@ int zfcp_fsf_send_els(struct zfcp_send_els *els)
if (ret) if (ret)
goto failed_send; goto failed_send;
hton24(req->qtcb->bottom.support.d_id, els->d_id); hton24(req->qtcb->bottom.support.d_id, d_id);
req->handler = zfcp_fsf_send_els_handler; req->handler = zfcp_fsf_send_els_handler;
req->data = els; req->data = els;
......
drivers/s390/scsi/zfcp_fsf.h
View file @ 7c7dc196
...@@ -437,4 +437,22 @@ struct zfcp_blk_drv_data { ...@@ -437,4 +437,22 @@ struct zfcp_blk_drv_data {
u64 fabric_lat; u64 fabric_lat;
} __attribute__ ((packed)); } __attribute__ ((packed));
/**
* struct zfcp_fsf_ct_els - zfcp data for ct or els request
* @req: scatter-gather list for request
* @resp: scatter-gather list for response
* @handler: handler function (called for response to the request)
* @handler_data: data passed to handler function
* @port: Optional pointer to port for zfcp internal ELS (only test link ADISC)
* @status: used to pass error status to calling function
*/
struct zfcp_fsf_ct_els {
struct scatterlist *req;
struct scatterlist *resp;
void (*handler)(void *);
void *handler_data;
struct zfcp_port *port;
int status;
};
#endif /* FSF_H */ #endif /* FSF_H */
drivers/s390/scsi/zfcp_scsi.c
View file @ 7c7dc196
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <asm/atomic.h> #include <asm/atomic.h>
#include "zfcp_ext.h" #include "zfcp_ext.h"
#include "zfcp_dbf.h" #include "zfcp_dbf.h"
#include "zfcp_fc.h"
static unsigned int default_depth = 32; static unsigned int default_depth = 32;
module_param_named(queue_depth, default_depth, uint, 0600); module_param_named(queue_depth, default_depth, uint, 0600);
...@@ -628,20 +629,6 @@ void zfcp_scsi_scan(struct work_struct *work) ...@@ -628,20 +629,6 @@ void zfcp_scsi_scan(struct work_struct *work)
put_device(&unit->sysfs_device); put_device(&unit->sysfs_device);
} }
static int zfcp_execute_fc_job(struct fc_bsg_job *job)
{
switch (job->request->msgcode) {
case FC_BSG_RPT_ELS:
case FC_BSG_HST_ELS_NOLOGIN:
return zfcp_fc_execute_els_fc_job(job);
case FC_BSG_RPT_CT:
case FC_BSG_HST_CT:
return zfcp_fc_execute_ct_fc_job(job);
default:
return -EINVAL;
}
}
struct fc_function_template zfcp_transport_functions = { struct fc_function_template zfcp_transport_functions = {
.show_starget_port_id = 1, .show_starget_port_id = 1,
.show_starget_port_name = 1, .show_starget_port_name = 1,
...@@ -662,13 +649,14 @@ struct fc_function_template zfcp_transport_functions = { ...@@ -662,13 +649,14 @@ struct fc_function_template zfcp_transport_functions = {
.get_host_port_state = zfcp_get_host_port_state, .get_host_port_state = zfcp_get_host_port_state,
.terminate_rport_io = zfcp_scsi_terminate_rport_io, .terminate_rport_io = zfcp_scsi_terminate_rport_io,
.show_host_port_state = 1, .show_host_port_state = 1,
.bsg_request = zfcp_execute_fc_job, .bsg_request = zfcp_fc_exec_bsg_job,
/* no functions registered for following dynamic attributes but /* no functions registered for following dynamic attributes but
directly set by LLDD */ directly set by LLDD */
.show_host_port_type = 1, .show_host_port_type = 1,
.show_host_speed = 1, .show_host_speed = 1,
.show_host_port_id = 1, .show_host_port_id = 1,
.disable_target_scan = 1, .disable_target_scan = 1,
.dd_bsg_size = sizeof(struct zfcp_fsf_ct_els),
}; };
struct zfcp_data zfcp_data = { struct zfcp_data zfcp_data = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7