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

MFC r264110:

Browse Source 
All the iSCSI sysctls are also tunables; advertise that.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
trasz 2014-05-07 06:46:59 +00:00
parent a88bc10e55
commit 339da02d0d
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/cam/ctl/ctl_frontend_iscsi.c
View File

@ -82,19 +82,19 @@ SYSCTL_NODE(_kern_cam_ctl, OID_AUTO, iscsi, CTLFLAG_RD, 0,
"CAM Target Layer iSCSI Frontend"); "CAM Target Layer iSCSI Frontend");
static int debug = 3; static int debug = 3;
TUNABLE_INT("kern.cam.ctl.iscsi.debug", &debug); TUNABLE_INT("kern.cam.ctl.iscsi.debug", &debug);
SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO, debug, CTLFLAG_RWTUN,
&debug, 1, "Enable debug messages"); &debug, 1, "Enable debug messages");
static int ping_timeout = 5; static int ping_timeout = 5;
TUNABLE_INT("kern.cam.ctl.iscsi.ping_timeout", &ping_timeout); TUNABLE_INT("kern.cam.ctl.iscsi.ping_timeout", &ping_timeout);
SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO, ping_timeout, CTLFLAG_RW, SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO, ping_timeout, CTLFLAG_RWTUN,
&ping_timeout, 5, "Interval between ping (NOP-Out) requests, in seconds"); &ping_timeout, 5, "Interval between ping (NOP-Out) requests, in seconds");
static int login_timeout = 60; static int login_timeout = 60;
TUNABLE_INT("kern.cam.ctl.iscsi.login_timeout", &login_timeout); TUNABLE_INT("kern.cam.ctl.iscsi.login_timeout", &login_timeout);
SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO, login_timeout, CTLFLAG_RW, SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO, login_timeout, CTLFLAG_RWTUN,
&login_timeout, 60, "Time to wait for ctld(8) to finish Login Phase, in seconds"); &login_timeout, 60, "Time to wait for ctld(8) to finish Login Phase, in seconds");
static int maxcmdsn_delta = 256; static int maxcmdsn_delta = 256;
TUNABLE_INT("kern.cam.ctl.iscsi.maxcmdsn_delta", &maxcmdsn_delta); TUNABLE_INT("kern.cam.ctl.iscsi.maxcmdsn_delta", &maxcmdsn_delta);
SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO, maxcmdsn_delta, CTLFLAG_RW, SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO, maxcmdsn_delta, CTLFLAG_RWTUN,
&maxcmdsn_delta, 256, "Number of commands the initiator can send " &maxcmdsn_delta, 256, "Number of commands the initiator can send "
"without confirmation"); "without confirmation");

8
sys/dev/iscsi/icl.c
View File

@ -61,20 +61,20 @@
SYSCTL_NODE(_kern, OID_AUTO, icl, CTLFLAG_RD, 0, "iSCSI Common Layer"); SYSCTL_NODE(_kern, OID_AUTO, icl, CTLFLAG_RD, 0, "iSCSI Common Layer");
static int debug = 1; static int debug = 1;
TUNABLE_INT("kern.icl.debug", &debug); TUNABLE_INT("kern.icl.debug", &debug);
SYSCTL_INT(_kern_icl, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_kern_icl, OID_AUTO, debug, CTLFLAG_RWTUN,
&debug, 1, "Enable debug messages"); &debug, 1, "Enable debug messages");
static int partial_receive_len = 1 * 1024; /* XXX: More? */ static int partial_receive_len = 1 * 1024; /* XXX: More? */
TUNABLE_INT("kern.icl.partial_receive_len", &partial_receive_len); TUNABLE_INT("kern.icl.partial_receive_len", &partial_receive_len);
SYSCTL_INT(_kern_icl, OID_AUTO, partial_receive_len, CTLFLAG_RW, SYSCTL_INT(_kern_icl, OID_AUTO, partial_receive_len, CTLFLAG_RWTUN,
&partial_receive_len, 1 * 1024, "Minimum read size for partially received " &partial_receive_len, 1 * 1024, "Minimum read size for partially received "
"data segment"); "data segment");
static int sendspace = 1048576; static int sendspace = 1048576;
TUNABLE_INT("kern.icl.sendspace", &sendspace); TUNABLE_INT("kern.icl.sendspace", &sendspace);
SYSCTL_INT(_kern_icl, OID_AUTO, sendspace, CTLFLAG_RW, SYSCTL_INT(_kern_icl, OID_AUTO, sendspace, CTLFLAG_RWTUN,
&sendspace, 1048576, "Default send socket buffer size"); &sendspace, 1048576, "Default send socket buffer size");
static int recvspace = 1048576; static int recvspace = 1048576;
TUNABLE_INT("kern.icl.recvspace", &recvspace); TUNABLE_INT("kern.icl.recvspace", &recvspace);
SYSCTL_INT(_kern_icl, OID_AUTO, recvspace, CTLFLAG_RW, SYSCTL_INT(_kern_icl, OID_AUTO, recvspace, CTLFLAG_RWTUN,
&recvspace, 1048576, "Default receive socket buffer size"); &recvspace, 1048576, "Default receive socket buffer size");
static uma_zone_t icl_conn_zone; static uma_zone_t icl_conn_zone;

