diff options
author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2016-06-05 08:48:37 +0000 |
---|---|---|
committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2016-06-05 08:48:37 +0000 |
commit | 4e5408f10cd5ef40a7de392ce2853395fe2aa43f (patch) | |
tree | eaa71280fbcdfab859da7e6c85281444b8b38875 /sys | |
parent | 14b258b8066342dc82272f43ceb399ffc8ca7e35 (diff) | |
download | src-4e5408f10cd5ef40a7de392ce2853395fe2aa43f.tar.gz src-4e5408f10cd5ef40a7de392ce2853395fe2aa43f.zip |
Report negotiated MaxBurstLength and FirstBurstLength in "iscsictl -v"
and "ctladm islist -v" outputs.
MFC after: 1 month
Notes
Notes:
svn path=/head/; revision=301437
Diffstat (limited to 'sys')
-rw-r--r-- | sys/cam/ctl/ctl_frontend_iscsi.c | 5 | ||||
-rw-r--r-- | sys/cam/ctl/ctl_frontend_iscsi.h | 1 | ||||
-rw-r--r-- | sys/dev/iscsi/iscsi.c | 2 | ||||
-rw-r--r-- | sys/dev/iscsi/iscsi_ioctl.h | 3 |
4 files changed, 10 insertions, 1 deletions
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c index 1c270fc2c232..70de5fa79b0f 100644 --- a/sys/cam/ctl/ctl_frontend_iscsi.c +++ b/sys/cam/ctl/ctl_frontend_iscsi.c @@ -1514,6 +1514,7 @@ cfiscsi_ioctl_handoff(struct ctl_iscsi *ci) cs->cs_statsn = cihp->statsn; cs->cs_max_data_segment_length = cihp->max_recv_data_segment_length; cs->cs_max_burst_length = cihp->max_burst_length; + cs->cs_first_burst_length = cihp->first_burst_length; cs->cs_immediate_data = !!cihp->immediate_data; if (cihp->header_digest == CTL_ISCSI_DIGEST_CRC32C) cs->cs_conn->ic_header_crc32c = true; @@ -1652,6 +1653,8 @@ cfiscsi_ioctl_list(struct ctl_iscsi *ci) "<header_digest>%s</header_digest>" "<data_digest>%s</data_digest>" "<max_data_segment_length>%zd</max_data_segment_length>" + "<max_burst_length>%zd</max_burst_length>" + "<first_burst_length>%zd</first_burst_length>" "<immediate_data>%d</immediate_data>" "<iser>%d</iser>" "<offload>%s</offload>" @@ -1663,6 +1666,8 @@ cfiscsi_ioctl_list(struct ctl_iscsi *ci) cs->cs_conn->ic_header_crc32c ? "CRC32C" : "None", cs->cs_conn->ic_data_crc32c ? "CRC32C" : "None", cs->cs_max_data_segment_length, + cs->cs_max_burst_length, + cs->cs_first_burst_length, cs->cs_immediate_data, cs->cs_conn->ic_iser, cs->cs_conn->ic_offload); diff --git a/sys/cam/ctl/ctl_frontend_iscsi.h b/sys/cam/ctl/ctl_frontend_iscsi.h index 140aa5223cee..d24f193cbbef 100644 --- a/sys/cam/ctl/ctl_frontend_iscsi.h +++ b/sys/cam/ctl/ctl_frontend_iscsi.h @@ -86,6 +86,7 @@ struct cfiscsi_session { bool cs_tasks_aborted; size_t cs_max_data_segment_length; size_t cs_max_burst_length; + size_t cs_first_burst_length; bool cs_immediate_data; char cs_initiator_name[CTL_ISCSI_NAME_LEN]; char cs_initiator_addr[CTL_ISCSI_ADDR_LEN]; diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c index e335dc715961..5364584816c2 100644 --- a/sys/dev/iscsi/iscsi.c +++ b/sys/dev/iscsi/iscsi.c @@ -1934,6 +1934,8 @@ iscsi_ioctl_session_list(struct iscsi_softc *sc, struct iscsi_session_list *isl) iss.iss_data_digest = ISCSI_DIGEST_NONE; iss.iss_max_data_segment_length = is->is_max_data_segment_length; + iss.iss_max_burst_length = is->is_max_burst_length; + iss.iss_first_burst_length = is->is_first_burst_length; iss.iss_immediate_data = is->is_immediate_data; iss.iss_connected = is->is_connected; diff --git a/sys/dev/iscsi/iscsi_ioctl.h b/sys/dev/iscsi/iscsi_ioctl.h index 38d905d268d7..21da22eda26b 100644 --- a/sys/dev/iscsi/iscsi_ioctl.h +++ b/sys/dev/iscsi/iscsi_ioctl.h @@ -93,7 +93,8 @@ struct iscsi_session_state { int iss_connected; char iss_reason[ISCSI_REASON_LEN]; char iss_offload[ISCSI_OFFLOAD_LEN]; - int iss_spare[2]; + int iss_max_burst_length; + int iss_first_burst_length; }; /* |