Commit 5e132b6b authored by Tomasz Zawadzki's avatar Tomasz Zawadzki Committed by Daniel Verkamp
Browse files

scsi: Set proper transport protocol id 



This patch adds property of transport protocol id to spdk_scsi_dev.
This allows to change it depending on which appliation is using
the device. Previously only iSCSI was used for all.

Setting protocol id is done at the time when device is added to
vhost controller (vhost) or target node (iSCSI).

Please note that for SPDK vhost SAS protocol id is used,
as that is what kernel vhost reports as well.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I455a856c5d7796a749b6650fee0218d526e094ed
Reviewed-on: https://review.gerrithub.io/362864


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 0888dd4c

include/spdk/scsi.h

+2 −1
Original line number Diff line number Diff line
@@ -193,7 +193,8 @@ void spdk_scsi_dev_free_io_channels(struct spdk_scsi_dev *dev); 
struct spdk_scsi_dev *spdk_scsi_dev_construct(const char *name,

		char *lun_name_list[],

		int *lun_id_list,

		int num_luns);

		int num_luns,

		uint8_t protocol_id);



void spdk_scsi_dev_delete_lun(struct spdk_scsi_dev *dev, struct spdk_scsi_lun *lun);

lib/iscsi/tgt_node.c

+3 −2
Original line number Diff line number Diff line
@@ -693,8 +693,9 @@ spdk_iscsi_tgt_node_construct(int target_index, 
		}

	}



	target->dev = spdk_scsi_dev_construct(name, lun_name_list,

					      lun_id_list, num_luns);

	target->dev = spdk_scsi_dev_construct(name, lun_name_list, lun_id_list, num_luns,

					      SPDK_SPC_PROTOCOL_IDENTIFIER_ISCSI);



	if (!target->dev) {

		SPDK_ERRLOG("Could not construct SCSI device\n");

		spdk_iscsi_tgt_node_destruct(target);

lib/scsi/dev.c

+3 −1
Original line number Diff line number Diff line
@@ -138,7 +138,8 @@ spdk_scsi_dev_delete_lun(struct spdk_scsi_dev *dev, 
typedef struct spdk_scsi_dev _spdk_scsi_dev;



_spdk_scsi_dev *

spdk_scsi_dev_construct(const char *name, char *lun_name_list[], int *lun_id_list, int num_luns)

spdk_scsi_dev_construct(const char *name, char *lun_name_list[], int *lun_id_list, int num_luns,

			uint8_t protocol_id)

{

	struct spdk_scsi_dev *dev;

	struct spdk_bdev *bdev;
@@ -172,6 +173,7 @@ spdk_scsi_dev_construct(const char *name, char *lun_name_list[], int *lun_id_lis 


	dev->num_ports = 0;

	dev->maxlun = 0;

	dev->protocol_id = protocol_id;



	for (i = 0; i < num_luns; i++) {

		bdev = spdk_bdev_get_by_name(lun_name_list[i]);

lib/scsi/scsi_bdev.c

+8 −7
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ spdk_bdev_scsi_inquiry(struct spdk_bdev *bdev, struct spdk_scsi_task *task, 
		case SPDK_SPC_VPD_DEVICE_IDENTIFICATION: {

			const char *name = spdk_bdev_get_name(bdev);

			const char *product_name = spdk_bdev_get_product_name(bdev);

			uint8_t protocol_id = dev->protocol_id;

			uint8_t *buf = vpage->params;

			struct spdk_scsi_desig_desc *desig;
@@ -279,7 +280,7 @@ spdk_bdev_scsi_inquiry(struct spdk_bdev *bdev, struct spdk_scsi_task *task, 
			/* NAA designator */

			desig = (struct spdk_scsi_desig_desc *)buf;

			desig->code_set = SPDK_SPC_VPD_CODE_SET_BINARY;

			desig->protocol_id = SPDK_SPC_PROTOCOL_IDENTIFIER_ISCSI;

			desig->protocol_id = protocol_id;

			desig->type = SPDK_SPC_VPD_IDENTIFIER_TYPE_NAA;

			desig->association = SPDK_SPC_VPD_ASSOCIATION_LOGICAL_UNIT;

			desig->reserved0 = 0;
@@ -294,7 +295,7 @@ spdk_bdev_scsi_inquiry(struct spdk_bdev *bdev, struct spdk_scsi_task *task, 
			/* T10 Vendor ID designator */

			desig = (struct spdk_scsi_desig_desc *)buf;

			desig->code_set = SPDK_SPC_VPD_CODE_SET_ASCII;

			desig->protocol_id = SPDK_SPC_PROTOCOL_IDENTIFIER_ISCSI;

			desig->protocol_id = protocol_id;

			desig->type = SPDK_SPC_VPD_IDENTIFIER_TYPE_T10_VENDOR_ID;

			desig->association = SPDK_SPC_VPD_ASSOCIATION_LOGICAL_UNIT;

			desig->reserved0 = 0;
@@ -311,7 +312,7 @@ spdk_bdev_scsi_inquiry(struct spdk_bdev *bdev, struct spdk_scsi_task *task, 
			/* SCSI Device Name designator */

			desig = (struct spdk_scsi_desig_desc *)buf;

			desig->code_set = SPDK_SPC_VPD_CODE_SET_UTF8;

			desig->protocol_id = SPDK_SPC_PROTOCOL_IDENTIFIER_ISCSI;

			desig->protocol_id = protocol_id;

			desig->type = SPDK_SPC_VPD_IDENTIFIER_TYPE_SCSI_NAME;

			desig->association = SPDK_SPC_VPD_ASSOCIATION_TARGET_DEVICE;

			desig->reserved0 = 0;
@@ -325,7 +326,7 @@ spdk_bdev_scsi_inquiry(struct spdk_bdev *bdev, struct spdk_scsi_task *task, 
			/* SCSI Port Name designator */

			desig = (struct spdk_scsi_desig_desc *)buf;

			desig->code_set = SPDK_SPC_VPD_CODE_SET_UTF8;

			desig->protocol_id = SPDK_SPC_PROTOCOL_IDENTIFIER_ISCSI;

			desig->protocol_id = protocol_id;

			desig->type = SPDK_SPC_VPD_IDENTIFIER_TYPE_SCSI_NAME;

			desig->association = SPDK_SPC_VPD_ASSOCIATION_TARGET_PORT;

			desig->reserved0 = 0;
@@ -339,7 +340,7 @@ spdk_bdev_scsi_inquiry(struct spdk_bdev *bdev, struct spdk_scsi_task *task, 
			/* Relative Target Port designator */

			desig = (struct spdk_scsi_desig_desc *)buf;

			desig->code_set = SPDK_SPC_VPD_CODE_SET_BINARY;

			desig->protocol_id = SPDK_SPC_PROTOCOL_IDENTIFIER_ISCSI;

			desig->protocol_id = protocol_id;

			desig->type = SPDK_SPC_VPD_IDENTIFIER_TYPE_RELATIVE_TARGET_PORT;

			desig->association = SPDK_SPC_VPD_ASSOCIATION_TARGET_PORT;

			desig->reserved0 = 0;
@@ -355,7 +356,7 @@ spdk_bdev_scsi_inquiry(struct spdk_bdev *bdev, struct spdk_scsi_task *task, 
			/* Target port group designator */

			desig = (struct spdk_scsi_desig_desc *)buf;

			desig->code_set = SPDK_SPC_VPD_CODE_SET_BINARY;

			desig->protocol_id = SPDK_SPC_PROTOCOL_IDENTIFIER_ISCSI;

			desig->protocol_id = protocol_id;

			desig->type = SPDK_SPC_VPD_IDENTIFIER_TYPE_TARGET_PORT_GROUP;

			desig->association = SPDK_SPC_VPD_ASSOCIATION_TARGET_PORT;

			desig->reserved0 = 0;
@@ -370,7 +371,7 @@ spdk_bdev_scsi_inquiry(struct spdk_bdev *bdev, struct spdk_scsi_task *task, 
			/* Logical unit group designator */

			desig = (struct spdk_scsi_desig_desc *)buf;

			desig->code_set = SPDK_SPC_VPD_CODE_SET_BINARY;

			desig->protocol_id = SPDK_SPC_PROTOCOL_IDENTIFIER_ISCSI;

			desig->protocol_id = protocol_id;

			desig->type = SPDK_SPC_VPD_IDENTIFIER_TYPE_LOGICAL_UNIT_GROUP;

			desig->association = SPDK_SPC_VPD_ASSOCIATION_LOGICAL_UNIT;

			desig->reserved0 = 0;

lib/scsi/scsi_internal.h

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ struct spdk_scsi_dev { 


	int			num_ports;

	struct spdk_scsi_port	port[SPDK_SCSI_DEV_MAX_PORTS];



	uint8_t 		protocol_id;

};



struct spdk_scsi_lun {