From owner-svn-src-all@freebsd.org Tue May 17 07:54:54 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 506A3B3EA63; Tue, 17 May 2016 07:54:54 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 27D44127F; Tue, 17 May 2016 07:54:54 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4H7srJp043411; Tue, 17 May 2016 07:54:53 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4H7srSd043410; Tue, 17 May 2016 07:54:53 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201605170754.u4H7srSd043410@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Tue, 17 May 2016 07:54:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300022 - head/usr.sbin/iscsid X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2016 07:54:54 -0000 Author: trasz Date: Tue May 17 07:54:53 2016 New Revision: 300022 URL: https://svnweb.freebsd.org/changeset/base/300022 Log: Add initial support for negotiating iSER parameters to iscsid(8). Some rework might be needed to support asymetrical limits, but this should be ok for now. Obtained from: Mellanox Technologies (earlier version) MFC after: 1 month Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/iscsid/login.c Modified: head/usr.sbin/iscsid/login.c ============================================================================== --- head/usr.sbin/iscsid/login.c Tue May 17 07:47:23 2016 (r300021) +++ head/usr.sbin/iscsid/login.c Tue May 17 07:54:53 2016 (r300022) @@ -422,8 +422,38 @@ login_negotiate_key(struct connection *c /* Ignore */ } else if (strcmp(name, "IFMarker") == 0) { /* Ignore */ + } else if (strcmp(name, "RDMAExtensions") == 0) { + if (conn->conn_conf.isc_iser == 1 && + strcmp(value, "Yes") != 0) { + log_errx(1, "received unsupported RDMAExtensions"); + } + } else if (strcmp(name, "InitiatorRecvDataSegmentLength") == 0) { + tmp = strtoul(value, NULL, 10); + if (tmp <= 0) + log_errx(1, "received invalid " + "InitiatorRecvDataSegmentLength"); + if ((size_t)tmp > conn->conn_limits.isl_max_data_segment_length) { + log_debugx("capping InitiatorRecvDataSegmentLength " + "from %d to %zd", tmp, + conn->conn_limits.isl_max_data_segment_length); + tmp = conn->conn_limits.isl_max_data_segment_length; + } + conn->conn_max_data_segment_length = tmp; } else if (strcmp(name, "TargetPortalGroupTag") == 0) { /* Ignore */ + } else if (strcmp(name, "TargetRecvDataSegmentLength") == 0) { + tmp = strtoul(value, NULL, 10); + if (tmp <= 0) { + log_errx(1, + "received invalid TargetRecvDataSegmentLength"); + } + if ((size_t)tmp > conn->conn_limits.isl_max_data_segment_length) { + log_debugx("capping TargetRecvDataSegmentLength " + "from %d to %zd", tmp, + conn->conn_limits.isl_max_data_segment_length); + tmp = conn->conn_limits.isl_max_data_segment_length; + } + conn->conn_max_data_segment_length = tmp; } else { log_debugx("unknown key \"%s\"; ignoring", name); } @@ -465,13 +495,23 @@ login_negotiate(struct connection *conn) conn->conn_limits.isl_max_data_segment_length); keys_add(request_keys, "InitialR2T", "Yes"); keys_add(request_keys, "MaxOutstandingR2T", "1"); + if (conn->conn_conf.isc_iser == 1) { + keys_add_int(request_keys, "InitiatorRecvDataSegmentLength", + conn->conn_limits.isl_max_data_segment_length); + keys_add_int(request_keys, "TargetRecvDataSegmentLength", + conn->conn_limits.isl_max_data_segment_length); + keys_add(request_keys, "RDMAExtensions", "Yes"); + } else { + keys_add_int(request_keys, "MaxRecvDataSegmentLength", + conn->conn_limits.isl_max_data_segment_length); + } } else { keys_add(request_keys, "HeaderDigest", "None"); keys_add(request_keys, "DataDigest", "None"); + keys_add_int(request_keys, "MaxRecvDataSegmentLength", + conn->conn_limits.isl_max_data_segment_length); } - keys_add_int(request_keys, "MaxRecvDataSegmentLength", - conn->conn_limits.isl_max_data_segment_length); keys_add(request_keys, "DefaultTime2Wait", "0"); keys_add(request_keys, "DefaultTime2Retain", "0"); keys_add(request_keys, "ErrorRecoveryLevel", "0");