[illumos-gate merge]

commit a63fed2a0384be5aa3f2ff7a38aac1153c549e87
    12037 ptree zone handling is broken
commit 168e1ed4b6c6d87d390ab3eb29cc9e9cb948ef56
    12011 ixgbe reports incorrect MAC_STAT_NORCVBUF

	Conflicts:
	usr/src/uts/common/io/ixgbe/ixgbe_sw.h

7 files changed, 240 insertions, 289 deletions

diff --git a/usr/src/cmd/ptools/ptree/ptree.c b/usr/src/cmd/ptools/ptree/ptree.c
index 82a32bf46c..ad8f47d191 100644
--- a/usr/src/cmd/ptools/ptree/ptree.c
+++ b/usr/src/cmd/ptools/ptree/ptree.c
@@ -212,7 +212,7 @@ main(int argc, char **argv)
 	ps = NULL;
 
 	/* Currently, this can only fail if the 3rd argument is invalid */
-	VERIFY0(proc_walk(add_proc, NULL, PR_WALK_PROC));
+	VERIFY0(proc_walk(add_proc, NULL, PR_WALK_PROC|PR_WALK_INCLUDE_SYS));
 
 	if (proc0 == NULL)
 		proc0 = fakepid0();
diff --git a/usr/src/lib/libproc/common/libproc.h b/usr/src/lib/libproc/common/libproc.h
index dd7bd9f99b..f783026060 100644
--- a/usr/src/lib/libproc/common/libproc.h
+++ b/usr/src/lib/libproc/common/libproc.h
@@ -25,7 +25,7 @@
  *
  * Portions Copyright 2007 Chad Mynhier
  * Copyright 2012 DEY Storage Systems, Inc.  All rights reserved.
- * Copyright 2018, Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright 2019, Carlos Neira <cneirabustos@gmail.com>
  * Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
@@ -464,8 +464,9 @@ extern int Plwp_iter_all(struct ps_prochandle *, proc_lwp_all_f *, void *);
 typedef int proc_walk_f(psinfo_t *, lwpsinfo_t *, void *);
 extern int proc_walk(proc_walk_f *, void *, int);
 
-#define	PR_WALK_PROC	0		/* walk processes only */
-#define	PR_WALK_LWP	1		/* walk all lwps */
+#define	PR_WALK_PROC		0		/* walk processes only */
+#define	PR_WALK_LWP		1		/* walk all lwps */
+#define	PR_WALK_INCLUDE_SYS	0x80000000	/* include SSYS processes */
 
 /*
  * Determine if an lwp is in a set as returned from proc_arg_xgrab().
diff --git a/usr/src/lib/libproc/common/proc_arg.c b/usr/src/lib/libproc/common/proc_arg.c
index c546e54cc6..f94032d9ba 100644
--- a/usr/src/lib/libproc/common/proc_arg.c
+++ b/usr/src/lib/libproc/common/proc_arg.c
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2019 Joyent, Inc.
  */
 
 #include <sys/types.h>
@@ -341,14 +342,14 @@ proc_lwp_get_range(char *range, id_t *low, id_t *high)
  * The set can include multiple lwpid ranges separated by commas
  * and has the following syntax:
  *
- * 	lwp_range[,lwp_range]*
+ *	lwp_range[,lwp_range]*
  *
  * where lwp_range is specifed as:
  *
- * 	-n			lwpid <= n
- * 	n-m			n <= lwpid <= m
- * 	n-			lwpid >= n
- * 	n			lwpid == n
+ *	-n			lwpid <= n
+ *	n-m			n <= lwpid <= m
+ *	n-			lwpid >= n
+ *	n			lwpid == n
  */
 int
 proc_lwp_in_set(const char *set, lwpid_t lwpid)
@@ -438,6 +439,11 @@ proc_walk(proc_walk_f *func, void *arg, int flag)
 	id_t pid;
 	int fd, i;
 	int ret = 0;
