: Add initial support for MAINTENANCE_IN+REPORT_TARGET_PORT_GROUP
PATCH 1/1 : Add initial support for MAINTENANCE_IN+REPORT_TARGET_PORT_GROUP
Greetings all,
This patch adds initial support for Asymmetric Logical Unit Assignment (ALUA) in Target_Core_Mod. It adds some basic ALUA infrastructure and adds se_cmd_t->transport_emulate_cdb usage in transport_generic_cmd_sequencer() for MAINTENANCE_IN+REPORT_TARGET_PORT_GROUP emulation.
It also sets SCCS=1 + TPGS=1 bits in INQUIRY response data, as well changing Target_Core_Mod/IBLOCK to return linux/include/scsi/scsi.h:SCSI_SPC_2 so that SPC-3 shows up in INQUIRY response data.
Here is what it looks like in action with sg3_utils for the updated INQUIRY response information for a Target_Core_Mod/IBLOCK across a LIO-Target v3.0 iSCSI Target Port:
initiator# sg_inq -v /dev/sdh
inquiry cdb: 12 00 00 00 24 00
standard INQUIRY:
PQual=0 Device_type=0 RMB=0 version=0x05 [SPC-3] [AERC=0] [TrmTsk=0] NormACA=0 HiSUP=0 Resp_data_format=0 SCCS=1 ACC=0 TPGS=1 3PC=0 Protect=0 BQue=0 EncServ=0 MultiP=0 [MChngr=0] [ACKREQQ=0] Addr16=0 [RelAdr=0] WBus16=1 Sync=1 Linked=0 [TranDis=0] CmdQue=1
length=36 (0x24) Peripheral device type: disk
Vendor identification: LIO-ORG
Product identification: IBLOCK
Product revision level: v3.0
inquiry cdb: 12 01 00 00 fc 00
inquiry cdb: 12 01 80 00 fc 00Unit serial number: eEaqKo-gYF8-vnDA-jJhf-Xqzy-pjGF-G6Y50v
And for MAINTENANCE_IN+REPORT_TARGET_PORT_GROUP
initiator# sg_rtpg -v /dev/sdh
report target port groups cdb: a3 0a 00 00 00 00 00 00 04 00 00 00
Report list length = 16
Report target port groups:
target port group id : 0x0 , Pref=0
target port group asymmetric access state : 0x00
T_SUP : 0, O_SUP : 0, U_SUP : 0, S_SUP : 0, AN_SUP : 0, AO_SUP : 1
status code : 0x02
vendor unique status : 0x00
target port count : 01
Relative target port ids:
0x01This is the initial support for implict non-transitional aware ALUA. Functionality for both explict and implict transitional ALUA will be added in future patch series. The latter will be able to be controlled via Target_Core_Mod/ConfigFS and ConfigFS aware $FABRIC_MODs.
This patch is made against lio-core-2.6.git/master
and tested on v2.6.29-rc2 x86 32-bit HVM. The lio-core-2.6.git tree can be found at:
http://git.kernel.org/?p=linux/kernel/git/nab/lio-core-2.6.git;a=summary
--- drivers/lio-core/Makefile | 1 + drivers/lio-core/target_core_alua.c | 157 ++++++++++++++++++++++++++++++ drivers/lio-core/target_core_alua.h | 38 +++++++ drivers/lio-core/target_core_base.h | 13 +++ drivers/lio-core/target_core_device.c | 1 + drivers/lio-core/target_core_iblock.c | 2 +- drivers/lio-core/target_core_transport.c | 35 ++++++- drivers/lio-core/target_core_transport.h | 1 + 8 files changed, 243 insertions(+), 5 deletions(-) create mode 100644 drivers/lio-core/target_core_alua.c create mode 100644 drivers/lio-core/target_core_alua.h
drivers/lio-core/Makefile +1 -0
@@ -34,6 +34,7 @@ target_core_mod-objs := target_core_configfs.o \ target_core_hba.o \ target_core_plugin.o \ target_core_pr.o \ + target_core_alua.o \ target_core_scdb.o \ target_core_seobj.o \ target_core_tpg.o \
drivers/lio-core/target_core_alua.c new file +157 -0
157 lines not on this page · raw message
drivers/lio-core/target_core_alua.h new file +38 -0
@@ -0,0 +1,38 @@ +#ifndef TARGET_CORE_ALUA_H +#define TARGET_CORE_ALUA_H + +/* +* INQUIRY response data, TPGS Field +* +* from spc4r17 section 6.4.2 Table 135 +*/ +#define TPGS_NO_ALUA 0x00 +#define TPGS_IMPLICT_ALUA 0x10 +#define TPGS_EXPLICT_ALUA 0x20 +#define TPGS_EXPLICT_AND_IMPLICT_ALUA 0x40 + +/* +* ASYMMETRIC ACCESS STATE field +* +* from spc4r17 section 6.27 Table 245 +*/ +#define ALUA_ACCESS_STATE_ACTIVE_OPTMIZED 0x0 +#define ALUA_ACCESS_STATE_ACTIVE_NON_OPTIMIZED 0x1 +#define ALUA_ACCESS_STATE_STANDBY 0x2 +#define ALUA_ACCESS_STATE_UNAVAILABLE 0x3 +#define ALUA_ACCESS_STATE_OFFLINE 0xe +#define ALUA_ACCESS_STATE_TRANSITION 0xf + +/* +* REPORT_TARGET_PORT_GROUP STATUS CODE +* +* from spc4r17 section 6.27 Table 246 +*/ +#define ALUA_STATUS_NONE 0x00 +#define ALUA_STATUS_ALTERED_BY_EXPLICT_STPG 0x01 +#define ALUA_STATUS_ALTERED_BY_IMPLICT_ALUA 0x02 + +extern int core_scsi3_emulate_report_target_port_groups (struct se_cmd_s *); +extern int core_setup_alua (struct se_device_s *); + +#endif // TARGET_CORE_ALUA_H
drivers/lio-core/target_core_base.h +13 -0
@@ -179,6 +179,16 @@ typedef struct se_obj_s {atomic_t obj_access_count; }____cacheline_aligned se_obj_t; +typedef enum { +SPC_ALUA_PASSTHROUGH , +SPC2_ALUA_DISABLED , +SPC3_ALUA_EMULATED +}t10_alua_index_t ; + +typedef struct t10_alua_s { +t10_alua_index_t alua_type; +}____cacheline_aligned t10_alua_t ; + typedef struct t10_evpd_s { unsigned char device_identifier[INQUIRY_EVPD_DEVICE_IDENTIFIER_LEN]; int protocol_identifier_set;
@@ -508,6 +518,7 @@ typedef struct se_dev_attrib_s {int status_thread;int status_thread_tur;int emulate_reservations; +int emulate_alua;u32 hw_max_sectors;u32 max_sectors;u32 hw_queue_depth;
@@ -522,6 +533,7 @@ typedef struct se_subsystem_dev_s {struct se_hba_s *se_dev_hba;struct se_device_s *se_dev_ptr;se_dev_attrib_t se_dev_attrib; +t10_alua_t t10_alua;/* T10 Asymmetric Logical Unit Assignment Information */ t10_wwn_t t10_wwn;/* T10 Inquiry and EVPD WWN Information */ t10_reservation_template_t t10_reservation;/* T10 SPC-2 + SPC-3 Reservations */ spinlock_t se_dev_lock;
@@ -530,6 +542,7 @@ typedef struct se_subsystem_dev_s {struct config_group se_dev_pr_group;/* For T10 Reservations */ }____cacheline_aligned se_subsystem_dev_t; +#define T10_ALUA (su_dev) (&(su_dev)->t10_alua)#define T10_RES (su_dev) (&(su_dev)->t10_reservation) typedef struct se_device_s {
drivers/lio-core/target_core_device.c +1 -0
@@ -791,6 +791,7 @@ extern void se_dev_set_default_attribs (se_device_t *dev)DEV_ATTRIB (dev)->status_thread =DA_STATUS_THREAD ;DEV_ATTRIB (dev)->status_thread_tur =DA_STATUS_THREAD_TUR ;DEV_ATTRIB (dev)->emulate_reservations =DA_EMULATE_RESERVATIONS ; +DEV_ATTRIB (dev)->emulate_alua =DA_EMULATE_ALUA ;/* * max_sectors is based on subsystem plugin dependent requirements. */
drivers/lio-core/target_core_iblock.c +1 -1
@@ -836,7 +836,7 @@ extern u32 iblock_get_blocksize (se_device_t *dev)extern u32 iblock_get_device_rev (se_device_t *dev) { -return (SCSI_3 ); +return (SCSI_SPC_2 );// Returns SPC-3 in Initiator Data }extern u32 iblock_get_device_type (se_device_t *dev)
drivers/lio-core/target_core_transport.c +31 -4
@@ -59,6 +59,7 @@#include <target_core_hba.h> #include <target_core_scdb.h> #include <target_core_pr.h> +#include <target_core_alua.h> #include <target_core_transport.h> #include <target_core_plugin.h> #include <target_core_seobj.h>
@@ -2099,6 +2100,10 @@ extern se_device_t *transport_add_device_to_core_hba (*/ core_setup_reservations (dev);/* +* Setup the Asymmetric Logical Unit Assignment for se_device_t +*/ +core_setup_alua (dev); +/* * Startup the se_device_t processing thread */ transport_generic_activate_device (dev);
@@ -4044,6 +4049,19 @@ extern int transport_generic_emulate_inquiry ( buf[1 ] =0x80 ; buf[2 ] =TRANSPORT (dev)->get_device_rev (dev); buf[4 ] =31 ; +/* +* Enable SCCS and TPGS fields for Emulated ALUA +*/ +if (T10_ALUA (dev->se_sub_dev)->alua_type ==SPC3_ALUA_EMULATED ) { +/* +* Set SCCS for MAINTENANCE_IN + REPORT_TARGET_PORT_GROUPS +*/ + buf[5 ] =0x80 ; +/* +* Set TPGS field, see spc4r17 section 6.4.2 Table 135 +*/ + buf[5 ] |=TPGS_IMPLICT_ALUA ; + } buf[7 ] =0x32 ;/* Sync=1 and CmdQue=1 */ sprintf ((unsigned char *)&buf[8 ],"LIO-ORG" );
@@ -4612,16 +4630,25 @@ static int transport_generic_cmd_sequencer (break ;case 0xa3 :SET_GENERIC_TRANSPORT_FUNCTIONS (cmd); -if (TRANSPORT (dev)->get_device_type (dev) ==TYPE_RAID ) { +if (TRANSPORT (dev)->get_device_type (dev) !=TYPE_ROM ) {// MAINTENANCE_IN from SCC-2 +/* +* Check for emulated MI_REPORT_TARGET_PGS. +*/ +if (cdb[1 ] ==MI_REPORT_TARGET_PGS ) { + cmd->transport_emulate_cdb = + (T10_ALUA (su_dev)->alua_type ==SPC3_ALUA_EMULATED ) ? + &core_scsi3_emulate_report_target_port_groups : +NULL ; + } size = (cdb[6 ] <<24 ) | (cdb[7 ] <<16 ) | (cdb[8 ] <<8 ) | cdb[9 ]; }else {// GPCMD_SEND_KEY from multi media commands size = (cdb[8 ] <<8 ) + cdb[9 ]; } -CMD_ORIG_OBJ_API (cmd)->get_mem_SG (cmd->se_orig_obj_ptr, cmd); +CMD_ORIG_OBJ_API (cmd)->get_mem_buf (cmd->se_orig_obj_ptr, cmd);transport_get_maps (cmd); - ret =1 ; + ret =2 ;break ;case MODE_SELECT :SET_GENERIC_TRANSPORT_FUNCTIONS (cmd);
@@ -4700,7 +4727,7 @@ static int transport_generic_cmd_sequencer (break ;case 0xa4 :SET_GENERIC_TRANSPORT_FUNCTIONS (cmd); -if (TRANSPORT (dev)->get_device_type (dev) ==TYPE_RAID ) { +if (TRANSPORT (dev)->get_device_type (dev) !=TYPE_ROM ) {// MAINTENANCE_OUT from SCC-2 size = (cdb[6 ] <<24 ) | (cdb[7 ] <<16 ) | (cdb[8 ] <<8 ) | cdb[9 ]; }else {
drivers/lio-core/target_core_transport.h +1 -0
@@ -99,6 +99,7 @@#define DA_STATUS_THREAD 0/* Disabled by default */ #define DA_STATUS_THREAD_TUR 0/* Disabled by default */ #define DA_EMULATE_RESERVATIONS 0/* No Emulation for PSCSI by default */ +#define DA_EMULATE_ALUA 0/* No Emulation for PSCSI by default */ #define DA_STATUS_MAX_SECTORS_MIN 16#define DA_STATUS_MAX_SECTORS_MAX 8192
Signature · 1 line
1.5.4.1