ibmvfc: byte swap login_buf.resp values in attribute show functions
Subsystems (3)
Tyrel Datwyler
maintainerPATCH 1/6 ibmvfc: byte swap login_buf.resp values in attribute show functions
Both ibmvfc_show_host_(capabilities|npiv_version) functions retrieve values from vhost->login_buf.resp buffer. This is the MAD response buffer from the VIOS and as such any multi-byte non-string values are in big endian format.
Byte swap these values to host cpu endian format for better human readability.
--- drivers/scsi/ibmvscsi/ibmvfc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/ibmvscsi/ibmvfc.c +2 -2
@@ -3025,7 +3025,7 @@ static ssize_t ibmvfc_show_host_npiv_version(struct device *dev, {struct Scsi_Host *shost =class_to_shost (dev);struct ibmvfc_host *vhost =shost_priv (shost); -return snprintf (buf,PAGE_SIZE ,"%d\n" , vhost->login_buf->resp.version); +return snprintf (buf,PAGE_SIZE ,"%d\n" ,be32_to_cpu (vhost->login_buf->resp.version)); } static ssize_t ibmvfc_show_host_capabilities(struct device *dev,
@@ -3033,7 +3033,7 @@ static ssize_t ibmvfc_show_host_capabilities(struct device *dev, {struct Scsi_Host *shost =class_to_shost (dev);struct ibmvfc_host *vhost =shost_priv (shost); -return snprintf (buf,PAGE_SIZE ,"%llx\n" , vhost->login_buf->resp.capabilities); +return snprintf (buf,PAGE_SIZE ,"%llx\n" ,be64_to_cpu (vhost->login_buf->resp.capabilities)); }/**
Signature · 1 line
2.27.0
Tyrel Datwyler
maintainerPATCH 2/6 ibmvfc: deduplicate common ibmvfc_cmd init code
The virtual FC frame command exchaned with the VIOS is used for device reset and command abort TMF as well as normally queued commands. When initializing the ibmvfc_cmd there several elements of the command that are set the same way regardless of the command type.
Deduplicate code by moving these commonally set fields into a initialization helper routine, namely ibmvfc_init_vfc_cmd().
--- drivers/scsi/ibmvscsi/ibmvfc.c | 55 ++++++++++++++-------------------- 1 file changed, 23 insertions(+), 32 deletions(-)
drivers/scsi/ibmvscsi/ibmvfc.c +23 -32
@@ -1646,6 +1646,24 @@ static inline int ibmvfc_host_chkready(struct ibmvfc_host *vhost)return result; } +static struct ibmvfc_cmd *ibmvfc_init_vfc_cmd (struct ibmvfc_event *evt,struct scsi_device *sdev) +{ +struct fc_rport *rport =starget_to_rport (scsi_target (sdev)); +struct ibmvfc_cmd *vfc_cmd = &evt->iu.cmd; + +memset (vfc_cmd,0 ,sizeof (*vfc_cmd)); + vfc_cmd->resp.va =cpu_to_be64 (be64_to_cpu (evt->crq.ioba) + offsetof(struct ibmvfc_cmd , rsp)); + vfc_cmd->resp.len =cpu_to_be32 (sizeof (vfc_cmd->rsp)); + vfc_cmd->frame_type =cpu_to_be32 (IBMVFC_SCSI_FCP_TYPE ); + vfc_cmd->payload_len =cpu_to_be32 (sizeof (vfc_cmd->iu)); + vfc_cmd->resp_len =cpu_to_be32 (sizeof (vfc_cmd->rsp)); + vfc_cmd->cancel_key =cpu_to_be32 ((unsigned long )sdev->hostdata); + vfc_cmd->tgt_scsi_id =cpu_to_be64 (rport->port_id); +int_to_scsilun (sdev->lun, &vfc_cmd->iu.lun); + +return vfc_cmd; +} +/** * ibmvfc_queuecommand - The queuecommand function of the scsi template * @cmnd: struct scsi_cmnd to be executed
@@ -1675,17 +1693,10 @@ static int ibmvfc_queuecommand_lck(struct scsi_cmnd *cmnd,ibmvfc_init_event (evt, ibmvfc_scsi_done,IBMVFC_CMD_FORMAT ); evt->cmnd = cmnd; cmnd->scsi_done = done; - vfc_cmd = &evt->iu.cmd; -memset (vfc_cmd,0 ,sizeof (*vfc_cmd)); - vfc_cmd->resp.va =cpu_to_be64 (be64_to_cpu (evt->crq.ioba) + offsetof(struct ibmvfc_cmd , rsp)); - vfc_cmd->resp.len =cpu_to_be32 (sizeof (vfc_cmd->rsp)); - vfc_cmd->frame_type =cpu_to_be32 (IBMVFC_SCSI_FCP_TYPE ); - vfc_cmd->payload_len =cpu_to_be32 (sizeof (vfc_cmd->iu)); - vfc_cmd->resp_len =cpu_to_be32 (sizeof (vfc_cmd->rsp)); - vfc_cmd->cancel_key =cpu_to_be32 ((unsigned long )cmnd->device->hostdata); - vfc_cmd->tgt_scsi_id =cpu_to_be64 (rport->port_id); + + vfc_cmd =ibmvfc_init_vfc_cmd (evt, cmnd->device); + vfc_cmd->iu.xfer_len =cpu_to_be32 (scsi_bufflen (cmnd)); -int_to_scsilun (cmnd->device->lun, &vfc_cmd->iu.lun);memcpy (vfc_cmd->iu.cdb, cmnd->cmnd, cmnd->cmd_len);if (cmnd->flags &SCMD_TAGGED ) {
@@ -2012,7 +2023,6 @@ static int ibmvfc_bsg_request(struct bsg_job *job)static int ibmvfc_reset_device (struct scsi_device *sdev,int type,char *desc) {struct ibmvfc_host *vhost =shost_priv (sdev->host); -struct fc_rport *rport =starget_to_rport (scsi_target (sdev));struct ibmvfc_cmd *tmf;struct ibmvfc_event *evt =NULL ;union ibmvfc_iu rsp_iu;
@@ -2025,17 +2035,8 @@ static int ibmvfc_reset_device(struct scsi_device *sdev, int type, char *desc)if (vhost->state ==IBMVFC_ACTIVE ) { evt =ibmvfc_get_event (vhost);ibmvfc_init_event (evt, ibmvfc_sync_completion,IBMVFC_CMD_FORMAT ); + tmf =ibmvfc_init_vfc_cmd (evt, sdev); - tmf = &evt->iu.cmd; -memset (tmf,0 ,sizeof (*tmf)); - tmf->resp.va =cpu_to_be64 (be64_to_cpu (evt->crq.ioba) + offsetof(struct ibmvfc_cmd , rsp)); - tmf->resp.len =cpu_to_be32 (sizeof (tmf->rsp)); - tmf->frame_type =cpu_to_be32 (IBMVFC_SCSI_FCP_TYPE ); - tmf->payload_len =cpu_to_be32 (sizeof (tmf->iu)); - tmf->resp_len =cpu_to_be32 (sizeof (tmf->rsp)); - tmf->cancel_key =cpu_to_be32 ((unsigned long )sdev->hostdata); - tmf->tgt_scsi_id =cpu_to_be64 (rport->port_id); -int_to_scsilun (sdev->lun, &tmf->iu.lun); tmf->flags =cpu_to_be16 ((IBMVFC_NO_MEM_DESC |IBMVFC_TMF )); tmf->iu.tmf_flags = type; evt->sync_iu = &rsp_iu;
@@ -2327,7 +2328,6 @@ static int ibmvfc_match_evt(struct ibmvfc_event *evt, void *match)static int ibmvfc_abort_task_set (struct scsi_device *sdev) {struct ibmvfc_host *vhost =shost_priv (sdev->host); -struct fc_rport *rport =starget_to_rport (scsi_target (sdev));struct ibmvfc_cmd *tmf;struct ibmvfc_event *evt, *found_evt;union ibmvfc_iu rsp_iu;
@@ -2355,17 +2355,8 @@ static int ibmvfc_abort_task_set(struct scsi_device *sdev)if (vhost->state ==IBMVFC_ACTIVE ) { evt =ibmvfc_get_event (vhost);ibmvfc_init_event (evt, ibmvfc_sync_completion,IBMVFC_CMD_FORMAT ); + tmf =ibmvfc_init_vfc_cmd (evt, sdev); - tmf = &evt->iu.cmd; -memset (tmf,0 ,sizeof (*tmf)); - tmf->resp.va =cpu_to_be64 (be64_to_cpu (evt->crq.ioba) + offsetof(struct ibmvfc_cmd , rsp)); - tmf->resp.len =cpu_to_be32 (sizeof (tmf->rsp)); - tmf->frame_type =cpu_to_be32 (IBMVFC_SCSI_FCP_TYPE ); - tmf->payload_len =cpu_to_be32 (sizeof (tmf->iu)); - tmf->resp_len =cpu_to_be32 (sizeof (tmf->rsp)); - tmf->cancel_key =cpu_to_be32 ((unsigned long )sdev->hostdata); - tmf->tgt_scsi_id =cpu_to_be64 (rport->port_id); -int_to_scsilun (sdev->lun, &tmf->iu.lun); tmf->flags =cpu_to_be16 ((IBMVFC_NO_MEM_DESC |IBMVFC_TMF )); tmf->iu.tmf_flags =IBMVFC_ABORT_TASK_SET ; evt->sync_iu = &rsp_iu;
Signature · 1 line
2.27.0
Tyrel Datwyler
maintainerPATCH 3/6 ibmvfc: add new fields for version 2 of several MADs
In reply to Tyrel DatwylerIntroduce a targetWWPN field to several MADs. Its possible that a scsi ID of a target can change due to some fabric changes. The WWPN of the scsi target provides a better way to identify the target. Also, add flags for receiving MAD versioning information and advertising client support for targetWWPN with the VIOS. This latter capability flag will be required for future clients capable of requesting multiple hardware queues from the host adapter.
--- drivers/scsi/ibmvscsi/ibmvfc.c | 58 ++++++++++++++++++---------------- drivers/scsi/ibmvscsi/ibmvfc.h | 28 +++++++++++++--- 2 files changed, 55 insertions(+), 31 deletions(-)
drivers/scsi/ibmvscsi/ibmvfc.c +31 -27
@@ -149,6 +149,7 @@ static void ibmvfc_trc_start(struct ibmvfc_event *evt)struct ibmvfc_host *vhost = evt->vhost;struct ibmvfc_cmd *vfc_cmd = &evt->iu.cmd;struct ibmvfc_mad_common *mad = &evt->iu.mad_common; +struct ibmvfc_fcp_cmd_iu *iu = &vfc_cmd->v1.iu;struct ibmvfc_trace_entry *entry; entry = &vhost->trace[vhost->trace_index++];
@@ -159,11 +160,11 @@ static void ibmvfc_trc_start(struct ibmvfc_event *evt)switch (entry->fmt) {case IBMVFC_CMD_FORMAT : - entry->op_code = vfc_cmd->iu.cdb[0 ]; + entry->op_code = iu->cdb[0 ]; entry->scsi_id =be64_to_cpu (vfc_cmd->tgt_scsi_id); - entry->lun =scsilun_to_int (&vfc_cmd->iu.lun); - entry->tmf_flags = vfc_cmd->iu.tmf_flags; - entry->u.start.xfer_len =be32_to_cpu (vfc_cmd->iu.xfer_len); + entry->lun =scsilun_to_int (&iu->lun); + entry->tmf_flags = iu->tmf_flags; + entry->u.start.xfer_len =be32_to_cpu (iu->xfer_len);break ;case IBMVFC_MAD_FORMAT : entry->op_code =be32_to_cpu (mad->opcode);
@@ -183,6 +184,8 @@ static void ibmvfc_trc_end(struct ibmvfc_event *evt)struct ibmvfc_host *vhost = evt->vhost;struct ibmvfc_cmd *vfc_cmd = &evt->xfer_iu->cmd;struct ibmvfc_mad_common *mad = &evt->xfer_iu->mad_common; +struct ibmvfc_fcp_cmd_iu *iu = &vfc_cmd->v1.iu; +struct ibmvfc_fcp_rsp *rsp = &vfc_cmd->v1.rsp;struct ibmvfc_trace_entry *entry = &vhost->trace[vhost->trace_index++]; entry->evt = evt;
@@ -192,15 +195,15 @@ static void ibmvfc_trc_end(struct ibmvfc_event *evt)switch (entry->fmt) {case IBMVFC_CMD_FORMAT : - entry->op_code = vfc_cmd->iu.cdb[0 ]; + entry->op_code = iu->cdb[0 ]; entry->scsi_id =be64_to_cpu (vfc_cmd->tgt_scsi_id); - entry->lun =scsilun_to_int (&vfc_cmd->iu.lun); - entry->tmf_flags = vfc_cmd->iu.tmf_flags; + entry->lun =scsilun_to_int (&iu->lun); + entry->tmf_flags = iu->tmf_flags; entry->u.end.status =be16_to_cpu (vfc_cmd->status); entry->u.end.error =be16_to_cpu (vfc_cmd->error); - entry->u.end.fcp_rsp_flags = vfc_cmd->rsp.flags; - entry->u.end.rsp_code = vfc_cmd->rsp.data.info.rsp_code; - entry->u.end.scsi_status = vfc_cmd->rsp.scsi_status; + entry->u.end.fcp_rsp_flags = rsp->flags; + entry->u.end.rsp_code = rsp->data.info.rsp_code; + entry->u.end.scsi_status = rsp->scsi_status;break ;case IBMVFC_MAD_FORMAT : entry->op_code =be32_to_cpu (mad->opcode);
@@ -263,7 +266,7 @@ static const char *ibmvfc_get_cmd_error(u16 status, u16 error)static int ibmvfc_get_err_result (struct ibmvfc_cmd *vfc_cmd) {int err; -struct ibmvfc_fcp_rsp *rsp = &vfc_cmd->rsp; +struct ibmvfc_fcp_rsp *rsp = &vfc_cmd->v1.rsp;int fc_rsp_len =be32_to_cpu (rsp->fcp_rsp_len); if ((rsp->flags & FCP_RSP_LEN_VALID) &&
@@ -1378,6 +1381,7 @@ static int ibmvfc_map_sg_data(struct scsi_cmnd *scmd,int sg_mapped;struct srp_direct_buf *data = &vfc_cmd->ioba;struct ibmvfc_host *vhost =dev_get_drvdata (dev); +struct ibmvfc_fcp_cmd_iu *iu = &vfc_cmd->v1.iu;if (cls3_error) vfc_cmd->flags |=cpu_to_be16 (IBMVFC_CLASS_3_ERR );
@@ -1394,10 +1398,10 @@ static int ibmvfc_map_sg_data(struct scsi_cmnd *scmd,if (scmd->sc_data_direction ==DMA_TO_DEVICE ) { vfc_cmd->flags |=cpu_to_be16 (IBMVFC_WRITE ); - vfc_cmd->iu.add_cdb_len |=IBMVFC_WRDATA ; + iu->add_cdb_len |=IBMVFC_WRDATA ; }else { vfc_cmd->flags |=cpu_to_be16 (IBMVFC_READ ); - vfc_cmd->iu.add_cdb_len |=IBMVFC_RDDATA ; + iu->add_cdb_len |=IBMVFC_RDDATA ; }if (sg_mapped ==1 ) {
@@ -1516,7 +1520,7 @@ static void ibmvfc_log_error(struct ibmvfc_event *evt) {struct ibmvfc_cmd *vfc_cmd = &evt->xfer_iu->cmd;struct ibmvfc_host *vhost = evt->vhost; -struct ibmvfc_fcp_rsp *rsp = &vfc_cmd->rsp; +struct ibmvfc_fcp_rsp *rsp = &vfc_cmd->v1.rsp;struct scsi_cmnd *cmnd = evt->cmnd;const char *err = unknown_error;int index =ibmvfc_get_err_index (be16_to_cpu (vfc_cmd->status),be16_to_cpu (vfc_cmd->error));
@@ -1570,7 +1574,7 @@ static void ibmvfc_relogin(struct scsi_device *sdev)static void ibmvfc_scsi_done (struct ibmvfc_event *evt) {struct ibmvfc_cmd *vfc_cmd = &evt->xfer_iu->cmd; -struct ibmvfc_fcp_rsp *rsp = &vfc_cmd->rsp; +struct ibmvfc_fcp_rsp *rsp = &vfc_cmd->v1.rsp;struct scsi_cmnd *cmnd = evt->cmnd;u32 rsp_len =0 ;u32 sense_len =be32_to_cpu (rsp->fcp_sense_len);
@@ -1652,14 +1656,14 @@ static struct ibmvfc_cmd *ibmvfc_init_vfc_cmd(struct ibmvfc_event *evt, struct sstruct ibmvfc_cmd *vfc_cmd = &evt->iu.cmd;memset (vfc_cmd,0 ,sizeof (*vfc_cmd)); - vfc_cmd->resp.va =cpu_to_be64 (be64_to_cpu (evt->crq.ioba) + offsetof(struct ibmvfc_cmd , rsp)); - vfc_cmd->resp.len =cpu_to_be32 (sizeof (vfc_cmd->rsp)); + vfc_cmd->resp.va = cpu_to_be64(be64_to_cpu(evt->crq.ioba) + offsetof(struct ibmvfc_cmd, v1.rsp)); + vfc_cmd->resp.len =cpu_to_be32 (sizeof (vfc_cmd->v1.rsp)); vfc_cmd->frame_type =cpu_to_be32 (IBMVFC_SCSI_FCP_TYPE ); - vfc_cmd->payload_len =cpu_to_be32 (sizeof (vfc_cmd->iu)); - vfc_cmd->resp_len =cpu_to_be32 (sizeof (vfc_cmd->rsp)); + vfc_cmd->payload_len =cpu_to_be32 (sizeof (vfc_cmd->v1.iu)); + vfc_cmd->resp_len =cpu_to_be32 (sizeof (vfc_cmd->v1.rsp)); vfc_cmd->cancel_key =cpu_to_be32 ((unsigned long )sdev->hostdata); vfc_cmd->tgt_scsi_id =cpu_to_be64 (rport->port_id); -int_to_scsilun (sdev->lun, &vfc_cmd->iu.lun); +int_to_scsilun (sdev->lun, &vfc_cmd->v1.iu.lun);return vfc_cmd; }
@@ -1696,12 +1700,12 @@ static int ibmvfc_queuecommand_lck(struct scsi_cmnd *cmnd, vfc_cmd =ibmvfc_init_vfc_cmd (evt, cmnd->device); - vfc_cmd->iu.xfer_len =cpu_to_be32 (scsi_bufflen (cmnd)); -memcpy (vfc_cmd->iu.cdb, cmnd->cmnd, cmnd->cmd_len); + vfc_cmd->v1.iu.xfer_len =cpu_to_be32 (scsi_bufflen (cmnd)); +memcpy (vfc_cmd->v1.iu.cdb, cmnd->cmnd, cmnd->cmd_len);if (cmnd->flags &SCMD_TAGGED ) { vfc_cmd->task_tag =cpu_to_be64 (cmnd->tag); - vfc_cmd->iu.pri_task_attr =IBMVFC_SIMPLE_TASK ; + vfc_cmd->v1.iu.pri_task_attr =IBMVFC_SIMPLE_TASK ; }if (likely (!(rc =ibmvfc_map_sg_data (cmnd, evt, vfc_cmd, vhost->dev))))
@@ -2026,7 +2030,7 @@ static int ibmvfc_reset_device(struct scsi_device *sdev, int type, char *desc)struct ibmvfc_cmd *tmf;struct ibmvfc_event *evt =NULL ;union ibmvfc_iu rsp_iu; -struct ibmvfc_fcp_rsp *fc_rsp = &rsp_iu.cmd.rsp; +struct ibmvfc_fcp_rsp *fc_rsp = &rsp_iu.cmd.v1.rsp;int rsp_rc = -EBUSY ;unsigned long flags;int rsp_code =0 ;
@@ -2038,7 +2042,7 @@ static int ibmvfc_reset_device(struct scsi_device *sdev, int type, char *desc) tmf =ibmvfc_init_vfc_cmd (evt, sdev); tmf->flags =cpu_to_be16 ((IBMVFC_NO_MEM_DESC |IBMVFC_TMF )); - tmf->iu.tmf_flags = type; + tmf->v1.iu.tmf_flags = type; evt->sync_iu = &rsp_iu;init_completion (&evt->comp);
@@ -2331,7 +2335,7 @@ static int ibmvfc_abort_task_set(struct scsi_device *sdev)struct ibmvfc_cmd *tmf;struct ibmvfc_event *evt, *found_evt;union ibmvfc_iu rsp_iu; -struct ibmvfc_fcp_rsp *fc_rsp = &rsp_iu.cmd.rsp; +struct ibmvfc_fcp_rsp *fc_rsp = &rsp_iu.cmd.v1.rsp;int rc, rsp_rc = -EBUSY ;unsigned long flags, timeout =IBMVFC_ABORT_TIMEOUT ;int rsp_code =0 ;
@@ -2358,7 +2362,7 @@ static int ibmvfc_abort_task_set(struct scsi_device *sdev) tmf =ibmvfc_init_vfc_cmd (evt, sdev); tmf->flags =cpu_to_be16 ((IBMVFC_NO_MEM_DESC |IBMVFC_TMF )); - tmf->iu.tmf_flags =IBMVFC_ABORT_TASK_SET ; + tmf->v1.iu.tmf_flags =IBMVFC_ABORT_TASK_SET ; evt->sync_iu = &rsp_iu;init_completion (&evt->comp);
drivers/scsi/ibmvscsi/ibmvfc.h +24 -4
@@ -54,6 +54,7 @@#define IBMVFC_MAD_SUCCESS 0x00#define IBMVFC_MAD_NOT_SUPPORTED 0xF1 +#define IBMVFC_MAD_VERSION_NOT_SUPP 0xF2#define IBMVFC_MAD_FAILED 0xF7#define IBMVFC_MAD_DRIVER_FAILED 0xEE#define IBMVFC_MAD_CRQ_ERROR 0xEF
@@ -168,6 +169,8 @@ struct ibmvfc_npiv_login {#define IBMVFC_CAN_MIGRATE 0x01#define IBMVFC_CAN_USE_CHANNELS 0x02#define IBMVFC_CAN_HANDLE_FPIN 0x04 +#define IBMVFC_CAN_USE_MAD_VERSION 0x08 +#define IBMVFC_CAN_SEND_VF_WWPN 0x10__be64 node_name;struct srp_direct_buf async;u8 partition_name[IBMVFC_MAX_NAME ];
@@ -211,7 +214,9 @@ struct ibmvfc_npiv_login_resp {__be64 capabilities;#define IBMVFC_CAN_FLUSH_ON_HALT 0x08#define IBMVFC_CAN_SUPPRESS_ABTS 0x10 -#define IBMVFC_CAN_SUPPORT_CHANNELS 0x20 +#define IBMVFC_MAD_VERSION_CAP 0x20 +#define IBMVFC_HANDLE_VF_WWPN 0x40 +#define IBMVFC_CAN_SUPPORT_CHANNELS 0x80__be32 max_cmds;__be32 scsi_id_sz;__be64 max_dma_len;
@@ -293,6 +298,7 @@ struct ibmvfc_port_login {__be32 reserved2;struct ibmvfc_service_parms service_parms;struct ibmvfc_service_parms service_parms_change; +__be64 targetWWPN;__be64 reserved3[2 ]; } __packed__aligned(8) ;
@@ -344,6 +350,7 @@ struct ibmvfc_process_login {__be16 status;__be16 error;/* also fc_reason */ __be32 reserved2; +__be64 targetWWPN;__be64 reserved3[2 ]; } __packed__aligned(8) ;
@@ -378,6 +385,8 @@ struct ibmvfc_tmf {__be32 cancel_key;__be32 my_cancel_key;__be32 pad; +__be64 targetWWPN; +__be64 taskTag;__be64 reserved[2 ]; } __packed__aligned(8) ;
@@ -474,9 +483,19 @@ struct ibmvfc_cmd {__be64 correlation;__be64 tgt_scsi_id;__be64 tag; -__be64 reserved3[2 ]; -struct ibmvfc_fcp_cmd_iu iu; -struct ibmvfc_fcp_rsp rsp; +__be64 targetWWPN; +__be64 reserved3; +union { +struct { +struct ibmvfc_fcp_cmd_iu iu; +struct ibmvfc_fcp_rsp rsp; + } v1; +struct { +__be64 reserved4; +struct ibmvfc_fcp_cmd_iu iu; +struct ibmvfc_fcp_rsp rsp; + } v2; + }; } __packed__aligned(8) ;struct ibmvfc_passthru_fc_iu {
@@ -503,6 +522,7 @@ struct ibmvfc_passthru_iu {__be64 correlation;__be64 scsi_id;__be64 tag; +__be64 targetWWPN;__be64 reserved2[2 ]; } __packed__aligned(8) ;
Signature · 1 line
2.27.0
Re: [PATCH 3/6] ibmvfc: add new fields for version 2 of several MADs
Quoted 12 lines · Tyrel Datwyler
drivers/scsi/ibmvscsi/ibmvfc.h +3
-1@@ -211,7 +214,9 @@ struct ibmvfc_npiv_login_resp {__be64 capabilities;#define IBMVFC_CAN_FLUSH_ON_HALT 0x08#define IBMVFC_CAN_SUPPRESS_ABTS 0x10 -#define IBMVFC_CAN_SUPPORT_CHANNELS 0x20 +#define IBMVFC_MAD_VERSION_CAP 0x20 +#define IBMVFC_HANDLE_VF_WWPN 0x40 +#define IBMVFC_CAN_SUPPORT_CHANNELS 0x80__be32 max_cmds;__be32 scsi_id_sz;__be64 max_dma_len;
drivers/scsi/ibmvscsi/ibmvfc.h struct ibmvfc_port_login { · line 301
Quoted 4 lines
drivers/scsi/ibmvscsi/ibmvfc.h +1
-0@@ -293,6 +298,7 @@ struct ibmvfc_port_login {__be32 reserved2;struct ibmvfc_service_parms service_parms;struct ibmvfc_service_parms service_parms_change; +__be64 targetWWPN;
For consistency, can you make this target_wwpn?
drivers/scsi/ibmvscsi/ibmvfc.h struct ibmvfc_process_login { · line 353
Quoted 8 lines
drivers/scsi/ibmvscsi/ibmvfc.h +1
-0__be64 reserved3[2 ]; } __packed__aligned(8) ;@@ -344,6 +350,7 @@ struct ibmvfc_process_login {__be16 status;__be16 error;/* also fc_reason */ __be32 reserved2; +__be64 targetWWPN;
For consistency, can you make this target_wwpn?
drivers/scsi/ibmvscsi/ibmvfc.h struct ibmvfc_tmf { · line 388
Quoted 8 lines
drivers/scsi/ibmvscsi/ibmvfc.h +1
-0__be64 reserved3[2 ]; } __packed__aligned(8) ;@@ -378,6 +385,8 @@ struct ibmvfc_tmf {__be32 cancel_key;__be32 my_cancel_key;__be32 pad; +__be64 targetWWPN;
For consistency, can you make this target_wwpn?
drivers/scsi/ibmvscsi/ibmvfc.h struct ibmvfc_tmf { · line 389
Quoted 1 line
drivers/scsi/ibmvscsi/ibmvfc.h +1
-0+__be64 taskTag;
and make this task_tag.
drivers/scsi/ibmvscsi/ibmvfc.h struct ibmvfc_cmd { · line 486
Quoted 11 lines
drivers/scsi/ibmvscsi/ibmvfc.h +1
-3__be64 reserved[2 ]; } __packed__aligned(8) ;@@ -474,9 +483,19 @@ struct ibmvfc_cmd {__be64 correlation;__be64 tgt_scsi_id;__be64 tag; -__be64 reserved3[2 ]; -struct ibmvfc_fcp_cmd_iu iu; -struct ibmvfc_fcp_rsp rsp; +__be64 targetWWPN;
For consistency, can you make this target_wwpn?
Quoted 16 lines
drivers/scsi/ibmvscsi/ibmvfc.h +12
-0+__be64 reserved3; +union { +struct { +struct ibmvfc_fcp_cmd_iu iu; +struct ibmvfc_fcp_rsp rsp; + } v1; +struct { +__be64 reserved4; +struct ibmvfc_fcp_cmd_iu iu; +struct ibmvfc_fcp_rsp rsp; + } v2; + }; } __packed__aligned(8) ;struct ibmvfc_passthru_fc_iu {
drivers/scsi/ibmvscsi/ibmvfc.h struct ibmvfc_passthru_iu { · line 525
Quoted 4 lines
drivers/scsi/ibmvscsi/ibmvfc.h +1
-0@@ -503,6 +522,7 @@ struct ibmvfc_passthru_iu {__be64 correlation;__be64 scsi_id;__be64 tag; +__be64 targetWWPN;
For consistency, can you make this target_wwpn?
Quoted 4 lines
drivers/scsi/ibmvscsi/ibmvfc.h +0
-0__be64 reserved2[2 ]; } __packed__aligned(8) ;
Signature · 3 lines
Brian King Power Linux I/O IBM Linux Technology Center
Tyrel Datwyler
maintainerRe: [PATCH 3/6] ibmvfc: add new fields for version 2 of several MADs
Quoted 11 lines · Brian King
Quoted 10 lines · Tyrel Datwyler
drivers/scsi/ibmvscsi/ibmvfc.h +3
-1@@ -211,7 +214,9 @@ struct ibmvfc_npiv_login_resp {__be64 capabilities;#define IBMVFC_CAN_FLUSH_ON_HALT 0x08#define IBMVFC_CAN_SUPPRESS_ABTS 0x10 -#define IBMVFC_CAN_SUPPORT_CHANNELS 0x20 +#define IBMVFC_MAD_VERSION_CAP 0x20 +#define IBMVFC_HANDLE_VF_WWPN 0x40 +#define IBMVFC_CAN_SUPPORT_CHANNELS 0x80__be32 max_cmds;__be32 scsi_id_sz;
Quoted 8 lines
drivers/scsi/ibmvscsi/ibmvfc.h struct ibmvfc_port_login { · line 301
Quoted 6 lines
drivers/scsi/ibmvscsi/ibmvfc.h +1
-0__be64 max_dma_len;@@ -293,6 +298,7 @@ struct ibmvfc_port_login {__be32 reserved2;struct ibmvfc_service_parms service_parms;struct ibmvfc_service_parms service_parms_change; +__be64 targetWWPN;For consistency, can you make this
target_wwpn?
Sure thing.
Quoted 23 lines
drivers/scsi/ibmvscsi/ibmvfc.h struct ibmvfc_process_login { · line 353
Quoted 9 lines
drivers/scsi/ibmvscsi/ibmvfc.h +1
-0__be64 reserved3[2 ]; } __packed__aligned(8) ;@@ -344,6 +350,7 @@ struct ibmvfc_process_login {__be16 status;__be16 error;/* also fc_reason */ __be32 reserved2; +__be64 targetWWPN;For consistency, can you make this
target_wwpn?drivers/scsi/ibmvscsi/ibmvfc.h struct ibmvfc_tmf { · line 388
Quoted 8 lines
drivers/scsi/ibmvscsi/ibmvfc.h +1
-0__be64 reserved3[2 ]; } __packed__aligned(8) ;@@ -378,6 +385,8 @@ struct ibmvfc_tmf {__be32 cancel_key;__be32 my_cancel_key;__be32 pad; +__be64 targetWWPN;For consistency, can you make this
target_wwpn?
Quoted 3 lines
drivers/scsi/ibmvscsi/ibmvfc.h struct ibmvfc_tmf { · line 389
Quoted 1 line
drivers/scsi/ibmvscsi/ibmvfc.h +1
-0+__be64 taskTag;and make this
task_tag.
Will do.
-Tyrel
Quoted 44 lines
drivers/scsi/ibmvscsi/ibmvfc.h struct ibmvfc_cmd { · line 486
Quoted 12 lines
drivers/scsi/ibmvscsi/ibmvfc.h +1
-3__be64 reserved[2 ]; } __packed__aligned(8) ;@@ -474,9 +483,19 @@ struct ibmvfc_cmd {__be64 correlation;__be64 tgt_scsi_id;__be64 tag; -__be64 reserved3[2 ]; -struct ibmvfc_fcp_cmd_iu iu; -struct ibmvfc_fcp_rsp rsp; +__be64 targetWWPN;For consistency, can you make this
target_wwpn?Quoted 16 lines
drivers/scsi/ibmvscsi/ibmvfc.h +12
-0+__be64 reserved3; +union { +struct { +struct ibmvfc_fcp_cmd_iu iu; +struct ibmvfc_fcp_rsp rsp; + } v1; +struct { +__be64 reserved4; +struct ibmvfc_fcp_cmd_iu iu; +struct ibmvfc_fcp_rsp rsp; + } v2; + }; } __packed__aligned(8) ;struct ibmvfc_passthru_fc_iu {drivers/scsi/ibmvscsi/ibmvfc.h struct ibmvfc_passthru_iu { · line 525
Quoted 4 lines
drivers/scsi/ibmvscsi/ibmvfc.h +1
-0@@ -503,6 +522,7 @@ struct ibmvfc_passthru_iu {__be64 correlation;__be64 scsi_id;__be64 tag; +__be64 targetWWPN;For consistency, can you make this
target_wwpn?Quoted 4 lines
drivers/scsi/ibmvscsi/ibmvfc.h +0
-0__be64 reserved2[2 ]; } __packed__aligned(8) ;
Tyrel Datwyler
maintainerPATCH 4/6 ibmvfc: add FC payload retrieval routines for versioned vfcFrames
In reply to Tyrel DatwylerThe FC iu and response payloads are located at different offsets depending on the ibmvfc_cmd version. This is a result of the version 2 vfcFrame definition adding an extra 64bytes of reserved space to the structure prior to the payloads.
Add helper routines to determine the current vfcFrame version and returning pointers to the proper iu or response structures within that ibmvfc_cmd.
--- drivers/scsi/ibmvscsi/ibmvfc.c | 76 ++++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 23 deletions(-)
drivers/scsi/ibmvscsi/ibmvfc.c +53 -23
@@ -138,6 +138,22 @@ static void ibmvfc_tgt_move_login(struct ibmvfc_target *);static const char *unknown_error ="unknown error" ; +static struct ibmvfc_fcp_cmd_iu *ibmvfc_get_fcp_iu (struct ibmvfc_host *vhost,struct ibmvfc_cmd *vfc_cmd) +{ +if (be64_to_cpu (vhost->login_buf->resp.capabilities) &IBMVFC_HANDLE_VF_WWPN ) +return &vfc_cmd->v2.iu; +else +return &vfc_cmd->v1.iu; +} + +static struct ibmvfc_fcp_rsp *ibmvfc_get_fcp_rsp (struct ibmvfc_host *vhost,struct ibmvfc_cmd *vfc_cmd) +{ +if (be64_to_cpu (vhost->login_buf->resp.capabilities) &IBMVFC_HANDLE_VF_WWPN ) +return &vfc_cmd->v2.rsp; +else +return &vfc_cmd->v1.rsp; +} +#ifdef CONFIG_SCSI_IBMVFC_TRACE /** * ibmvfc_trc_start - Log a start trace entry
@@ -149,7 +165,7 @@ static void ibmvfc_trc_start(struct ibmvfc_event *evt)struct ibmvfc_host *vhost = evt->vhost;struct ibmvfc_cmd *vfc_cmd = &evt->iu.cmd;struct ibmvfc_mad_common *mad = &evt->iu.mad_common; -struct ibmvfc_fcp_cmd_iu *iu = &vfc_cmd->v1.iu; +struct ibmvfc_fcp_cmd_iu *iu =ibmvfc_get_fcp_iu (vhost, vfc_cmd);struct ibmvfc_trace_entry *entry; entry = &vhost->trace[vhost->trace_index++];
@@ -184,8 +200,8 @@ static void ibmvfc_trc_end(struct ibmvfc_event *evt)struct ibmvfc_host *vhost = evt->vhost;struct ibmvfc_cmd *vfc_cmd = &evt->xfer_iu->cmd;struct ibmvfc_mad_common *mad = &evt->xfer_iu->mad_common; -struct ibmvfc_fcp_cmd_iu *iu = &vfc_cmd->v1.iu; -struct ibmvfc_fcp_rsp *rsp = &vfc_cmd->v1.rsp; +struct ibmvfc_fcp_cmd_iu *iu =ibmvfc_get_fcp_iu (vhost, vfc_cmd); +struct ibmvfc_fcp_rsp *rsp =ibmvfc_get_fcp_rsp (vhost, vfc_cmd);struct ibmvfc_trace_entry *entry = &vhost->trace[vhost->trace_index++]; entry->evt = evt;
@@ -263,10 +279,10 @@ static const char *ibmvfc_get_cmd_error(u16 status, u16 error)* Return value: * SCSI result value to return for completed command **/ -static int ibmvfc_get_err_result (struct ibmvfc_cmd *vfc_cmd) +static int ibmvfc_get_err_result (struct ibmvfc_host *vhost,struct ibmvfc_cmd *vfc_cmd) {int err; -struct ibmvfc_fcp_rsp *rsp = &vfc_cmd->v1.rsp; +struct ibmvfc_fcp_rsp *rsp =ibmvfc_get_fcp_rsp (vhost, vfc_cmd);int fc_rsp_len =be32_to_cpu (rsp->fcp_rsp_len); if ((rsp->flags & FCP_RSP_LEN_VALID) &&
@@ -1381,7 +1397,7 @@ static int ibmvfc_map_sg_data(struct scsi_cmnd *scmd,int sg_mapped;struct srp_direct_buf *data = &vfc_cmd->ioba;struct ibmvfc_host *vhost =dev_get_drvdata (dev); -struct ibmvfc_fcp_cmd_iu *iu = &vfc_cmd->v1.iu; +struct ibmvfc_fcp_cmd_iu *iu =ibmvfc_get_fcp_iu (evt->vhost, vfc_cmd);if (cls3_error) vfc_cmd->flags |=cpu_to_be16 (IBMVFC_CLASS_3_ERR );
@@ -1520,7 +1536,7 @@ static void ibmvfc_log_error(struct ibmvfc_event *evt) {struct ibmvfc_cmd *vfc_cmd = &evt->xfer_iu->cmd;struct ibmvfc_host *vhost = evt->vhost; -struct ibmvfc_fcp_rsp *rsp = &vfc_cmd->v1.rsp; +struct ibmvfc_fcp_rsp *rsp =ibmvfc_get_fcp_rsp (vhost, vfc_cmd);struct scsi_cmnd *cmnd = evt->cmnd;const char *err = unknown_error;int index =ibmvfc_get_err_index (be16_to_cpu (vfc_cmd->status),be16_to_cpu (vfc_cmd->error));
@@ -1574,7 +1590,7 @@ static void ibmvfc_relogin(struct scsi_device *sdev)static void ibmvfc_scsi_done (struct ibmvfc_event *evt) {struct ibmvfc_cmd *vfc_cmd = &evt->xfer_iu->cmd; -struct ibmvfc_fcp_rsp *rsp = &vfc_cmd->v1.rsp; +struct ibmvfc_fcp_rsp *rsp =ibmvfc_get_fcp_rsp (evt->vhost, vfc_cmd);struct scsi_cmnd *cmnd = evt->cmnd;u32 rsp_len =0 ;u32 sense_len =be32_to_cpu (rsp->fcp_sense_len);
@@ -1588,7 +1604,7 @@ static void ibmvfc_scsi_done(struct ibmvfc_event *evt)scsi_set_resid (cmnd,0 );if (vfc_cmd->status) { - cmnd->result =ibmvfc_get_err_result (vfc_cmd); + cmnd->result =ibmvfc_get_err_result (evt->vhost, vfc_cmd);if (rsp->flags &FCP_RSP_LEN_VALID ) rsp_len =be32_to_cpu (rsp->fcp_rsp_len);
@@ -1653,17 +1669,25 @@ static inline int ibmvfc_host_chkready(struct ibmvfc_host *vhost)static struct ibmvfc_cmd *ibmvfc_init_vfc_cmd (struct ibmvfc_event *evt,struct scsi_device *sdev) {struct fc_rport *rport =starget_to_rport (scsi_target (sdev)); +struct ibmvfc_host *vhost = evt->vhost;struct ibmvfc_cmd *vfc_cmd = &evt->iu.cmd; +struct ibmvfc_fcp_cmd_iu *iu =ibmvfc_get_fcp_iu (vhost, vfc_cmd); +struct ibmvfc_fcp_rsp *rsp =ibmvfc_get_fcp_rsp (vhost, vfc_cmd); +size_t offset;memset (vfc_cmd,0 ,sizeof (*vfc_cmd)); - vfc_cmd->resp.va = cpu_to_be64(be64_to_cpu(evt->crq.ioba) + offsetof(struct ibmvfc_cmd, v1.rsp)); - vfc_cmd->resp.len =cpu_to_be32 (sizeof (vfc_cmd->v1.rsp)); +if (be64_to_cpu (vhost->login_buf->resp.capabilities) &IBMVFC_HANDLE_VF_WWPN ) + offset = offsetof(struct ibmvfc_cmd, v2.rsp); +else + offset = offsetof(struct ibmvfc_cmd, v1.rsp); + vfc_cmd->resp.va =cpu_to_be64 (be64_to_cpu (evt->crq.ioba) + offset); + vfc_cmd->resp.len =cpu_to_be32 (sizeof (*rsp)); vfc_cmd->frame_type =cpu_to_be32 (IBMVFC_SCSI_FCP_TYPE ); - vfc_cmd->payload_len =cpu_to_be32 (sizeof (vfc_cmd->v1.iu)); - vfc_cmd->resp_len =cpu_to_be32 (sizeof (vfc_cmd->v1.rsp)); + vfc_cmd->payload_len =cpu_to_be32 (sizeof (*iu)); + vfc_cmd->resp_len =cpu_to_be32 (sizeof (*rsp)); vfc_cmd->cancel_key =cpu_to_be32 ((unsigned long )sdev->hostdata); vfc_cmd->tgt_scsi_id =cpu_to_be64 (rport->port_id); -int_to_scsilun (sdev->lun, &vfc_cmd->v1.iu.lun); +int_to_scsilun (sdev->lun, &iu->lun);return vfc_cmd; }
@@ -1682,6 +1706,7 @@ static int ibmvfc_queuecommand_lck(struct scsi_cmnd *cmnd,struct ibmvfc_host *vhost =shost_priv (cmnd->device->host);struct fc_rport *rport =starget_to_rport (scsi_target (cmnd->device));struct ibmvfc_cmd *vfc_cmd; +struct ibmvfc_fcp_cmd_iu *iu;struct ibmvfc_event *evt;int rc;
@@ -1699,13 +1724,14 @@ static int ibmvfc_queuecommand_lck(struct scsi_cmnd *cmnd, cmnd->scsi_done = done; vfc_cmd =ibmvfc_init_vfc_cmd (evt, cmnd->device); + iu =ibmvfc_get_fcp_iu (vhost, vfc_cmd); - vfc_cmd->v1.iu.xfer_len =cpu_to_be32 (scsi_bufflen (cmnd)); -memcpy (vfc_cmd->v1.iu.cdb, cmnd->cmnd, cmnd->cmd_len); + iu->xfer_len =cpu_to_be32 (scsi_bufflen (cmnd)); +memcpy (iu->cdb, cmnd->cmnd, cmnd->cmd_len);if (cmnd->flags &SCMD_TAGGED ) { vfc_cmd->task_tag =cpu_to_be64 (cmnd->tag); - vfc_cmd->v1.iu.pri_task_attr =IBMVFC_SIMPLE_TASK ; + iu->pri_task_attr =IBMVFC_SIMPLE_TASK ; }if (likely (!(rc =ibmvfc_map_sg_data (cmnd, evt, vfc_cmd, vhost->dev))))
@@ -2030,7 +2056,8 @@ static int ibmvfc_reset_device(struct scsi_device *sdev, int type, char *desc)struct ibmvfc_cmd *tmf;struct ibmvfc_event *evt =NULL ;union ibmvfc_iu rsp_iu; -struct ibmvfc_fcp_rsp *fc_rsp = &rsp_iu.cmd.v1.rsp; +struct ibmvfc_fcp_cmd_iu *iu; +struct ibmvfc_fcp_rsp *fc_rsp =ibmvfc_get_fcp_rsp (vhost, &rsp_iu.cmd);int rsp_rc = -EBUSY ;unsigned long flags;int rsp_code =0 ;
@@ -2040,9 +2067,10 @@ static int ibmvfc_reset_device(struct scsi_device *sdev, int type, char *desc) evt =ibmvfc_get_event (vhost);ibmvfc_init_event (evt, ibmvfc_sync_completion,IBMVFC_CMD_FORMAT ); tmf =ibmvfc_init_vfc_cmd (evt, sdev); + iu =ibmvfc_get_fcp_iu (vhost, tmf); tmf->flags =cpu_to_be16 ((IBMVFC_NO_MEM_DESC |IBMVFC_TMF )); - tmf->v1.iu.tmf_flags = type; + iu->tmf_flags = type; evt->sync_iu = &rsp_iu;init_completion (&evt->comp);
@@ -2060,7 +2088,7 @@ static int ibmvfc_reset_device(struct scsi_device *sdev, int type, char *desc)wait_for_completion (&evt->comp);if (rsp_iu.cmd.status) - rsp_code =ibmvfc_get_err_result (&rsp_iu.cmd); + rsp_code =ibmvfc_get_err_result (vhost, &rsp_iu.cmd);if (rsp_code) {if (fc_rsp->flags &FCP_RSP_LEN_VALID )
@@ -2335,7 +2363,8 @@ static int ibmvfc_abort_task_set(struct scsi_device *sdev)struct ibmvfc_cmd *tmf;struct ibmvfc_event *evt, *found_evt;union ibmvfc_iu rsp_iu; -struct ibmvfc_fcp_rsp *fc_rsp = &rsp_iu.cmd.v1.rsp; +struct ibmvfc_fcp_cmd_iu *iu; +struct ibmvfc_fcp_rsp *fc_rsp =ibmvfc_get_fcp_rsp (vhost, &rsp_iu.cmd);int rc, rsp_rc = -EBUSY ;unsigned long flags, timeout =IBMVFC_ABORT_TIMEOUT ;int rsp_code =0 ;
@@ -2360,9 +2389,10 @@ static int ibmvfc_abort_task_set(struct scsi_device *sdev) evt =ibmvfc_get_event (vhost);ibmvfc_init_event (evt, ibmvfc_sync_completion,IBMVFC_CMD_FORMAT ); tmf =ibmvfc_init_vfc_cmd (evt, sdev); + iu =ibmvfc_get_fcp_iu (vhost, tmf); + iu->tmf_flags =IBMVFC_ABORT_TASK_SET ; tmf->flags =cpu_to_be16 ((IBMVFC_NO_MEM_DESC |IBMVFC_TMF )); - tmf->v1.iu.tmf_flags =IBMVFC_ABORT_TASK_SET ; evt->sync_iu = &rsp_iu;init_completion (&evt->comp);
@@ -2409,7 +2439,7 @@ static int ibmvfc_abort_task_set(struct scsi_device *sdev) }if (rsp_iu.cmd.status) - rsp_code =ibmvfc_get_err_result (&rsp_iu.cmd); + rsp_code =ibmvfc_get_err_result (vhost, &rsp_iu.cmd);if (rsp_code) {if (fc_rsp->flags &FCP_RSP_LEN_VALID )
Signature · 1 line
2.27.0
Re: [PATCH 4/6] ibmvfc: add FC payload retrieval routines for versioned vfcFrames
Quoted 19 lines · Tyrel Datwyler
The FC iu and response payloads are located at different offsets depending on the
ibmvfc_cmdversion. This is a result of the version 2 vfcFrame definition adding an extra 64bytes of reserved space to the structure prior to the payloads.Add helper routines to determine the current vfcFrame version and returning pointers to the proper iu or response structures within that
ibmvfc_cmd.Signed-off-by Tyrel Datwyler <[email protected]>--- drivers/scsi/ibmvscsi/ibmvfc.c | 76 ++++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 23 deletions(-)drivers/scsi/ibmvscsi/ibmvfc.c +0
-0
drivers/scsi/ibmvscsi/ibmvfc.c static void ibmvfc_tgt_move_login(struct ibmvfc_target *); · line 143
Quoted 6 lines
drivers/scsi/ibmvscsi/ibmvfc.c +3
-0@@ -138,6 +138,22 @@ static void ibmvfc_tgt_move_login(struct ibmvfc_target *);static const char *unknown_error ="unknown error" ; +static struct ibmvfc_fcp_cmd_iu *ibmvfc_get_fcp_iu (struct ibmvfc_host *vhost,struct ibmvfc_cmd *vfc_cmd) +{ +if (be64_to_cpu (vhost->login_buf->resp.capabilities) &IBMVFC_HANDLE_VF_WWPN )
Suggest adding a flag to the vhost structure that you setup after login in order to simplify this check and avoid chasing multiple pointers along with a byte swap.
Maybe something like:
vhost->is_v2
drivers/scsi/ibmvscsi/ibmvfc.c static void ibmvfc_tgt_move_login(struct ibmvfc_target *); · line 151
Quoted 8 lines
drivers/scsi/ibmvscsi/ibmvfc.c +8
-0+return &vfc_cmd->v2.iu; + else + return &vfc_cmd->v1.iu; +} + +static struct ibmvfc_fcp_rsp *ibmvfc_get_fcp_rsp (struct ibmvfc_host *vhost,struct ibmvfc_cmd *vfc_cmd) +{ +if (be64_to_cpu (vhost->login_buf->resp.capabilities) &IBMVFC_HANDLE_VF_WWPN )
Same here
Quoted 8 lines
drivers/scsi/ibmvscsi/ibmvfc.c +5
-0+return &vfc_cmd->v2.rsp; + else + return &vfc_cmd->v1.rsp; +} +#ifdef CONFIG_SCSI_IBMVFC_TRACE /** * ibmvfc_trc_start - Log a start trace entry
Signature · 3 lines
Brian King Power Linux I/O IBM Linux Technology Center
Re: [PATCH 4/6] ibmvfc: add FC payload retrieval routines for versioned vfcFrames
Quoted 30 lines · Brian King
Quoted 19 lines · Tyrel Datwyler
The FC iu and response payloads are located at different offsets depending on the
ibmvfc_cmdversion. This is a result of the version 2 vfcFrame definition adding an extra 64bytes of reserved space to the structure prior to the payloads.Add helper routines to determine the current vfcFrame version and returning pointers to the proper iu or response structures within that
ibmvfc_cmd.Signed-off-by Tyrel Datwyler <[email protected]>--- drivers/scsi/ibmvscsi/ibmvfc.c | 76 ++++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 23 deletions(-)drivers/scsi/ibmvscsi/ibmvfc.c +0
-0drivers/scsi/ibmvscsi/ibmvfc.c static void ibmvfc_tgt_move_login(struct ibmvfc_target *); · line 143
Quoted 6 lines
drivers/scsi/ibmvscsi/ibmvfc.c +3
-0@@ -138,6 +138,22 @@ static void ibmvfc_tgt_move_login(struct ibmvfc_target *);static const char *unknown_error ="unknown error" ; +static struct ibmvfc_fcp_cmd_iu *ibmvfc_get_fcp_iu (struct ibmvfc_host *vhost,struct ibmvfc_cmd *vfc_cmd) +{ +if (be64_to_cpu (vhost->login_buf->resp.capabilities) &IBMVFC_HANDLE_VF_WWPN )Suggest adding a flag to the vhost structure that you setup after login in order to simplify this check and avoid chasing multiple pointers along with a byte swap.
Quoted 3 lines
Maybe something like:
vhost->is_v2
Even better might be vhost->version which you'd set to 1 or 2 and then you could directly use that to set the field in the command structures later.
Signature · 3 lines
Brian King Power Linux I/O IBM Linux Technology Center
Tyrel Datwyler
maintainerRe: [PATCH 4/6] ibmvfc: add FC payload retrieval routines for versioned vfcFrames
Quoted 31 lines · Brian King
Quoted 30 lines · Brian King
Quoted 19 lines · Tyrel Datwyler
The FC iu and response payloads are located at different offsets depending on the
ibmvfc_cmdversion. This is a result of the version 2 vfcFrame definition adding an extra 64bytes of reserved space to the structure prior to the payloads.Add helper routines to determine the current vfcFrame version and returning pointers to the proper iu or response structures within that
ibmvfc_cmd.Signed-off-by Tyrel Datwyler <[email protected]>--- drivers/scsi/ibmvscsi/ibmvfc.c | 76 ++++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 23 deletions(-)drivers/scsi/ibmvscsi/ibmvfc.c +0
-0drivers/scsi/ibmvscsi/ibmvfc.c static void ibmvfc_tgt_move_login(struct ibmvfc_target *); · line 143
Quoted 6 lines
drivers/scsi/ibmvscsi/ibmvfc.c +3
-0@@ -138,6 +138,22 @@ static void ibmvfc_tgt_move_login(struct ibmvfc_target *);static const char *unknown_error ="unknown error" ; +static struct ibmvfc_fcp_cmd_iu *ibmvfc_get_fcp_iu (struct ibmvfc_host *vhost,struct ibmvfc_cmd *vfc_cmd) +{ +if (be64_to_cpu (vhost->login_buf->resp.capabilities) &IBMVFC_HANDLE_VF_WWPN )Suggest adding a flag to the vhost structure that you setup after login in order to simplify this check and avoid chasing multiple pointers along with a byte swap.
Quoted 6 lines
Quoted 3 lines
Maybe something like:
vhost->is_v2Even better might be
vhost->versionwhich you'd set to 1 or 2 and then you could directly use that to set the field in the command structures later.
So, the problem is that now a MADs version is determined by capability and not an over arching protocol version. So, we will still have some MAD's that are v1 while other are v2 with a certain capability. The solution could work in the short term since targetWWPN is the only feature that has v2 MADs, but I suspect more versioning down the pipeline which may lead to some MADs whose v2 form has nothing to do with targetWWPN support.
-Tyrel
Tyrel Datwyler
maintainerRe: [PATCH 4/6] ibmvfc: add FC payload retrieval routines for versioned vfcFrames
In reply to Brian KingQuoted 30 lines · Brian King
Quoted 19 lines · Tyrel Datwyler
The FC iu and response payloads are located at different offsets depending on the
ibmvfc_cmdversion. This is a result of the version 2 vfcFrame definition adding an extra 64bytes of reserved space to the structure prior to the payloads.Add helper routines to determine the current vfcFrame version and returning pointers to the proper iu or response structures within that
ibmvfc_cmd.Signed-off-by Tyrel Datwyler <[email protected]>--- drivers/scsi/ibmvscsi/ibmvfc.c | 76 ++++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 23 deletions(-)drivers/scsi/ibmvscsi/ibmvfc.c +0
-0drivers/scsi/ibmvscsi/ibmvfc.c static void ibmvfc_tgt_move_login(struct ibmvfc_target *); · line 143
Quoted 6 lines
drivers/scsi/ibmvscsi/ibmvfc.c +3
-0@@ -138,6 +138,22 @@ static void ibmvfc_tgt_move_login(struct ibmvfc_target *);static const char *unknown_error ="unknown error" ; +static struct ibmvfc_fcp_cmd_iu *ibmvfc_get_fcp_iu (struct ibmvfc_host *vhost,struct ibmvfc_cmd *vfc_cmd) +{ +if (be64_to_cpu (vhost->login_buf->resp.capabilities) &IBMVFC_HANDLE_VF_WWPN )Suggest adding a flag to the vhost structure that you setup after login in order to simplify this check and avoid chasing multiple pointers along with a byte swap.
Quoted 3 lines
Maybe something like:
vhost->is_v2
I considered that, but opted instead in my v2 respin to add a helper routine to test login response capabilities since we will also need to check for VIOS channel support.
-Tyrel
Quoted 23 lines
drivers/scsi/ibmvscsi/ibmvfc.c static void ibmvfc_tgt_move_login(struct ibmvfc_target *); · line 151
Quoted 9 lines
drivers/scsi/ibmvscsi/ibmvfc.c +8
-0+return &vfc_cmd->v2.iu; + else + return &vfc_cmd->v1.iu; +} + +static struct ibmvfc_fcp_rsp *ibmvfc_get_fcp_rsp (struct ibmvfc_host *vhost,struct ibmvfc_cmd *vfc_cmd) +{ +if (be64_to_cpu (vhost->login_buf->resp.capabilities) &IBMVFC_HANDLE_VF_WWPN )Same here
Quoted 8 lines
drivers/scsi/ibmvscsi/ibmvfc.c +5
-0+return &vfc_cmd->v2.rsp; + else + return &vfc_cmd->v1.rsp; +} +#ifdef CONFIG_SCSI_IBMVFC_TRACE /** * ibmvfc_trc_start - Log a start trace entry
Tyrel Datwyler
maintainerPATCH 5/6 ibmvfc: add support for targetWWPN field in v2 MADs and vfcFrame
In reply to Tyrel DatwylerSeveral version 2 MADs and the version 2 vfcFrame structures introduced a new targetWWPN field for better identification of the target then simply the scsi_id.
Set this field and MAD versioning fields when the VIOS advertises the IBMVFC_HANDLE_VF_WWPN capability.
--- drivers/scsi/ibmvscsi/ibmvfc.c | 39 ++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-)
drivers/scsi/ibmvscsi/ibmvfc.c +33 -6
@@ -1676,9 +1676,10 @@ static struct ibmvfc_cmd *ibmvfc_init_vfc_cmd(struct ibmvfc_event *evt, struct ssize_t offset;memset (vfc_cmd,0 ,sizeof (*vfc_cmd)); -if (be64_to_cpu (vhost->login_buf->resp.capabilities) &IBMVFC_HANDLE_VF_WWPN ) +if (be64_to_cpu (vhost->login_buf->resp.capabilities) &IBMVFC_HANDLE_VF_WWPN ) { offset = offsetof(struct ibmvfc_cmd, v2.rsp); -else + vfc_cmd->targetWWPN =cpu_to_be64 (rport->port_name); + }else offset = offsetof(struct ibmvfc_cmd, v1.rsp); vfc_cmd->resp.va =cpu_to_be64 (be64_to_cpu (evt->crq.ioba) + offset); vfc_cmd->resp.len =cpu_to_be32 (sizeof (*rsp));
@@ -2053,6 +2054,7 @@ static int ibmvfc_bsg_request(struct bsg_job *job)static int ibmvfc_reset_device (struct scsi_device *sdev,int type,char *desc) {struct ibmvfc_host *vhost =shost_priv (sdev->host); +struct fc_rport *rport =starget_to_rport (scsi_target (sdev));struct ibmvfc_cmd *tmf;struct ibmvfc_event *evt =NULL ;union ibmvfc_iu rsp_iu;
@@ -2070,6 +2072,8 @@ static int ibmvfc_reset_device(struct scsi_device *sdev, int type, char *desc) iu =ibmvfc_get_fcp_iu (vhost, tmf); tmf->flags =cpu_to_be16 ((IBMVFC_NO_MEM_DESC |IBMVFC_TMF )); +if (be64_to_cpu (vhost->login_buf->resp.capabilities) &IBMVFC_HANDLE_VF_WWPN ) + tmf->targetWWPN =cpu_to_be64 (rport->port_name); iu->tmf_flags = type; evt->sync_iu = &rsp_iu;
@@ -2260,7 +2264,12 @@ static int ibmvfc_cancel_all(struct scsi_device *sdev, int type) tmf = &evt->iu.tmf;memset (tmf,0 ,sizeof (*tmf)); - tmf->common.version =cpu_to_be32 (1 ); +if (be64_to_cpu (vhost->login_buf->resp.capabilities) &IBMVFC_HANDLE_VF_WWPN ) { + tmf->common.version =cpu_to_be32 (2 ); + tmf->targetWWPN =cpu_to_be64 (found_evt->tgt->wwpn); + }else { + tmf->common.version =cpu_to_be32 (1 ); + } tmf->common.opcode =cpu_to_be32 (IBMVFC_TMF_MAD ); tmf->common.length =cpu_to_be16 (sizeof (*tmf)); tmf->scsi_id =cpu_to_be64 (rport->port_id);
@@ -2360,6 +2369,7 @@ static int ibmvfc_match_evt(struct ibmvfc_event *evt, void *match)static int ibmvfc_abort_task_set (struct scsi_device *sdev) {struct ibmvfc_host *vhost =shost_priv (sdev->host); +struct fc_rport *rport =starget_to_rport (scsi_target (sdev));struct ibmvfc_cmd *tmf;struct ibmvfc_event *evt, *found_evt;union ibmvfc_iu rsp_iu;
@@ -2391,6 +2401,8 @@ static int ibmvfc_abort_task_set(struct scsi_device *sdev) tmf =ibmvfc_init_vfc_cmd (evt, sdev); iu =ibmvfc_get_fcp_iu (vhost, tmf); +if (be64_to_cpu (vhost->login_buf->resp.capabilities) &IBMVFC_HANDLE_VF_WWPN ) + tmf->targetWWPN =cpu_to_be64 (rport->port_name); iu->tmf_flags =IBMVFC_ABORT_TASK_SET ; tmf->flags =cpu_to_be16 ((IBMVFC_NO_MEM_DESC |IBMVFC_TMF )); evt->sync_iu = &rsp_iu;
@@ -3470,7 +3482,12 @@ static void ibmvfc_tgt_send_prli(struct ibmvfc_target *tgt) evt->tgt = tgt; prli = &evt->iu.prli;memset (prli,0 ,sizeof (*prli)); - prli->common.version =cpu_to_be32 (1 ); +if (be64_to_cpu (vhost->login_buf->resp.capabilities) &IBMVFC_HANDLE_VF_WWPN ) { + prli->common.version =cpu_to_be32 (2 ); + prli->targetWWPN =cpu_to_be64 (tgt->wwpn); + }else { + prli->common.version =cpu_to_be32 (1 ); + } prli->common.opcode =cpu_to_be32 (IBMVFC_PROCESS_LOGIN ); prli->common.length =cpu_to_be16 (sizeof (*prli)); prli->scsi_id =cpu_to_be64 (tgt->scsi_id);
@@ -3573,7 +3590,12 @@ static void ibmvfc_tgt_send_plogi(struct ibmvfc_target *tgt) evt->tgt = tgt; plogi = &evt->iu.plogi;memset (plogi,0 ,sizeof (*plogi)); - plogi->common.version =cpu_to_be32 (1 ); +if (be64_to_cpu (vhost->login_buf->resp.capabilities) &IBMVFC_HANDLE_VF_WWPN ) { + plogi->common.version =cpu_to_be32 (2 ); + plogi->targetWWPN =cpu_to_be64 (tgt->wwpn); + }else { + plogi->common.version =cpu_to_be32 (1 ); + } plogi->common.opcode =cpu_to_be32 (IBMVFC_PORT_LOGIN ); plogi->common.length =cpu_to_be16 (sizeof (*plogi)); plogi->scsi_id =cpu_to_be64 (tgt->scsi_id);
@@ -3973,7 +3995,12 @@ static void ibmvfc_adisc_timeout(struct timer_list *t) evt->tgt = tgt; tmf = &evt->iu.tmf;memset (tmf,0 ,sizeof (*tmf)); - tmf->common.version =cpu_to_be32 (1 ); +if (be64_to_cpu (vhost->login_buf->resp.capabilities) &IBMVFC_HANDLE_VF_WWPN ) { + tmf->common.version =cpu_to_be32 (2 ); + tmf->targetWWPN =cpu_to_be64 (tgt->wwpn); + }else { + tmf->common.version =cpu_to_be32 (1 ); + } tmf->common.opcode =cpu_to_be32 (IBMVFC_TMF_MAD ); tmf->common.length =cpu_to_be16 (sizeof (*tmf)); tmf->scsi_id =cpu_to_be64 (tgt->scsi_id);
Signature · 1 line
2.27.0
Tyrel Datwyler
maintainerPATCH 6/6 ibmvfc: advertise client support for targetWWPN using v2 commands
In reply to Tyrel DatwylerThe previous patch added support for the targetWWPN field in version 2 MADs and vfcFrame structures.
Set the IBMVFC_CAN_SEND_VF_WWPN bit in our capabailites flag during NPIV Login to inform the VIOS that this client supports this feature.
--- drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/ibmvscsi/ibmvfc.c +1 -1
@@ -1246,7 +1246,7 @@ static void ibmvfc_set_login_info(struct ibmvfc_host *vhost) login_info->flags |=cpu_to_be16 (IBMVFC_CLIENT_MIGRATED ); login_info->max_cmds =cpu_to_be32 (max_requests +IBMVFC_NUM_INTERNAL_REQ ); - login_info->capabilities =cpu_to_be64 (IBMVFC_CAN_MIGRATE ); + login_info->capabilities =cpu_to_be64 (IBMVFC_CAN_MIGRATE |IBMVFC_CAN_SEND_VF_WWPN ); login_info->async.va =cpu_to_be64 (vhost->async_crq.msg_token); login_info->async.len =cpu_to_be32 (vhost->async_crq.size *sizeof (*vhost->async_crq.msgs));strncpy (login_info->partition_name, vhost->partition_name,IBMVFC_MAX_NAME );
Signature · 1 line
2.27.0
Re: [PATCH 6/6] ibmvfc: advertise client support for targetWWPN using v2 commands
Everything else in this series looks OK to me.
Thanks,
Brian
Signature · 3 lines
Brian King Power Linux I/O IBM Linux Technology Center
Quoted 7 lines · Tyrel Datwyler
Both
ibmvfc_show_host_(capabilities|npiv_version)functions retrieve values fromvhost->login_buf.respbuffer. This is the MAD response buffer from the VIOS and as such any multi-byte non-string values are in big endian format.Byte swap these values to host cpu endian format for better human readability.
The whole series creates tons of pointlessly over 80 char lines. Please do a quick fixup.
Tyrel Datwyler
maintainerQuoted 6 lines · Christoph Hellwig
Quoted 5 lines · Tyrel Datwyler
Both
ibmvfc_show_host_(capabilities|npiv_version)functions retrieve values fromvhost->login_buf.respbuffer. This is the MAD response buffer from the VIOS and as such any multi-byte non-string values are in big endian format.
Quoted 6 lines
Quoted 2 lines
Byte swap these values to host cpu endian format for better human readability.
The whole series creates tons of pointlessly over 80 char lines. Please do a quick fixup.
The checkpatch script only warns at 100 char lines these days. To be fair though I did have two lines go over that limit by a couple characters, there are a couple commit log typos, and I had an if keyword with no space after before the opening parenthesis. So, I'll happily re-spin.
However, for my info going forward is the SCSI subsystem sticking to 80 char lines as a hard limit?
-Tyrel
Tyrel,
Quoted 5 lines
The checkpatch script only warns at 100 char lines these days. To be fair though I did have two lines go over that limit by a couple characters, there are a couple commit log typos, and I had an if keyword with no space after before the opening parenthesis. So, I'll happily re-spin.
Please tweak the little things that need fixing and resubmit.
Quoted 2 lines
However, for my info going forward is the SCSI subsystem sticking to 80 char lines as a hard limit?
As far as I'm concerned the 80 char limit is mainly about ensuring that the code is structured in a sensible way. Typesetting best practices also suggest that longer lines are harder to read. So while I generally don't strictly enforce the 80 char limit for drivers, I do push back if I feel that readability could be improved by breaking the line or restructuring the code.
Use your best judgment to optimize for readability.
Thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering