d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass through iSCSI session ISID from LOGIN request to the CTL frontend.

Browse Source 
ISID is an important part of initiator transport ID for iSCSI.  It is not
used now, but should be to properly implement persistent reservation.
This commit is contained in:
Alexander Motin 2014-07-05 21:18:33 +00:00
parent a48d677f26
commit 6d81c129dd
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=268302
6 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/cam/ctl/ctl_frontend_iscsi.c
View File

@ -1507,6 +1507,13 @@ cfiscsi_ioctl_handoff(struct ctl_iscsi *ci)
cihp->initiator_addr, sizeof(cs->cs_initiator_addr));
strlcpy(cs->cs_initiator_alias,
cihp->initiator_alias, sizeof(cs->cs_initiator_alias));
memcpy(cs->cs_initiator_isid,
cihp->initiator_isid, sizeof(cs->cs_initiator_isid));
snprintf(cs->cs_initiator_id, sizeof(cs->cs_initiator_id),
"%s,i,0x%02x%02x%02x%02x%02x%02x", cs->cs_initiator_name,
cihp->initiator_isid[0], cihp->initiator_isid[1],
cihp->initiator_isid[2], cihp->initiator_isid[3],
cihp->initiator_isid[4], cihp->initiator_isid[5]);
#ifdef ICL_KERNEL_PROXY
if (cihp->socket > 0) {

2
sys/cam/ctl/ctl_frontend_iscsi.h
View File

@ -86,6 +86,8 @@ struct cfiscsi_session {
char cs_initiator_name[CTL_ISCSI_NAME_LEN];
char cs_initiator_addr[CTL_ISCSI_ADDR_LEN];
char cs_initiator_alias[CTL_ISCSI_ALIAS_LEN];
char cs_initiator_isid[6];
char cs_initiator_id[CTL_ISCSI_NAME_LEN + 5 + 6 + 1];
unsigned int cs_id;
int cs_ctl_initid;
#ifdef ICL_KERNEL_PROXY

1
sys/cam/ctl/ctl_ioctl.h
View File

@ -681,6 +681,7 @@ struct ctl_iscsi_handoff_params {
char initiator_name[CTL_ISCSI_NAME_LEN];
char initiator_addr[CTL_ISCSI_ADDR_LEN];
char initiator_alias[CTL_ISCSI_ALIAS_LEN];
uint8_t initiator_isid[6];
char target_name[CTL_ISCSI_NAME_LEN];
int socket;
int portal_group_tag;

1
usr.sbin/ctld/ctld.h
View File

@ -178,6 +178,7 @@ struct connection {
char *conn_initiator_name;
char *conn_initiator_addr;
char *conn_initiator_alias;
uint8_t conn_initiator_isid[6];
uint32_t conn_cmdsn;
uint32_t conn_statsn;
size_t conn_max_data_segment_length;

2
usr.sbin/ctld/kernel.c
View File

@ -787,6 +787,8 @@ kernel_handoff(struct connection *conn)
strlcpy(req.data.handoff.initiator_alias,
conn->conn_initiator_alias, sizeof(req.data.handoff.initiator_alias));
}
memcpy(req.data.handoff.initiator_isid, conn->conn_initiator_isid,
sizeof(req.data.handoff.initiator_isid));
strlcpy(req.data.handoff.target_name,
conn->conn_target->t_name, sizeof(req.data.handoff.target_name));
#ifdef ICL_KERNEL_PROXY

3
usr.sbin/ctld/login.c
View File

@ -850,6 +850,9 @@ login(struct connection *conn)
log_errx(1, "received Login PDU with non-zero TSIH");
}
memcpy(conn->conn_initiator_isid, bhslr->bhslr_isid,
sizeof(conn->conn_initiator_isid));
/*
* XXX: Implement the C flag some day.
*/