* [PATCH v2] IB/srp: Add 64-bit LUN support
@ 2015-03-04 15:58 Bart Van Assche
[not found] ` <54F72BA6.1060300-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Bart Van Assche @ 2015-03-04 15:58 UTC (permalink / raw)
To: James Bottomley
Cc: Hannes Reinecke, Sagi Grimberg, Sebastian Parschauer, Brian King,
Nathan Fontenot, Tyrel Datwyler, linux-scsi, linux-rdma
The SCSI standard defines 64-bit values for LUNs. Large arrays
employing large or hierarchical LUN numbers become more and more
common. So update the SRP initiator to use 64-bit LUN numbers.
See also Hannes Reinecke, commit 9cb78c16f5da ("scsi: use 64-bit LUNs"),
June 2014.
The largest LUN number that has been tested is 0xd2003fff00000000.
The following structure sizes have been verified with gdb:
* sizeof(struct srp_cmd) = 48
* sizeof(struct srp_tsk_mgmt) = 48
* sizeof(struct srp_aer_req) = 36
The ibmvscsi changes have been compile tested only (on a PPC system).
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Cc: Sebastian Parschauer <sebastian.riemer@profitbricks.com>
Cc: Brian King <brking@linux.vnet.ibm.com>
Cc: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Cc: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
---
Changes compared to v1:
- Removed SRP_MAX_LUN definition from ib_srp.h
drivers/infiniband/ulp/srp/ib_srp.c | 12 ++++++------
drivers/infiniband/ulp/srp/ib_srp.h | 1 -
drivers/scsi/ibmvscsi/ibmvscsi.c | 6 +++---
include/scsi/srp.h | 7 ++++---
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index a0e24a8..e427454 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -1842,7 +1842,7 @@ static void srp_process_aer_req(struct srp_rdma_ch *ch,
s32 delta = be32_to_cpu(req->req_lim_delta);
shost_printk(KERN_ERR, target->scsi_host, PFX
- "ignoring AER for LUN %llu\n", be64_to_cpu(req->lun));
+ "ignoring AER for LUN %llu\n", scsilun_to_int(&req->lun));
if (srp_response_common(ch, delta, &rsp, sizeof(rsp)))
shost_printk(KERN_ERR, target->scsi_host, PFX
@@ -2034,7 +2034,7 @@ static int srp_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd)
memset(cmd, 0, sizeof *cmd);
cmd->opcode = SRP_CMD;
- cmd->lun = cpu_to_be64((u64) scmnd->device->lun << 48);
+ int_to_scsilun(scmnd->device->lun, &cmd->lun);
cmd->tag = tag;
memcpy(cmd->cdb, scmnd->cmnd, scmnd->cmd_len);
@@ -2414,8 +2414,8 @@ srp_change_queue_depth(struct scsi_device *sdev, int qdepth)
return scsi_change_queue_depth(sdev, qdepth);
}
-static int srp_send_tsk_mgmt(struct srp_rdma_ch *ch, u64 req_tag,
- unsigned int lun, u8 func)
+static int srp_send_tsk_mgmt(struct srp_rdma_ch *ch, u64 req_tag, u64 lun,
+ u8 func)
{
struct srp_target_port *target = ch->target;
struct srp_rport *rport = target->rport;
@@ -2449,7 +2449,7 @@ static int srp_send_tsk_mgmt(struct srp_rdma_ch *ch, u64 req_tag,
memset(tsk_mgmt, 0, sizeof *tsk_mgmt);
tsk_mgmt->opcode = SRP_TSK_MGMT;
- tsk_mgmt->lun = cpu_to_be64((u64) lun << 48);
+ int_to_scsilun(lun, &tsk_mgmt->lun);
tsk_mgmt->tag = req_tag | SRP_TAG_TSK_MGMT;
tsk_mgmt->tsk_mgmt_func = func;
tsk_mgmt->task_tag = req_tag;
@@ -3146,7 +3146,7 @@ static ssize_t srp_create_target(struct device *dev,
target_host->transportt = ib_srp_transport_template;
target_host->max_channel = 0;
target_host->max_id = 1;
- target_host->max_lun = SRP_MAX_LUN;
+ target_host->max_lun = -1LL;
target_host->max_cmd_len = sizeof ((struct srp_cmd *) (void *) 0L)->cdb;
target = host_to_target(target_host);
diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h
index a611556..ce6dcf8 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.h
+++ b/drivers/infiniband/ulp/srp/ib_srp.h
@@ -54,7 +54,6 @@ enum {
SRP_DLID_REDIRECT = 2,
SRP_STALE_CONN = 3,
- SRP_MAX_LUN = 512,
SRP_DEF_SG_TABLESIZE = 12,
SRP_DEFAULT_QUEUE_SIZE = 1 << 6,
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index acea5d6..6a41c36 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -1053,7 +1053,7 @@ static int ibmvscsi_queuecommand_lck(struct scsi_cmnd *cmnd,
memset(srp_cmd, 0x00, SRP_MAX_IU_LEN);
srp_cmd->opcode = SRP_CMD;
memcpy(srp_cmd->cdb, cmnd->cmnd, sizeof(srp_cmd->cdb));
- srp_cmd->lun = cpu_to_be64(((u64)lun) << 48);
+ int_to_scsilun(lun, &srp_cmd->lun);
if (!map_data_for_srp_cmd(cmnd, evt_struct, srp_cmd, hostdata->dev)) {
if (!firmware_has_feature(FW_FEATURE_CMO))
@@ -1529,7 +1529,7 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
/* Set up an abort SRP command */
memset(tsk_mgmt, 0x00, sizeof(*tsk_mgmt));
tsk_mgmt->opcode = SRP_TSK_MGMT;
- tsk_mgmt->lun = cpu_to_be64(((u64) lun) << 48);
+ int_to_scsilun(lun, &tsk_mgmt->lun);
tsk_mgmt->tsk_mgmt_func = SRP_TSK_ABORT_TASK;
tsk_mgmt->task_tag = (u64) found_evt;
@@ -1652,7 +1652,7 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
/* Set up a lun reset SRP command */
memset(tsk_mgmt, 0x00, sizeof(*tsk_mgmt));
tsk_mgmt->opcode = SRP_TSK_MGMT;
- tsk_mgmt->lun = cpu_to_be64(((u64) lun) << 48);
+ int_to_scsilun(lun, &tsk_mgmt->lun);
tsk_mgmt->tsk_mgmt_func = SRP_TSK_LUN_RESET;
evt->sync_srp = &srp_rsp;
diff --git a/include/scsi/srp.h b/include/scsi/srp.h
index 1ae84db..5be834d 100644
--- a/include/scsi/srp.h
+++ b/include/scsi/srp.h
@@ -42,6 +42,7 @@
*/
#include <linux/types.h>
+#include <scsi/scsi.h>
enum {
SRP_LOGIN_REQ = 0x00,
@@ -179,7 +180,7 @@ struct srp_tsk_mgmt {
u8 reserved1[6];
u64 tag;
u8 reserved2[4];
- __be64 lun __attribute__((packed));
+ struct scsi_lun lun;
u8 reserved3[2];
u8 tsk_mgmt_func;
u8 reserved4;
@@ -200,7 +201,7 @@ struct srp_cmd {
u8 data_in_desc_cnt;
u64 tag;
u8 reserved2[4];
- __be64 lun __attribute__((packed));
+ struct scsi_lun lun;
u8 reserved3;
u8 task_attr;
u8 reserved4;
@@ -265,7 +266,7 @@ struct srp_aer_req {
__be32 req_lim_delta;
u64 tag;
u32 reserved2;
- __be64 lun;
+ struct scsi_lun lun;
__be32 sense_data_len;
u32 reserved3;
u8 sense_data[0];
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] IB/srp: Add 64-bit LUN support
[not found] ` <54F72BA6.1060300-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
@ 2015-03-06 14:28 ` Yann Droneaud
2015-04-02 20:03 ` Roland Dreier
1 sibling, 0 replies; 3+ messages in thread
From: Yann Droneaud @ 2015-03-06 14:28 UTC (permalink / raw)
To: Bart Van Assche
Cc: James Bottomley, Hannes Reinecke, Sagi Grimberg,
Sebastian Parschauer, Brian King, Nathan Fontenot,
Tyrel Datwyler, linux-scsi-u79uwXL29TY76Z2rM5mHXA, linux-rdma
Hi,
Le mercredi 04 mars 2015 à 16:58 +0100, Bart Van Assche a écrit :
> The SCSI standard defines 64-bit values for LUNs. Large arrays
> employing large or hierarchical LUN numbers become more and more
> common. So update the SRP initiator to use 64-bit LUN numbers.
> See also Hannes Reinecke, commit 9cb78c16f5da ("scsi: use 64-bit LUNs"),
> June 2014.
>
> The largest LUN number that has been tested is 0xd2003fff00000000.
>
> The following structure sizes have been verified with gdb:
> * sizeof(struct srp_cmd) = 48
> * sizeof(struct srp_tsk_mgmt) = 48
> * sizeof(struct srp_aer_req) = 36
>
> The ibmvscsi changes have been compile tested only (on a PPC system).
>
> Signed-off-by: Bart Van Assche <bart.vanassche-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
> Reviewed-by: Hannes Reinecke <hare-l3A5Bk7waGM@public.gmane.org>
> Reviewed-by: Sagi Grimberg <sagig-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
> Cc: Sebastian Parschauer <sebastian.riemer-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
> Cc: Brian King <brking-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
> Cc: Nathan Fontenot <nfont-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
> Cc: Tyrel Datwyler <tyreld-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
> ---
>
> Changes compared to v1:
> - Removed SRP_MAX_LUN definition from ib_srp.h
>
Thanks.
> drivers/infiniband/ulp/srp/ib_srp.c | 12 ++++++------
> drivers/infiniband/ulp/srp/ib_srp.h | 1 -
> drivers/scsi/ibmvscsi/ibmvscsi.c | 6 +++---
> include/scsi/srp.h | 7 ++++---
> 4 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
> index a0e24a8..e427454 100644
> --- a/drivers/infiniband/ulp/srp/ib_srp.c
> +++ b/drivers/infiniband/ulp/srp/ib_srp.c
> @@ -1842,7 +1842,7 @@ static void srp_process_aer_req(struct srp_rdma_ch *ch,
> s32 delta = be32_to_cpu(req->req_lim_delta);
>
> shost_printk(KERN_ERR, target->scsi_host, PFX
> - "ignoring AER for LUN %llu\n", be64_to_cpu(req->lun));
> + "ignoring AER for LUN %llu\n", scsilun_to_int(&req->lun));
>
> if (srp_response_common(ch, delta, &rsp, sizeof(rsp)))
> shost_printk(KERN_ERR, target->scsi_host, PFX
> @@ -2034,7 +2034,7 @@ static int srp_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd)
> memset(cmd, 0, sizeof *cmd);
>
> cmd->opcode = SRP_CMD;
> - cmd->lun = cpu_to_be64((u64) scmnd->device->lun << 48);
> + int_to_scsilun(scmnd->device->lun, &cmd->lun);
> cmd->tag = tag;
> memcpy(cmd->cdb, scmnd->cmnd, scmnd->cmd_len);
>
> @@ -2414,8 +2414,8 @@ srp_change_queue_depth(struct scsi_device *sdev, int qdepth)
> return scsi_change_queue_depth(sdev, qdepth);
> }
>
> -static int srp_send_tsk_mgmt(struct srp_rdma_ch *ch, u64 req_tag,
> - unsigned int lun, u8 func)
> +static int srp_send_tsk_mgmt(struct srp_rdma_ch *ch, u64 req_tag, u64 lun,
> + u8 func)
> {
> struct srp_target_port *target = ch->target;
> struct srp_rport *rport = target->rport;
> @@ -2449,7 +2449,7 @@ static int srp_send_tsk_mgmt(struct srp_rdma_ch *ch, u64 req_tag,
> memset(tsk_mgmt, 0, sizeof *tsk_mgmt);
>
> tsk_mgmt->opcode = SRP_TSK_MGMT;
> - tsk_mgmt->lun = cpu_to_be64((u64) lun << 48);
> + int_to_scsilun(lun, &tsk_mgmt->lun);
> tsk_mgmt->tag = req_tag | SRP_TAG_TSK_MGMT;
> tsk_mgmt->tsk_mgmt_func = func;
> tsk_mgmt->task_tag = req_tag;
> @@ -3146,7 +3146,7 @@ static ssize_t srp_create_target(struct device *dev,
> target_host->transportt = ib_srp_transport_template;
> target_host->max_channel = 0;
> target_host->max_id = 1;
> - target_host->max_lun = SRP_MAX_LUN;
> + target_host->max_lun = -1LL;
> target_host->max_cmd_len = sizeof ((struct srp_cmd *) (void *) 0L)->cdb;
>
> target = host_to_target(target_host);
> diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h
> index a611556..ce6dcf8 100644
> --- a/drivers/infiniband/ulp/srp/ib_srp.h
> +++ b/drivers/infiniband/ulp/srp/ib_srp.h
> @@ -54,7 +54,6 @@ enum {
> SRP_DLID_REDIRECT = 2,
> SRP_STALE_CONN = 3,
>
> - SRP_MAX_LUN = 512,
> SRP_DEF_SG_TABLESIZE = 12,
>
> SRP_DEFAULT_QUEUE_SIZE = 1 << 6,
> diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
> index acea5d6..6a41c36 100644
> --- a/drivers/scsi/ibmvscsi/ibmvscsi.c
> +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
> @@ -1053,7 +1053,7 @@ static int ibmvscsi_queuecommand_lck(struct scsi_cmnd *cmnd,
> memset(srp_cmd, 0x00, SRP_MAX_IU_LEN);
> srp_cmd->opcode = SRP_CMD;
> memcpy(srp_cmd->cdb, cmnd->cmnd, sizeof(srp_cmd->cdb));
> - srp_cmd->lun = cpu_to_be64(((u64)lun) << 48);
> + int_to_scsilun(lun, &srp_cmd->lun);
>
> if (!map_data_for_srp_cmd(cmnd, evt_struct, srp_cmd, hostdata->dev)) {
> if (!firmware_has_feature(FW_FEATURE_CMO))
> @@ -1529,7 +1529,7 @@ static int ibmvscsi_eh_abort_handler(struct scsi_cmnd *cmd)
> /* Set up an abort SRP command */
> memset(tsk_mgmt, 0x00, sizeof(*tsk_mgmt));
> tsk_mgmt->opcode = SRP_TSK_MGMT;
> - tsk_mgmt->lun = cpu_to_be64(((u64) lun) << 48);
> + int_to_scsilun(lun, &tsk_mgmt->lun);
> tsk_mgmt->tsk_mgmt_func = SRP_TSK_ABORT_TASK;
> tsk_mgmt->task_tag = (u64) found_evt;
>
> @@ -1652,7 +1652,7 @@ static int ibmvscsi_eh_device_reset_handler(struct scsi_cmnd *cmd)
> /* Set up a lun reset SRP command */
> memset(tsk_mgmt, 0x00, sizeof(*tsk_mgmt));
> tsk_mgmt->opcode = SRP_TSK_MGMT;
> - tsk_mgmt->lun = cpu_to_be64(((u64) lun) << 48);
> + int_to_scsilun(lun, &tsk_mgmt->lun);
> tsk_mgmt->tsk_mgmt_func = SRP_TSK_LUN_RESET;
>
> evt->sync_srp = &srp_rsp;
> diff --git a/include/scsi/srp.h b/include/scsi/srp.h
> index 1ae84db..5be834d 100644
> --- a/include/scsi/srp.h
> +++ b/include/scsi/srp.h
> @@ -42,6 +42,7 @@
> */
>
> #include <linux/types.h>
> +#include <scsi/scsi.h>
>
> enum {
> SRP_LOGIN_REQ = 0x00,
> @@ -179,7 +180,7 @@ struct srp_tsk_mgmt {
> u8 reserved1[6];
> u64 tag;
> u8 reserved2[4];
> - __be64 lun __attribute__((packed));
> + struct scsi_lun lun;
> u8 reserved3[2];
> u8 tsk_mgmt_func;
> u8 reserved4;
> @@ -200,7 +201,7 @@ struct srp_cmd {
> u8 data_in_desc_cnt;
> u64 tag;
> u8 reserved2[4];
> - __be64 lun __attribute__((packed));
> + struct scsi_lun lun;
> u8 reserved3;
> u8 task_attr;
> u8 reserved4;
> @@ -265,7 +266,7 @@ struct srp_aer_req {
> __be32 req_lim_delta;
> u64 tag;
> u32 reserved2;
> - __be64 lun;
> + struct scsi_lun lun;
> __be32 sense_data_len;
> u32 reserved3;
> u8 sense_data[0];
Reviewed-by: Yann Droneaud <ydroneaud-RlY5vtjFyJ3QT0dZR+AlfA@public.gmane.org>
Regards.
--
Yann Droneaud
OPTEYA
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] IB/srp: Add 64-bit LUN support
[not found] ` <54F72BA6.1060300-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
2015-03-06 14:28 ` Yann Droneaud
@ 2015-04-02 20:03 ` Roland Dreier
1 sibling, 0 replies; 3+ messages in thread
From: Roland Dreier @ 2015-04-02 20:03 UTC (permalink / raw)
To: Bart Van Assche
Cc: James Bottomley, Hannes Reinecke, Sagi Grimberg,
Sebastian Parschauer, Brian King, Nathan Fontenot,
Tyrel Datwyler, linux-scsi-u79uwXL29TY76Z2rM5mHXA, linux-rdma
Thanks, applied at last. I'm assuming the vscsi changes are OK since
they look mechanical and we haven't heard anything from IBM people.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-04-02 20:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-04 15:58 [PATCH v2] IB/srp: Add 64-bit LUN support Bart Van Assche
[not found] ` <54F72BA6.1060300-XdAiOPVOjttBDgjK7y7TUQ@public.gmane.org>
2015-03-06 14:28 ` Yann Droneaud
2015-04-02 20:03 ` Roland Dreier
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.