[illumos-gate merge]release-20220630

commit 08848a83914f59a64a6b5a37f068bbb69b0604b0
    13919 dladm show-vnic truncates link speed for 100Gbps
commit 99e2a6f8e952fd927a72b75323d3e56bcbcda40a
    14743 new vioscsi driver
commit 028c45646327b08802a29b76d1abea8907a57f17
    14752 AVL: Remove obsolete branching optimizations

Conflicts:
    usr/src/cmd/dladm/dladm.c

4 files changed, 99 insertions, 3 deletions

diff --git a/usr/src/man/man4d/Makefile b/usr/src/man/man4d/Makefile
index 2b20c60b32..4a6402de9c 100644
--- a/usr/src/man/man4d/Makefile
+++ b/usr/src/man/man4d/Makefile
@@ -17,6 +17,7 @@
 # Copyright 2018 Nexenta Systems, Inc.
 # Copyright 2020 Peter Tribble
 # Copyright 2021 Oxide Computer Company
+# Copyright 2022 RackTop Systems, Inc.
 #
 
 include		$(SRC)/Makefile.master
@@ -245,6 +246,7 @@ i386_MANFILES=	ahci.4d		\
 		usmn.4d		\
 		vioblk.4d	\
 		vioif.4d	\
+		vioscsi.4d	\
 		virtio.4d	\
 		wpi.4d		\
 		xhci.4d		\
diff --git a/usr/src/man/man4d/vioblk.4d b/usr/src/man/man4d/vioblk.4d
index 4d7a2b1d9a..c8a751ec8d 100644
--- a/usr/src/man/man4d/vioblk.4d
+++ b/usr/src/man/man4d/vioblk.4d
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright 2020 Oxide Computer Company
 .\"
-.Dd August 28, 2021
+.Dd June 14, 2022
 .Dt VIOBLK 4D
 .Os
 .Sh NAME
@@ -82,6 +82,7 @@ x86 device driver.
 .El
 .Sh SEE ALSO
 .Xr blkdev 4D ,
+.Xr vioscsi 4D ,
 .Xr virtio 4D ,
 .Xr dkio 4I ,
 .Xr diskinfo 8
diff --git a/usr/src/man/man4d/vioscsi.4d b/usr/src/man/man4d/vioscsi.4d
new file mode 100644
index 0000000000..2058fd65ed
--- /dev/null
+++ b/usr/src/man/man4d/vioscsi.4d
@@ -0,0 +1,92 @@
+.\"
+.\" This file and its contents are supplied under the terms of the
+.\" Common Development and Distribution License ("CDDL"), version 1.0.
+.\" You may only use this file in accordance with the terms of version
+.\" 1.0 of the CDDL.
+.\"
+.\" A full copy of the text of the CDDL should have accompanied this
+.\" source.  A copy of the CDDL is also available via the Internet at
+.\" http://www.illumos.org/license/CDDL.
+.\"
+.\"
+.\" Copyright 2022 RackTop Systems, Inc.
+.\"
+.Dd June 17, 2022
+.Dt VIOSCSI 4D
+.Os
+.Sh NAME
+.Nm vioscsi
+.Nd virtio SCSI driver
+.Sh DESCRIPTION
+The
+.Nm
+driver provides a virtual SCSI transport, allowing
+access to
+.Xr virtio 4D
+based SCSI targets and logical units.
+The driver supports the following capabilities:
+.Bl -dash
+.It
+Dynamic hot-plug (if supported by the host)
+.It
+Honors packet timeouts specified in
+.Xr scsi_pkt 9S
+.It
+Reset of target or logical unit via
+.Xr scsi_reset 9F
+.It
+Abort for individual commands via
+.Xr scsi_abort 9F
+.It
+Command queueing (both tagged and untagged)
+.It
+Honors per logical unit queue depth from device
+.It
+Up to 255 targets, and 16384 logical units per PCI function
+.El
+.Pp
+The
+.Nm
+driver is based on
+.Xr iport 9 ,
+and uses a single iport per PCI function,
+with a unit-address of "iport0".
+Children of the iport use a unit-address with the
+format "target,lun", where both target and lun are
+presented as hexadecimal values.
+.Sh NOTES
+The
+.Nm
+driver may be slightly less efficient than
+.Xr vioblk 4D ,
+but it may support use as boot media, as well
+as attachments to SCSI pass-through devices, which
+may include devices such as tape drives via
+.Xr st 4D
+and enclosures via
+.Xr ses 4D .
+.Sh ARCHITECTURE
+The
+.Nm
+driver is only supported on
+.Sy x86 .
+.Sh FILES
+.Bl -tag -width Pa
+.It Pa /kernel/drv/amd64/vioscsi
+x86 device driver.
+.El
+.Sh SEE ALSO
+.Xr sd 4D ,
+.Xr ses 4D ,
+.Xr st 4D ,
+.Xr vioblk 4D ,
+.Xr virtio 4D ,
+.Xr iport 9 ,
+.Xr scsi_abort 9F ,
+.Xr scsi_reset 9F ,
+.Xr scsi_pkt 9S
+.Rs
+.%T Virtual I/O Device (VIRTIO) Version 1.1
+.%D April, 2019
+.%U https://docs.oasis-open.org/virtio/virtio/v1.1/virtio-v1.1.html
+.Re
diff --git a/usr/src/man/man4d/virtio.4d b/usr/src/man/man4d/virtio.4d
index 4a424ba518..47cd03535f 100644
--- a/usr/src/man/man4d/virtio.4d
+++ b/usr/src/man/man4d/virtio.4d
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright 2020 Oxide Computer Company
 .\"
-.Dd October 3, 2020
+.Dd June 14, 2022
 .Dt VIRTIO 4D
 .Os
 .Sh NAME
@@ -39,7 +39,8 @@ x86 device driver.
 .El
 .Sh SEE ALSO
 .Xr vioblk 4D ,
-.Xr vioif 4D
+.Xr vioif 4D ,
+.Xr vioscsi 4D
 .Rs
 .%T Virtual I/O Device (VIRTIO) Version 1.1
 .%D April, 2019