+	boolean_t walk_sys = B_FALSE;
+
+	if ((flag & PR_WALK_INCLUDE_SYS) != 0)
+		walk_sys = B_TRUE;
+	flag &= ~PR_WALK_INCLUDE_SYS;
 
 	if (flag != PR_WALK_PROC && flag != PR_WALK_LWP) {
 		errno = EINVAL;
@@ -458,7 +464,7 @@ proc_walk(proc_walk_f *func, void *arg, int flag)
 		if (fd < 0)
 			continue;
 		if (read(fd, &psinfo, sizeof (psinfo)) != sizeof (psinfo) ||
-		    (psinfo.pr_flag & SSYS)) {
+		    ((psinfo.pr_flag & SSYS) != 0 && !walk_sys)) {
 			(void) close(fd);
 			continue;
 		}
diff --git a/usr/src/man/man3proc/proc_walk.3proc b/usr/src/man/man3proc/proc_walk.3proc
index c1d1158d77..49f0489dc3 100644
--- a/usr/src/man/man3proc/proc_walk.3proc
+++ b/usr/src/man/man3proc/proc_walk.3proc
@@ -9,9 +9,9 @@
 .\" http://www.illumos.org/license/CDDL.
 .\"
 .\"
-.\" Copyright 2015 Joyent, Inc.
+.\" Copyright 2019 Joyent, Inc.
 .\"
-.Dd May 11, 2016
+.Dd December  2, 2019
 .Dt PROC_WALK 3PROC
 .Os
 .Sh NAME
@@ -77,6 +77,21 @@ included in the
 argument.
 .El
 .Pp
+In addition, the following values may be combined with one of the above
+values of
+.Fa flag
+with a bitwise-inclusive-OR:
+.Bl -tag -width Dv -offset indent
+.It Dv PR_WALK_INCLUDE_SYS
+Include
+.Sy SYS
+.Pq system
+processes.
+Normally
+.Sy SYS
+processes are skipped during the walk of the process tree.
+.El
+.Pp
 The return value of the caller's
 .Fa func
 function determines whether or not iteration will continue.
@@ -107,7 +122,8 @@ and
 functions.
 .Bl -tag -width Er
 .It Er EINVAL
-.Fa flag is not one of
+.Fa flag
+is not one of
 .Dv PR_WALK_PROC
 or
 .Dv PR_WALK_LWP .
diff --git a/usr/src/uts/common/io/ixgbe/ixgbe_main.c b/usr/src/uts/common/io/ixgbe/ixgbe_main.c
index 4165cf9c4f..d6200a93b4 100644
--- a/usr/src/uts/common/io/ixgbe/ixgbe_main.c
+++ b/usr/src/uts/common/io/ixgbe/ixgbe_main.c
@@ -25,7 +25,7 @@
 
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2018 Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2013 Saso Kiselkov. All rights reserved.
  * Copyright (c) 2013 OSN Online Service Nuernberg GmbH. All rights reserved.
@@ -2462,8 +2462,7 @@ ixgbe_setup_rx(ixgbe_t *ixgbe)
 	ixgbe_rx_ring_t *rx_ring;
 	struct ixgbe_hw *hw = &ixgbe->hw;
 	uint32_t reg_val;
-	uint32_t ring_mapping;
-	uint32_t i, index;
+	uint32_t i;
 	uint32_t psrtype_rss_bit;
 
 	/*
@@ -2578,14 +2577,23 @@ ixgbe_setup_rx(ixgbe_t *ixgbe)
 	}
 
 	/*
-	 * Setup the per-ring statistics mapping.
+	 * The 82598 controller gives us the RNBC (Receive No Buffer
+	 * Count) register to determine the number of frames dropped
+	 * due to no available descriptors on the destination queue.
+	 * However, this register was removed starting with 82599 and
+	 * it was replaced with the RQSMR/QPRDC registers. The nice
+	 * thing about the new registers is that they allow you to map
+	 * groups of queues to specific stat registers. The bad thing
+	 * is there are only 16 slots in the stat registers, so this
+	 * won't work when we have 32 Rx groups. Instead, we map all
+	 * queues to the zero slot of the stat registers, giving us a
+	 * global counter at QPRDC[0] (with the equivalent semantics
+	 * of RNBC). Perhaps future controllers will have more slots
+	 * and we can implement per-group counters.
 	 */
-	ring_mapping = 0;
 	for (i = 0; i < ixgbe->num_rx_rings; i++) {
-		index = ixgbe->rx_rings[i].hw_index;
-		ring_mapping = IXGBE_READ_REG(hw, IXGBE_RQSMR(index >> 2));
-		ring_mapping |= (i & 0xF) << (8 * (index & 0x3));
-		IXGBE_WRITE_REG(hw, IXGBE_RQSMR(index >> 2), ring_mapping);
+		uint32_t index = ixgbe->rx_rings[i].hw_index;
+		IXGBE_WRITE_REG(hw, IXGBE_RQSMR(index >> 2), 0);
 	}
 
 	/*
@@ -2742,7 +2750,6 @@ ixgbe_setup_tx(ixgbe_t *ixgbe)
 	struct ixgbe_hw *hw = &ixgbe->hw;
 	ixgbe_tx_ring_t *tx_ring;
 	uint32_t reg_val;
-	uint32_t ring_mapping;
 	int i;
 
 	for (i = 0; i < ixgbe->num_tx_rings; i++) {
@@ -2751,49 +2758,17 @@ ixgbe_setup_tx(ixgbe_t *ixgbe)
 	}
 
 	/*
-	 * Setup the per-ring statistics mapping.
+	 * Setup the per-ring statistics mapping. We map all Tx queues
+	 * to slot 0 to stay consistent with Rx.
 	 */
-	ring_mapping = 0;
 	for (i = 0; i < ixgbe->num_tx_rings; i++) {
-		ring_mapping |= (i & 0xF) << (8 * (i & 0x3));
-		if ((i & 0x3) == 0x3) {
-			switch (hw->mac.type) {
-			case ixgbe_mac_82598EB:
-				IXGBE_WRITE_REG(hw, IXGBE_TQSMR(i >> 2),
-				    ring_mapping);
-				break;
-
-			case ixgbe_mac_82599EB:
-			case ixgbe_mac_X540:
-			case ixgbe_mac_X550:
-			case ixgbe_mac_X550EM_x:
-			case ixgbe_mac_X550EM_a:
-				IXGBE_WRITE_REG(hw, IXGBE_TQSM(i >> 2),
-				    ring_mapping);
-				break;
-
-			default:
-				break;
-			}
-
-			ring_mapping = 0;
-		}
-	}
-	if (i & 0x3) {
 		switch (hw->mac.type) {
 		case ixgbe_mac_82598EB:
-			IXGBE_WRITE_REG(hw, IXGBE_TQSMR(i >> 2), ring_mapping);
-			break;
-
-		case ixgbe_mac_82599EB:
-		case ixgbe_mac_X540:
-		case ixgbe_mac_X550:
-		case ixgbe_mac_X550EM_x:
-		case ixgbe_mac_X550EM_a:
-			IXGBE_WRITE_REG(hw, IXGBE_TQSM(i >> 2), ring_mapping);
+			IXGBE_WRITE_REG(hw, IXGBE_TQSMR(i >> 2), 0);
 			break;
 
 		default:
+			IXGBE_WRITE_REG(hw, IXGBE_TQSM(i >> 2), 0);
 			break;
 		}
 	}
diff --git a/usr/src/uts/common/io/ixgbe/ixgbe_stat.c b/usr/src/uts/common/io/ixgbe/ixgbe_stat.c
index 663c693ce4..f345d0c0ed 100644
--- a/usr/src/uts/common/io/ixgbe/ixgbe_stat.c
+++ b/usr/src/uts/common/io/ixgbe/ixgbe_stat.c
@@ -27,12 +27,142 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
  * Copyright 2016 OmniTI Computer Consulting, Inc. All rights reserved.
- * Copyright (c) 2017, Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 
 #include "ixgbe_sw.h"
 
 /*
+ * The 82598 controller lacks a high/low register for the various
+ * octet counters, but the common code also lacks a definition for
+ * these older registers. In these cases, the high register address
+ * maps to the appropriate address in the 82598 controller.
+ */
+#define	IXGBE_TOR	IXGBE_TORH
+#define	IXGBE_GOTC	IXGBE_GOTCH
+#define	IXGBE_GORC	IXGBE_GORCH
+
+/*
+ * Read total octets received.
+ */
+static uint64_t
+ixgbe_read_tor_value(const struct ixgbe_hw *hw)
+{
+	uint64_t tor = 0;
+	uint64_t hi = 0, lo = 0;
+
+	switch (hw->mac.type) {
+	case ixgbe_mac_82598EB:
+		tor = IXGBE_READ_REG(hw, IXGBE_TOR);
+		break;
+
+	default:
+		lo = IXGBE_READ_REG(hw, IXGBE_TORL);
+		hi = IXGBE_READ_REG(hw, IXGBE_TORH) & 0xF;
+		tor = (hi << 32) + lo;
+		break;
+	}
+
+	return (tor);
+}
+
+/*
+ * Read queue octets received.
+ */
+static uint64_t
+ixgbe_read_qor_value(const struct ixgbe_hw *hw)
+{
+	uint64_t qor = 0;
+	uint64_t hi = 0, lo = 0;
+
+	switch (hw->mac.type) {
+	case ixgbe_mac_82598EB:
+		qor = IXGBE_READ_REG(hw, IXGBE_QBRC(0));
+		break;
+
+	default:
+		lo = IXGBE_READ_REG(hw, IXGBE_QBRC_L(0));
+		hi = IXGBE_READ_REG(hw, IXGBE_QBRC_H(0)) & 0xF;
+		qor = (hi << 32) + lo;
+		break;
+	}
+
+	return (qor);
+}
+
+/*
+ * Read queue octets transmitted.
+ */
+static uint64_t
+ixgbe_read_qot_value(const struct ixgbe_hw *hw)
+{
+	uint64_t qot = 0;
+	uint64_t hi = 0, lo = 0;
+
+	switch (hw->mac.type) {
+	case ixgbe_mac_82598EB:
+		qot = IXGBE_READ_REG(hw, IXGBE_QBTC(0));
+		break;
+
+	default:
+		lo = IXGBE_READ_REG(hw, IXGBE_QBTC_L(0));
+		hi = IXGBE_READ_REG(hw, IXGBE_QBTC_H(0)) & 0xF;
+		qot = (hi << 32) + lo;
+		break;
+	}
+
+	return (qot);
+}
+
+/*
+ * Read good octets transmitted.
+ */
+static uint64_t
+ixgbe_read_got_value(const struct ixgbe_hw *hw)
+{
+	uint64_t got = 0;
+	uint64_t hi = 0, lo = 0;
+
+	switch (hw->mac.type) {
+	case ixgbe_mac_82598EB:
+		got = IXGBE_READ_REG(hw, IXGBE_GOTC);
+		break;
+
+	default:
+		lo = IXGBE_READ_REG(hw, IXGBE_GOTCL);
+		hi = IXGBE_READ_REG(hw, IXGBE_GOTCH) & 0xF;
+		got = (hi << 32) + lo;
+		break;
+	}
+
+	return (got);
+}
+
+/*
+ * Read good octets received.
+ */
+static uint64_t
+ixgbe_read_gor_value(const struct ixgbe_hw *hw)
+{
+	uint64_t gor = 0;
+	uint64_t hi = 0, lo = 0;
+
+	switch (hw->mac.type) {
+	case ixgbe_mac_82598EB:
+		gor = IXGBE_READ_REG(hw, IXGBE_GORC);
+		break;
+
+	default:
+		lo = IXGBE_READ_REG(hw, IXGBE_GORCL);
+		hi = IXGBE_READ_REG(hw, IXGBE_GORCH) & 0xF;
+		gor = (hi << 32) + lo;
+		break;
+	}
+
+	return (gor);
+}
+
+/*
  * Update driver private statistics.
  */
 static int
@@ -98,56 +228,16 @@ ixgbe_update_stats(kstat_t *ks, int rw)
 	/*
 	 * Hardware calculated statistics.
 	 */
-	ixgbe_ks->gprc.value.ui64 = 0;
-	ixgbe_ks->gptc.value.ui64 = 0;
-	ixgbe_ks->tor.value.ui64 = 0;
-	ixgbe_ks->tot.value.ui64 = 0;
-	for (i = 0; i < 16; i++) {
-		ixgbe_ks->qprc[i].value.ui64 +=
-		    IXGBE_READ_REG(hw, IXGBE_QPRC(i));
-		ixgbe_ks->gprc.value.ui64 += ixgbe_ks->qprc[i].value.ui64;
-		ixgbe_ks->qptc[i].value.ui64 +=
-		    IXGBE_READ_REG(hw, IXGBE_QPTC(i));
-		ixgbe_ks->gptc.value.ui64 += ixgbe_ks->qptc[i].value.ui64;
-		ixgbe_ks->qbrc[i].value.ui64 +=
-		    IXGBE_READ_REG(hw, IXGBE_QBRC(i));
-		ixgbe_ks->tor.value.ui64 += ixgbe_ks->qbrc[i].value.ui64;
-		switch (hw->mac.type) {
-		case ixgbe_mac_82598EB:
-			ixgbe_ks->qbtc[i].value.ui64 +=
-			    IXGBE_READ_REG(hw, IXGBE_QBTC(i));
-			break;
-
-		case ixgbe_mac_82599EB:
-		case ixgbe_mac_X540:
-		case ixgbe_mac_X550:
-		case ixgbe_mac_X550EM_x:
-		case ixgbe_mac_X550EM_a:
-			ixgbe_ks->qbtc[i].value.ui64 +=
-			    IXGBE_READ_REG(hw, IXGBE_QBTC_L(i));
-			ixgbe_ks->qbtc[i].value.ui64 +=
-			    ((uint64_t)((IXGBE_READ_REG(hw,
-			    IXGBE_QBTC_H(i))) & 0xF) << 32);
-			break;
-
-		default:
-			break;
-		}
-		ixgbe_ks->tot.value.ui64 += ixgbe_ks->qbtc[i].value.ui64;
-	}
-	/*
-	 * This is a Workaround:
-	 * Currently h/w GORCH, GOTCH, TORH registers are not
-	 * correctly implemented. We found that the values in
-	 * these registers are same as those in corresponding
-	 * *L registers (i.e. GORCL, GOTCL, and TORL). Here the
-	 * gor and got stat data will not be retrieved through
-	 * GORC{H/L} and GOTC{H/L} registers but be obtained by
-	 * simply assigning tor/tot stat data, so the gor/got
-	 * stat data will not be accurate.
-	 */
-	ixgbe_ks->gor.value.ui64 = ixgbe_ks->tor.value.ui64;
-	ixgbe_ks->got.value.ui64 = ixgbe_ks->tot.value.ui64;
+	ixgbe_ks->gprc.value.ui64 += IXGBE_READ_REG(hw, IXGBE_GPRC);
+	ixgbe_ks->gptc.value.ui64 += IXGBE_READ_REG(hw, IXGBE_GPTC);
+	ixgbe_ks->gor.value.ui64 += ixgbe_read_gor_value(hw);
+	ixgbe_ks->got.value.ui64 += ixgbe_read_got_value(hw);
+	ixgbe_ks->qpr.value.ui64 += IXGBE_READ_REG(hw, IXGBE_QPRC(0));
+	ixgbe_ks->qpt.value.ui64 += IXGBE_READ_REG(hw, IXGBE_QPTC(0));
+	ixgbe_ks->qor.value.ui64 += ixgbe_read_qor_value(hw);
+	ixgbe_ks->qot.value.ui64 += ixgbe_read_qot_value(hw);
+	ixgbe_ks->tor.value.ui64 += ixgbe_read_tor_value(hw);
+	ixgbe_ks->tot.value.ui64 = ixgbe_ks->got.value.ui64;
 
 	ixgbe_ks->prc64.value.ul += IXGBE_READ_REG(hw, IXGBE_PRC64);
 	ixgbe_ks->prc127.value.ul += IXGBE_READ_REG(hw, IXGBE_PRC127);
@@ -282,6 +372,14 @@ ixgbe_init_stats(ixgbe_t *ixgbe)
 	    KSTAT_DATA_UINT64);
 	kstat_named_init(&ixgbe_ks->got, "good_octets_xmitd",
 	    KSTAT_DATA_UINT64);
