Page MenuHomeFreeBSD
Files F177378751

D61308.1794245826.diff
No OneTemporary
Actions

Authored By
Unknown
Size
3 KB
Referenced Files
None
Subscribers
None

D61308.1794245826.diff
View Options

diff --git a/UPDATING b/UPDATING
--- a/UPDATING
+++ b/UPDATING
@@ -26,6 +26,12 @@
debugging, define WITH_MALLOC_PRODUCTION in /etc/src.conf and rebuild
world, or to merely disable the most expensive debugging functionality
at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20261107:
+ iscsi sysctls are converted from second granularity to millisecond
+ granularity. Config files (/etc/iscsi.d) get parsed for fractions
+ of a second, so typical configurations adjusting ping and login
+ timeouts are unaffected. Where the global defaults are modified
+ via /etc/sysctl.conf, this change requires adjustments.
20261102:
The USB stack now supports SuperSpeedPlus links. This adds new values
diff --git a/share/man/man4/iscsi.4 b/share/man/man4/iscsi.4
--- a/share/man/man4/iscsi.4
+++ b/share/man/man4/iscsi.4
@@ -20,7 +20,7 @@
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
-.Dd November 6, 2026
+.Dd November 8, 2026
.Dt ISCSI 4
.Os
.Sh NAME
@@ -66,27 +66,26 @@
Larger values enable debugging output.
Defaults to 1.
.It Va kern.iscsi.ping_timeout
-The number of seconds to wait for the target to respond to a NOP-Out
+The number of milliseconds to wait for the target to respond to a NOP-Out
PDU.
In the event that there is no response within that time the session gets
forcibly restarted.
Set to 0 to disable sending NOP-Out PDUs.
-Defaults to 5.
-This can be set in increments of 0.1 seconds.
+Defaults to 5000.
.It Va kern.iscsi.iscsid_timeout
-The number of seconds to wait for
+The number of milliseconds to wait for
.Xr iscsid 8
to establish a session.
After that time
.Nm
will abort and retry.
-Defaults to 60 and accepts increments of 0.1.
+Defaults to 60000.
.It Va kern.iscsi.login_timeout
-The number of seconds to wait for a login attempt to succeed.
+The number of milliseconds to wait for a login attempt to succeed.
After that time
.Nm
will abort and retry.
-Defaults to 60 and accepts increments of 0.1.
+Defaults to 60000.
.It Va kern.iscsi.maxtags
The maximum number of outstanding IO requests.
Defaults to 255.
diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c
--- a/sys/dev/iscsi/iscsi.c
+++ b/sys/dev/iscsi/iscsi.c
@@ -1643,10 +1643,14 @@
is->is_waiting_for_iscsid = false;
is->is_login_phase = false;
is->is_timeout = 0;
- is->is_ping_timeout = is->is_conf.isc_ping_timeout;
+ is->is_ping_timeout = handoff->idh_ping_timeout;
+ if (is->is_ping_timeout < 0)
+ is->is_ping_timeout = is->is_conf.isc_ping_timeout;
if (is->is_ping_timeout < 0)
is->is_ping_timeout = ping_timeout;
- is->is_login_timeout = is->is_conf.isc_login_timeout;
+ is->is_login_timeout = handoff->idh_login_timeout;
+ if (is->is_login_timeout < 0)
+ is->is_login_timeout = is->is_conf.isc_login_timeout;
if (is->is_login_timeout < 0)
is->is_login_timeout = login_timeout;
is->is_connected = true;
@@ -2064,7 +2068,7 @@
is->is_login_timeout = login_timeout;
fast_timer = ((is->is_ping_timeout <= 2000) ||
- (is->is_ping_timeout <= 2000));
+ (is->is_login_timeout <= 2000));
sbt = mstosbt(fast_timer ? 95 : 995);
pr = mstosbt(10);
callout_reset_sbt(&is->is_callout, sbt, pr, iscsi_callout, is, 0);
diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c
--- a/usr.sbin/iscsid/iscsid.c
+++ b/usr.sbin/iscsid/iscsid.c
@@ -372,7 +372,7 @@
}
if (keepinit > 0) {
/* setsockopt only supports full seconds */
- keepinit = roundup(keepinit, 1000);
+ keepinit = roundup(keepinit, 1000) / 1000;
if (setsockopt(conn->conn.conn_socket,
IPPROTO_TCP, TCP_KEEPINIT,
&keepinit, sizeof(keepinit)) == -1)

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 9, 5:37 PM (6 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41603677
Default Alt Text
D61308.1794245826.diff (3 KB)

Event Timeline