MFC r314659,r314676:

r314659:

usr.sbin: normalize paths using SRCTOP-relative paths or :H when possible

This simplifies make logic/output

r314676:

Fix build after r314656

Some of the changes I introduced to use .ALLSRC were correct in spirit,
but incorrect in reality -- in particular, ../Makefile.inc hadn't been
pulled in via bsd.init.mk (via bsd.lib.mk, bsd.prog.mk), so the value
of .ALLSRC (evaluated immediately) was empty. .include bsd.init.mk
explicitly so we can be certain that the values used as dependencies in
the targets are defined when the target recipe has been evaluated.

Reminder: thou shalt separate out separate functional changes before
          committing them.

(YUGE) Pointyhat to:	ngie
In collaboration with:	bdrewery

3 files changed, 110 insertions, 24 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index d086ec3..b36ca77 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -894,6 +894,7 @@ _dtrace_udp.4=	dtrace_udp.4
 .endif
 
 .if ${MK_ISCSI} != "no"
+MAN+=		cfiscsi.4
 MAN+=		iscsi.4
 MAN+=		iscsi_initiator.4
 MAN+=		iser.4
diff --git a/share/man/man4/cfiscsi.4 b/share/man/man4/cfiscsi.4
new file mode 100644
index 0000000..9d5218d
--- /dev/null
+++ b/share/man/man4/cfiscsi.4
@@ -0,0 +1,104 @@
+.\" Copyright (c) 2013 Edward Tomasz Napierala
+.\" Copyright (c) 2015-2017 Alexander Motin <mav@FreeBSD.org>
+.\" Copyright (c) 2017 Ngie Cooper <ngie@FreeBSD.org>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" 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.
+.\"
+.\" $FreeBSD$
+.Dd March 29, 2017
+.Dt CFISCSI 4
+.Os
+.Sh NAME
+.Nm cfiscsi
+.Nd CAM Target Layer iSCSI target frontend
+.Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following lines in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device cfiscsi"
+.Cd "device ctl"
+.Cd "device iscsi"
+.Ed
+.Pp
+Alternatively, to load the driver as a
+module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+cfiscsi_load="YES"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+subsystem provides iSCSI target device emulation via
+.Xr ctl 4
+and
+.Xr iscsi 4 .
+.Sh SYSCTL VARIABLES
+The following variables are available as both
+.Xr sysctl 8
+variables and
+.Xr loader 8
+tunables:
+.Bl -tag -width indent
+.It Va kern.cam.ctl.iscsi.debug
+Verbosity level for log messages from the kernel part of iSCSI target.
+Set to 0 to disable logging or 1 to warn about potential problems.
+Larger values enable debugging output.
+Defaults to 1.
+.It Va kern.cam.ctl.iscsi.maxtags
+The number of outstanding commands to advertise to each iSCSI initiator.
+Current implementation is not very accurate, so do not set this below 2.
+Defaults to 256.
+.It Va kern.cam.ctl.iscsi.ping_timeout
+The number of seconds to wait for the iSCSI initiator to respond to a NOP-In
+PDU.
+In the event that there is no response within that time the session gets
+forcibly terminated.
+Set to 0 to disable sending NOP-In PDUs.
+Defaults to 5.
+.El
+.Sh SEE ALSO
+.Xr ctl 4 ,
+.Xr iscsi 4
+.Sh HISTORY
+The
+.Nm
+subsystem first appeared in
+.Fx 10.0
+as part of the
+.Xr ctl 4
+driver.
+It was split off of
+.Xr ctl 4
+in
+.Fx 12.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+subsystem was developed by
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
+under sponsorship from the FreeBSD Foundation.
+This manual page was written by
+.An Ngie Cooper Aq Mt ngie@FreeBSD.org .
diff --git a/share/man/man4/ctl.4 b/share/man/man4/ctl.4
index 7280831..fb8e04e 100644
--- a/share/man/man4/ctl.4
+++ b/share/man/man4/ctl.4
@@ -24,18 +24,17 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd March 19, 2017
+.Dd March 29, 2017
 .Dt CTL 4
 .Os
 .Sh NAME
 .Nm ctl
-.Nd CAM Target Layer / iSCSI target subsystem
+.Nd CAM Target Layer
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following line in your
 kernel configuration file:
 .Bd -ragged -offset indent
-.Cd "device iscsi"
 .Cd "device ctl"
 .Ed
 .Pp
@@ -106,11 +105,8 @@ Provides access for local user-level applications via
 .Xr ioctl 2
 based API.
 .It iscsi
-Combined with
-.Xr iscsi 4
-and
-.Xr ctld 8 ,
-provides access for remote systems via iSCSI protocol.
+Provides access for remote systems via the iSCSI protocol using
+.Xr cfiscsi 4 .
 .It tpc
 Internal frontend used to receive requests from Third Party Copy engine,
 implementing copy offload operations.
@@ -194,24 +190,9 @@ the opposite change -- opens.
 If there is no primary node (both nodes are secondary, or secondary node has
 no connection to primary one), secondary node(s) report Transitioning state.
 State with two primary nodes is illegal (split brain condition).
-.It Va kern.cam.ctl.iscsi.debug
-Verbosity level for log messages from the kernel part of iSCSI target.
-Set to 0 to disable logging or 1 to warn about potential problems.
-Larger values enable debugging output.
-Defaults to 1.
-.It Va kern.cam.ctl.iscsi.maxtags
-The number of outstanding commands to advertise to each iSCSI initiator.
-Current implementation is not very accurate, so do not set this below 2.
-Defaults to 256.
-.It Va kern.cam.ctl.iscsi.ping_timeout
-The number of seconds to wait for the iSCSI initiator to respond to a NOP-In
-PDU.
-In the event that there is no response within that time the session gets
-forcibly terminated.
-Set to 0 to disable sending NOP-In PDUs.
-Defaults to 5.
 .El
 .Sh SEE ALSO
+.Xr cfiscsi 4 ,
 .Xr cfumass 4 ,
 .Xr ctladm 8 ,
 .Xr ctld 8 ,