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

Alike to r312190 decouple iSCSI connection limits from defaults.

Browse Source 
Connection parameters should remain at defaults until negotiated.

While there, remove sythetic limits, applied if kernel provided none.
iscsid has no own limitations, no configuration and no any idea what
values are good.  Assume kernel knows what it requests.
This commit is contained in:
Alexander Motin 2017-01-14 20:41:44 +00:00
parent 15dbd418f6
commit a15fbc904a
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
usr.sbin/iscsid/iscsid.c
View File

@ -172,8 +172,10 @@ connection_new(int iscsi_fd, const struct iscsi_daemon_request *request)
conn->conn_data_digest = CONN_DIGEST_NONE;
conn->conn_initial_r2t = true;
conn->conn_immediate_data = true;
conn->conn_max_burst_length = MAX_BURST_LENGTH;
conn->conn_first_burst_length = FIRST_BURST_LENGTH;
conn->conn_max_recv_data_segment_length = 8192;
conn->conn_max_send_data_segment_length = 8192;
conn->conn_max_burst_length = 262144;
conn->conn_first_burst_length = 65536;
conn->conn_iscsi_fd = iscsi_fd;
conn->conn_session_id = request->idr_session_id;
@ -190,31 +192,28 @@ connection_new(int iscsi_fd, const struct iscsi_daemon_request *request)
*/
isl = &conn->conn_limits;
memcpy(isl, &request->idr_limits, sizeof(*isl));
if (isl->isl_max_recv_data_segment_length == 0) {
conn->conn_max_recv_data_segment_length = 8192;
conn->conn_max_send_data_segment_length = 8192;
isl->isl_max_recv_data_segment_length = 8192;
} else {
conn->conn_max_recv_data_segment_length =
isl->isl_max_recv_data_segment_length;
conn->conn_max_send_data_segment_length =
isl->isl_max_recv_data_segment_length;
}
if (isl->isl_max_send_data_segment_length == 0) {
if (isl->isl_max_recv_data_segment_length == 0)
isl->isl_max_recv_data_segment_length = (1 << 24) - 1;
if (isl->isl_max_send_data_segment_length == 0)
isl->isl_max_send_data_segment_length =
isl->isl_max_recv_data_segment_length;
} else {
if (isl->isl_max_burst_length == 0)
isl->isl_max_burst_length = (1 << 24) - 1;
if (isl->isl_first_burst_length == 0)
isl->isl_first_burst_length = (1 << 24) - 1;
if (isl->isl_first_burst_length > isl->isl_max_burst_length)
isl->isl_first_burst_length = isl->isl_max_burst_length;
/*
* Limit default send length in case it won't be negotiated.
* We can't do it for other limits, since they may affect both
* sender and receiver operation, and we must obey defaults.
*/
if (conn->conn_max_send_data_segment_length >
isl->isl_max_send_data_segment_length) {
conn->conn_max_send_data_segment_length =
isl->isl_max_send_data_segment_length;
}
if (isl->isl_max_burst_length == 0)
isl->isl_max_burst_length = conn->conn_max_burst_length;
if (isl->isl_first_burst_length == 0) {
if (isl->isl_max_burst_length < (int)conn->conn_first_burst_length)
isl->isl_first_burst_length = isl->isl_max_burst_length;
else
isl->isl_first_burst_length = conn->conn_first_burst_length;
}
from_addr = conn->conn_conf.isc_initiator_addr;
to_addr = conn->conn_conf.isc_target_addr;

2
usr.sbin/iscsid/iscsid.h
View File

@ -44,8 +44,6 @@
#define CONN_MUTUAL_CHALLENGE_LEN 1024
#define SOCKBUF_SIZE 1048576
#define MAX_BURST_LENGTH (256 * 1024)
#define FIRST_BURST_LENGTH (128 * 1024)
struct connection {
int conn_iscsi_fd;

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

@ -397,6 +397,9 @@ login_negotiate_key(struct connection *conn, const char *name,
tmp = isl->isl_max_send_data_segment_length;
}
conn->conn_max_send_data_segment_length = tmp;
/* We received target's limit, that means it accepted our's. */
conn->conn_max_recv_data_segment_length =
isl->isl_max_recv_data_segment_length;
} else if (strcmp(name, "MaxBurstLength") == 0) {
tmp = strtoul(value, NULL, 10);
if (tmp <= 0)