Author: mav
Date: Thu Oct 22 20:26:27 2020
New Revision: 366953
URL: https://svnweb.freebsd.org/changeset/base/366953
Log:
Negotiate iSCSIProtocolLevel of 2 (RFC 7144) in initiator.
It does not change anything immediately, but allows further support of
Command Priority, Status Qualifier and new task management functions.
MFC after: 1 month
Sponsored by: iXsystems, Inc.
Modified:
head/sys/dev/iscsi/iscsi.c
head/sys/dev/iscsi/iscsi.h
head/sys/dev/iscsi/iscsi_ioctl.h
head/sys/dev/iscsi/iscsi_proto.h
head/usr.sbin/iscsid/iscsid.c
head/usr.sbin/iscsid/iscsid.h
head/usr.sbin/iscsid/login.c
Modified: head/sys/dev/iscsi/iscsi.c
==============================================================================
--- head/sys/dev/iscsi/iscsi.c Thu Oct 22 20:21:11 2020 (r366952)
+++ head/sys/dev/iscsi/iscsi.c Thu Oct 22 20:26:27 2020 (r366953)
@@ -1427,6 +1427,7 @@ iscsi_ioctl_daemon_handoff(struct iscsi_softc *sc,
sizeof(is->is_target_alias));
is->is_tsih = handoff->idh_tsih;
is->is_statsn = handoff->idh_statsn;
+ is->is_protocol_level = handoff->idh_protocol_level;
is->is_initial_r2t = handoff->idh_initial_r2t;
is->is_immediate_data = handoff->idh_immediate_data;
Modified: head/sys/dev/iscsi/iscsi.h
==============================================================================
--- head/sys/dev/iscsi/iscsi.h Thu Oct 22 20:21:11 2020 (r366952)
+++ head/sys/dev/iscsi/iscsi.h Thu Oct 22 20:26:27 2020 (r366953)
@@ -61,8 +61,7 @@ struct iscsi_session {
uint32_t is_expcmdsn;
uint32_t is_maxcmdsn;
uint32_t is_initiator_task_tag;
- int is_header_digest;
- int is_data_digest;
+ int is_protocol_level;
int is_initial_r2t;
int is_max_burst_length;
int is_first_burst_length;
Modified: head/sys/dev/iscsi/iscsi_ioctl.h
==============================================================================
--- head/sys/dev/iscsi/iscsi_ioctl.h Thu Oct 22 20:21:11 2020
(r366952)
+++ head/sys/dev/iscsi/iscsi_ioctl.h Thu Oct 22 20:26:27 2020
(r366953)
@@ -124,7 +124,8 @@ struct iscsi_daemon_handoff {
unsigned int idh_session_id;
int idh_socket;
char idh_target_alias[ISCSI_ALIAS_LEN];
- uint8_t idh_spare_isid[6];
+ int idh_protocol_level;
+ uint16_t idh_spare;
uint16_t idh_tsih;
uint16_t idh_spare_cid;
uint32_t idh_statsn;
Modified: head/sys/dev/iscsi/iscsi_proto.h
==============================================================================
--- head/sys/dev/iscsi/iscsi_proto.h Thu Oct 22 20:21:11 2020
(r366952)
+++ head/sys/dev/iscsi/iscsi_proto.h Thu Oct 22 20:26:27 2020
(r366953)
@@ -90,10 +90,14 @@ CTASSERT(sizeof(struct iscsi_bhs) == ISCSI_BHS_SIZE);
#define BHSSC_FLAGS_ATTR_HOQ 3
#define BHSSC_FLAGS_ATTR_ACA 4
+#define BHSSC_PRI_MASK 0xf0
+#define BHSSC_PRI_SHIFT 4
+
struct iscsi_bhs_scsi_command {
uint8_t bhssc_opcode;
uint8_t bhssc_flags;
- uint8_t bhssc_reserved[2];
+ uint8_t bhssc_pri;
+ uint8_t bhssc_reserved;
uint8_t bhssc_total_ahs_len;
uint8_t bhssc_data_segment_len[3];
uint64_t bhssc_lun;
Modified: head/usr.sbin/iscsid/iscsid.c
==============================================================================
--- head/usr.sbin/iscsid/iscsid.c Thu Oct 22 20:21:11 2020
(r366952)
+++ head/usr.sbin/iscsid/iscsid.c Thu Oct 22 20:26:27 2020
(r366953)
@@ -172,6 +172,7 @@ connection_new(int iscsi_fd, const struct iscsi_daemon
/*
* Default values, from RFC 3720, section 12.
*/
+ conn->conn_protocol_level = 0;
conn->conn_header_digest = CONN_DIGEST_NONE;
conn->conn_data_digest = CONN_DIGEST_NONE;
conn->conn_initial_r2t = true;
@@ -329,6 +330,7 @@ handoff(struct connection *conn)
sizeof(idh.idh_target_alias));
idh.idh_tsih = conn->conn_tsih;
idh.idh_statsn = conn->conn_statsn;
+ idh.idh_protocol_level = conn->conn_protocol_level;
idh.idh_header_digest = conn->conn_header_digest;
idh.idh_data_digest = conn->conn_data_digest;
idh.idh_initial_r2t = conn->conn_initial_r2t;
Modified: head/usr.sbin/iscsid/iscsid.h
==============================================================================
--- head/usr.sbin/iscsid/iscsid.h Thu Oct 22 20:21:11 2020
(r366952)
+++ head/usr.sbin/iscsid/iscsid.h Thu Oct 22 20:26:27 2020
(r366953)
@@ -57,6 +57,7 @@ struct connection {
uint8_t conn_isid[6];
uint16_t conn_tsih;
uint32_t conn_statsn;
+ int conn_protocol_level;
int conn_header_digest;
int conn_data_digest;
bool conn_initial_r2t;
Modified: head/usr.sbin/iscsid/login.c
==============================================================================
--- head/usr.sbin/iscsid/login.c Thu Oct 22 20:21:11 2020
(r366952)
+++ head/usr.sbin/iscsid/login.c Thu Oct 22 20:26:27 2020
(r366953)
@@ -341,6 +341,11 @@ login_negotiate_key(struct connection *conn, const cha
sizeof(conn->conn_target_alias));
} else if (strcmp(value, "Irrelevant") == 0) {
/* Ignore. */
+ } else if (strcmp(name, "iSCSIProtocolLevel") == 0) {
+ tmp = strtoul(value, NULL, 10);
+ if (tmp < 0 || tmp > 31)
+ log_errx(1, "received invalid iSCSIProtocolLevel");
+ conn->conn_protocol_level = tmp;
} else if (strcmp(name, "HeaderDigest") == 0) {
which = login_list_prefers(value, "CRC32C", "None");
switch (which) {
@@ -500,6 +505,7 @@ login_negotiate(struct connection *conn)
* The following keys are irrelevant for discovery sessions.
*/
if (conn->conn_conf.isc_discovery == 0) {
+ keys_add(request_keys, "iSCSIProtocolLevel", "2");
if (conn->conn_conf.isc_header_digest != 0)
keys_add(request_keys, "HeaderDigest", "CRC32C");
else
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
