Commit 985aa495 authored by Bart Van Assche's avatar Bart Van Assche Committed by Doug Ledford
Browse files

IB/srp: Add 64-bit LUN support 



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 9cb78c16 ("scsi: use 64-bit LUNs"),
June 2014.

The largest LUN number that has been tested is 0xd2003fff00000000.

Checked the following structure sizes 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: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarSagi Grimberg <sagig@mellanox.com>
Reviewed-by: default avatarYann Droneaud <ydroneaud@opteya.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>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent bbac5ccf

drivers/infiniband/ulp/srp/ib_srp.c

+6 −6
Original line number Diff line number Diff line
@@ -1832,7 +1832,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
@@ -2024,7 +2024,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);
@@ -2404,8 +2404,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;
@@ -2439,7 +2439,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;
@@ -3134,7 +3134,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);

drivers/infiniband/ulp/srp/ib_srp.h

+0 −1
Original line number Diff line number Diff line
@@ -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,

drivers/scsi/ibmvscsi/ibmvscsi.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

include/scsi/srp.h

+4 −3
Original line number Diff line number Diff line
@@ -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];

CRA Git | Maintained and supported by SUSTech CRA and CCSE