10
sys/dev/iscsi/iscsi.c
View File

@ -74,23 +74,23 @@ static struct iscsi_softc *sc;
SYSCTL_NODE(_kern, OID_AUTO, iscsi, CTLFLAG_RD, 0, "iSCSI initiator"); SYSCTL_NODE(_kern, OID_AUTO, iscsi, CTLFLAG_RD, 0, "iSCSI initiator");
static int debug = 1; static int debug = 1;
TUNABLE_INT("kern.iscsi.debug", &debug); TUNABLE_INT("kern.iscsi.debug", &debug);
SYSCTL_INT(_kern_iscsi, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_kern_iscsi, OID_AUTO, debug, CTLFLAG_RWTUN,
&debug, 2, "Enable debug messages"); &debug, 2, "Enable debug messages");
static int ping_timeout = 5; static int ping_timeout = 5;
TUNABLE_INT("kern.iscsi.ping_timeout", &ping_timeout); TUNABLE_INT("kern.iscsi.ping_timeout", &ping_timeout);
SYSCTL_INT(_kern_iscsi, OID_AUTO, ping_timeout, CTLFLAG_RW, &ping_timeout, SYSCTL_INT(_kern_iscsi, OID_AUTO, ping_timeout, CTLFLAG_RWTUN, &ping_timeout,
5, "Timeout for ping (NOP-Out) requests, in seconds"); 5, "Timeout for ping (NOP-Out) requests, in seconds");
static int iscsid_timeout = 60; static int iscsid_timeout = 60;
TUNABLE_INT("kern.iscsi.iscsid_timeout", &iscsid_timeout); TUNABLE_INT("kern.iscsi.iscsid_timeout", &iscsid_timeout);
SYSCTL_INT(_kern_iscsi, OID_AUTO, iscsid_timeout, CTLFLAG_RW, &iscsid_timeout, SYSCTL_INT(_kern_iscsi, OID_AUTO, iscsid_timeout, CTLFLAG_RWTUN, &iscsid_timeout,
60, "Time to wait for iscsid(8) to handle reconnection, in seconds"); 60, "Time to wait for iscsid(8) to handle reconnection, in seconds");
static int login_timeout = 60; static int login_timeout = 60;
TUNABLE_INT("kern.iscsi.login_timeout", &login_timeout); TUNABLE_INT("kern.iscsi.login_timeout", &login_timeout);
SYSCTL_INT(_kern_iscsi, OID_AUTO, login_timeout, CTLFLAG_RW, &login_timeout, SYSCTL_INT(_kern_iscsi, OID_AUTO, login_timeout, CTLFLAG_RWTUN, &login_timeout,
60, "Time to wait for iscsid(8) to finish Login Phase, in seconds"); 60, "Time to wait for iscsid(8) to finish Login Phase, in seconds");
static int maxtags = 255; static int maxtags = 255;
TUNABLE_INT("kern.iscsi.maxtags", &maxtags); TUNABLE_INT("kern.iscsi.maxtags", &maxtags);
SYSCTL_INT(_kern_iscsi, OID_AUTO, maxtags, CTLFLAG_RW, &maxtags, SYSCTL_INT(_kern_iscsi, OID_AUTO, maxtags, CTLFLAG_RWTUN, &maxtags,
255, "Max number of IO requests queued"); 255, "Max number of IO requests queued");
static MALLOC_DEFINE(M_ISCSI, "iSCSI", "iSCSI initiator"); static MALLOC_DEFINE(M_ISCSI, "iSCSI", "iSCSI initiator");