+	kstat_named_init(&ixgbe_ks->qor, "queue_octets_recvd",
+	    KSTAT_DATA_UINT64);
+	kstat_named_init(&ixgbe_ks->qot, "queue_octets_xmitd",
+	    KSTAT_DATA_UINT64);
+	kstat_named_init(&ixgbe_ks->qpr, "queue_pkts_recvd",
+	    KSTAT_DATA_UINT64);
+	kstat_named_init(&ixgbe_ks->qpt, "queue_pkts_xmitd",
+	    KSTAT_DATA_UINT64);
 	kstat_named_init(&ixgbe_ks->prc64, "pkts_recvd_(  64b)",
 	    KSTAT_DATA_UINT64);
 	kstat_named_init(&ixgbe_ks->prc127, "pkts_recvd_(  65- 127b)",
@@ -307,138 +405,6 @@ ixgbe_init_stats(ixgbe_t *ixgbe)
 	kstat_named_init(&ixgbe_ks->ptc1522, "pkts_xmitd_(1024-1522b)",
 	    KSTAT_DATA_UINT64);
 
-	kstat_named_init(&ixgbe_ks->qprc[0], "queue_pkts_recvd [ 0]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qprc[1], "queue_pkts_recvd [ 1]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qprc[2], "queue_pkts_recvd [ 2]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qprc[3], "queue_pkts_recvd [ 3]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qprc[4], "queue_pkts_recvd [ 4]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qprc[5], "queue_pkts_recvd [ 5]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qprc[6], "queue_pkts_recvd [ 6]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qprc[7], "queue_pkts_recvd [ 7]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qprc[8], "queue_pkts_recvd [ 8]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qprc[9], "queue_pkts_recvd [ 9]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qprc[10], "queue_pkts_recvd [10]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qprc[11], "queue_pkts_recvd [11]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qprc[12], "queue_pkts_recvd [12]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qprc[13], "queue_pkts_recvd [13]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qprc[14], "queue_pkts_recvd [14]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qprc[15], "queue_pkts_recvd [15]",
-	    KSTAT_DATA_UINT64);
-
-	kstat_named_init(&ixgbe_ks->qptc[0], "queue_pkts_xmitd [ 0]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qptc[1], "queue_pkts_xmitd [ 1]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qptc[2], "queue_pkts_xmitd [ 2]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qptc[3], "queue_pkts_xmitd [ 3]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qptc[4], "queue_pkts_xmitd [ 4]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qptc[5], "queue_pkts_xmitd [ 5]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qptc[6], "queue_pkts_xmitd [ 6]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qptc[7], "queue_pkts_xmitd [ 7]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qptc[8], "queue_pkts_xmitd [ 8]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qptc[9], "queue_pkts_xmitd [ 9]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qptc[10], "queue_pkts_xmitd [10]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qptc[11], "queue_pkts_xmitd [11]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qptc[12], "queue_pkts_xmitd [12]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qptc[13], "queue_pkts_xmitd [13]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qptc[14], "queue_pkts_xmitd [14]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qptc[15], "queue_pkts_xmitd [15]",
-	    KSTAT_DATA_UINT64);
-
-	kstat_named_init(&ixgbe_ks->qbrc[0], "queue_bytes_recvd [ 0]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbrc[1], "queue_bytes_recvd [ 1]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbrc[2], "queue_bytes_recvd [ 2]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbrc[3], "queue_bytes_recvd [ 3]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbrc[4], "queue_bytes_recvd [ 4]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbrc[5], "queue_bytes_recvd [ 5]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbrc[6], "queue_bytes_recvd [ 6]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbrc[7], "queue_bytes_recvd [ 7]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbrc[8], "queue_bytes_recvd [ 8]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbrc[9], "queue_bytes_recvd [ 9]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbrc[10], "queue_bytes_recvd [10]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbrc[11], "queue_bytes_recvd [11]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbrc[12], "queue_bytes_recvd [12]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbrc[13], "queue_bytes_recvd [13]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbrc[14], "queue_bytes_recvd [14]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbrc[15], "queue_bytes_recvd [15]",
-	    KSTAT_DATA_UINT64);
-
-	kstat_named_init(&ixgbe_ks->qbtc[0], "queue_bytes_xmitd [ 0]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbtc[1], "queue_bytes_xmitd [ 1]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbtc[2], "queue_bytes_xmitd [ 2]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbtc[3], "queue_bytes_xmitd [ 3]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbtc[4], "queue_bytes_xmitd [ 4]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbtc[5], "queue_bytes_xmitd [ 5]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbtc[6], "queue_bytes_xmitd [ 6]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbtc[7], "queue_bytes_xmitd [ 7]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbtc[8], "queue_bytes_xmitd [ 8]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbtc[9], "queue_bytes_xmitd [ 9]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbtc[10], "queue_bytes_xmitd [10]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbtc[11], "queue_bytes_xmitd [11]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbtc[12], "queue_bytes_xmitd [12]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbtc[13], "queue_bytes_xmitd [13]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbtc[14], "queue_bytes_xmitd [14]",
-	    KSTAT_DATA_UINT64);
-	kstat_named_init(&ixgbe_ks->qbtc[15], "queue_bytes_xmitd [15]",
-	    KSTAT_DATA_UINT64);
-
 	kstat_named_init(&ixgbe_ks->mspdc, "mac_short_packet_discard",
 	    KSTAT_DATA_UINT64);
 	kstat_named_init(&ixgbe_ks->mpc, "missed_packets",
@@ -548,10 +514,21 @@ ixgbe_m_stat(void *arg, uint_t stat, uint64_t *val)
 		break;
 
 	case MAC_STAT_NORCVBUF:
-		for (i = 0; i < 8; i++) {
+		/*
+		 * The QPRDC[0] register maps to the same kstat as the
+		 * old RNBC register because they have equivalent
+		 * semantics.
+		 */
+		if (hw->mac.type == ixgbe_mac_82598EB) {
+			for (i = 0; i < 8; i++) {
+				ixgbe_ks->rnbc.value.ui64 +=
+				    IXGBE_READ_REG(hw, IXGBE_RNBC(i));
+			}
+		} else {
 			ixgbe_ks->rnbc.value.ui64 +=
-			    IXGBE_READ_REG(hw, IXGBE_RNBC(i));
+			    IXGBE_READ_REG(hw, IXGBE_QPRDC(0));
 		}
+
 		*val = ixgbe_ks->rnbc.value.ui64;
 		break;
 
@@ -571,43 +548,20 @@ ixgbe_m_stat(void *arg, uint_t stat, uint64_t *val)
 		break;
 
 	case MAC_STAT_RBYTES:
-		ixgbe_ks->tor.value.ui64 = 0;
-		for (i = 0; i < 16; i++) {
-			ixgbe_ks->qbrc[i].value.ui64 +=
-			    IXGBE_READ_REG(hw, IXGBE_QBRC(i));
-			ixgbe_ks->tor.value.ui64 +=
-			    ixgbe_ks->qbrc[i].value.ui64;
-		}
+		ixgbe_ks->tor.value.ui64 += ixgbe_read_tor_value(hw);
 		*val = ixgbe_ks->tor.value.ui64;
 		break;
 
 	case MAC_STAT_OBYTES:
-		ixgbe_ks->tot.value.ui64 = 0;
-		for (i = 0; i < 16; i++) {
-			switch (hw->mac.type) {
-			case ixgbe_mac_82598EB:
-				ixgbe_ks->qbtc[i].value.ui64 +=
-				    IXGBE_READ_REG(hw, IXGBE_QBTC(i));
-				break;
-
-			case ixgbe_mac_82599EB:
-			case ixgbe_mac_X540:
-			case ixgbe_mac_X550:
-			case ixgbe_mac_X550EM_x:
-			case ixgbe_mac_X550EM_a:
-				ixgbe_ks->qbtc[i].value.ui64 +=
-				    IXGBE_READ_REG(hw, IXGBE_QBTC_L(i));
-				ixgbe_ks->qbtc[i].value.ui64 +=
-				    ((uint64_t)((IXGBE_READ_REG(hw,
-				    IXGBE_QBTC_H(i))) & 0xF) << 32);
-				break;
-
-			default:
-				break;
-			}
-			ixgbe_ks->tot.value.ui64 +=
-			    ixgbe_ks->qbtc[i].value.ui64;
-		}
+		/*
+		 * The controller does not provide a Total Octets
+		 * Transmitted statistic. The closest thing we have is
+		 * Good Octets Transmitted. This makes sense, as what
+		 * does it mean to transmit a packet if it didn't
+		 * actually transmit.
+		 */
+		ixgbe_ks->got.value.ui64 += ixgbe_read_got_value(hw);
+		ixgbe_ks->tot.value.ui64 = ixgbe_ks->got.value.ui64;
 		*val = ixgbe_ks->tot.value.ui64;
 		break;
 
diff --git a/usr/src/uts/common/io/ixgbe/ixgbe_sw.h b/usr/src/uts/common/io/ixgbe/ixgbe_sw.h
index baa4766c0e..0dbb3288c3 100644
--- a/usr/src/uts/common/io/ixgbe/ixgbe_sw.h
+++ b/usr/src/uts/common/io/ixgbe/ixgbe_sw.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013 Saso Kiselkov. All rights reserved.
  * Copyright 2016 OmniTI Computer Consulting, Inc. All rights reserved.
- * Copyright 2018 Joyent, Inc.
+ * Copyright 2019 Joyent, Inc.
  */
 
 #ifndef	_IXGBE_SW_H
@@ -89,10 +89,9 @@ extern "C" {
 #define	IXGBE_INTR_ADJUST		0x40
 #define	IXGBE_ERROR			0x80
 
-#define	MAX_NUM_UNICAST_ADDRESSES 	0x80
-#define	MAX_NUM_MULTICAST_ADDRESSES 	0x1000
+#define	MAX_NUM_UNICAST_ADDRESSES	0x80
+#define	MAX_NUM_MULTICAST_ADDRESSES	0x1000
 #define	MAX_NUM_VLAN_FILTERS		0x40
-
 #define	IXGBE_INTR_NONE			0
 #define	IXGBE_INTR_MSIX			1
 #define	IXGBE_INTR_MSI			2
@@ -306,7 +305,7 @@ typedef struct adapter_info {
 
 enum ioc_reply {
 	IOC_INVAL = -1,	/* bad, NAK with EINVAL */
-	IOC_DONE, 	/* OK, reply sent */
+	IOC_DONE,	/* OK, reply sent */
 	IOC_ACK,	/* OK, just send ACK */
 	IOC_REPLY	/* OK, just send reply */
 };
@@ -629,7 +628,7 @@ typedef struct ixgbe_intr_vector {
  * Software adapter state
  */
 typedef struct ixgbe {
-	int 			instance;
+	int			instance;
 	mac_handle_t		mac_hdl;
 	dev_info_t		*dip;
 	struct ixgbe_hw		hw;
@@ -689,8 +688,8 @@ typedef struct ixgbe {
 	boolean_t		tx_ring_init;
 	boolean_t		tx_head_wb_enable; /* Tx head wrtie-back */
 	boolean_t		tx_hcksum_enable; /* Tx h/w cksum offload */
-	boolean_t 		lso_enable; 	/* Large Segment Offload */
-	boolean_t 		mr_enable; 	/* Multiple Tx and Rx Ring */
+	boolean_t		lso_enable;	/* Large Segment Offload */
+	boolean_t		mr_enable;	/* Multiple Tx and Rx Ring */
 	boolean_t		relax_order_enable; /* Relax Order */
 	uint32_t		classify_mode;	/* Classification mode */
 	uint32_t		tx_copy_thresh;	/* Tx copy threshold */
@@ -802,6 +801,10 @@ typedef struct ixgbe_stat {
 	kstat_named_t gptc;	/* Good Packets Xmitted Count */
 	kstat_named_t gor;	/* Good Octets Received Count */
 	kstat_named_t got;	/* Good Octets Xmitd Count */
+	kstat_named_t qor;	/* Queue Octets Received */
+	kstat_named_t qot;	/* Queue Octets Transmitted */
+	kstat_named_t qpr;	/* Queue Packets Received */
+	kstat_named_t qpt;	/* Queue Packets Transmitted */
 	kstat_named_t prc64;	/* Packets Received - 64b */
 	kstat_named_t prc127;	/* Packets Received - 65-127b */
 	kstat_named_t prc255;	/* Packets Received - 127-255b */
@@ -814,10 +817,6 @@ typedef struct ixgbe_stat {
 	kstat_named_t ptc511;	/* Packets Xmitted (255-511b) */
 	kstat_named_t ptc1023;	/* Packets Xmitted (512-1023b) */
 	kstat_named_t ptc1522;	/* Packets Xmitted (1024-1522b */
-	kstat_named_t qprc[16];	/* Queue Packets Received Count */
-	kstat_named_t qptc[16];	/* Queue Packets Transmitted Count */
-	kstat_named_t qbrc[16];	/* Queue Bytes Received Count */
-	kstat_named_t qbtc[16];	/* Queue Bytes Transmitted Count */
 
 	kstat_named_t crcerrs;	/* CRC Error Count */
 	kstat_named_t illerrc;	/* Illegal Byte Error Count */