svn commit: r337616 - in projects/clang700-import: cddl/usr.sbin/dwatch/libexec contrib/pf/pflogd sbin/ifconfig sbin/mount_cd9660 sys/amd64/amd64 sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/...
Dimitry Andric
dim at FreeBSD.org
Sat Aug 11 10:49:47 UTC 2018
Author: dim
Date: Sat Aug 11 10:49:43 2018
New Revision: 337616
URL: https://svnweb.freebsd.org/changeset/base/337616
Log:
Merge ^/head r336870 through r337615.
Added:
projects/clang700-import/cddl/usr.sbin/dwatch/libexec/systop
- copied unchanged from r337615, head/cddl/usr.sbin/dwatch/libexec/systop
Modified:
projects/clang700-import/cddl/usr.sbin/dwatch/libexec/Makefile
projects/clang700-import/cddl/usr.sbin/dwatch/libexec/vop_readdir
projects/clang700-import/contrib/pf/pflogd/pflogd.8
projects/clang700-import/sbin/ifconfig/ifieee80211.c
projects/clang700-import/sbin/mount_cd9660/mount_cd9660.8
projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
projects/clang700-import/sys/dev/cxgbe/adapter.h
projects/clang700-import/sys/dev/cxgbe/t4_main.c
projects/clang700-import/sys/dev/cxgbe/t4_netmap.c
projects/clang700-import/sys/dev/cxgbe/t4_sge.c
projects/clang700-import/usr.bin/stat/stat.c
Directory Properties:
projects/clang700-import/ (props changed)
projects/clang700-import/cddl/ (props changed)
projects/clang700-import/contrib/pf/ (props changed)
projects/clang700-import/sys/amd64/amd64/efirt_machdep.c (props changed)
projects/clang700-import/sys/cddl/contrib/opensolaris/ (props changed)
projects/clang700-import/sys/dev/efidev/efirt.c (props changed)
Modified: projects/clang700-import/cddl/usr.sbin/dwatch/libexec/Makefile
==============================================================================
--- projects/clang700-import/cddl/usr.sbin/dwatch/libexec/Makefile Sat Aug 11 10:42:12 2018 (r337615)
+++ projects/clang700-import/cddl/usr.sbin/dwatch/libexec/Makefile Sat Aug 11 10:49:43 2018 (r337616)
@@ -62,6 +62,7 @@ LINKS+= ${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dw
LINKS+= ${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/send
LINKS+= ${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/sendmsg
LINKS+= ${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/sendto
+LINKS+= ${LIBEXECDIR}/dwatch/systop ${LIBEXECDIR}/dwatch/systop
LINKS+= ${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-accept
LINKS+= ${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-accept-established
LINKS+= ${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-accept-refused
Copied: projects/clang700-import/cddl/usr.sbin/dwatch/libexec/systop (from r337615, head/cddl/usr.sbin/dwatch/libexec/systop)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/clang700-import/cddl/usr.sbin/dwatch/libexec/systop Sat Aug 11 10:49:43 2018 (r337616, copy of r337615, head/cddl/usr.sbin/dwatch/libexec/systop)
@@ -0,0 +1,84 @@
+# -*- tab-width: 4 -*- ;; Emacs
+# vi: set filetype=sh tabstop=8 shiftwidth=8 noexpandtab :: Vi/ViM
+############################################################ IDENT(1)
+#
+# $Title: dwatch(8) profile for top-like syscall $
+# $Copyright: 2014-2018 Devin Teske. All rights reserved. $
+# $FreeBSD$
+#
+############################################################ DESCRIPTION
+#
+# Every 3 seconds update the screen with syscall consumers.
+#
+############################################################ PRAGMAS
+
+# Optional: You can override the default pragmas (shown below)
+
+DTRACE_PRAGMA="
+ option quiet
+ option aggsortrev
+" # END-QUOTE
+
+############################################################ PROBE
+
+: ${PROBE:=profile:::tick-3s}
+
+############################################################ ACTIONS
+
+exec 9<<EOF
+BEGIN { printf("Sampling ...") } /* probe ID $ID */
+
+syscall:::entry /* probe ID $(( $ID + 1 )) */
+{
+ @num[probefunc,execname] = count();
+}
+
+END { trunc(@num) } /* probe ID $(( $ID + 2 )) */
+EOF
+ACTIONS=$( cat <&9 )
+ID=$(( $ID + 3 ))
+
+############################################################ EVENT TAG
+
+# The EVENT_TAG is run inside the print action after the timestamp has been
+# printed. By default, `UID.GID CMD[PID]: ' of the process is printed.
+#
+# Here we override the default EVENT_TAG to include ANSI cursor-homing and
+# screen-clearing codes.
+
+size=$( stty size 2> /dev/null )
+rows="${size%% *}"
+cols="${size#* }"
+
+exec 9<<EOF
+ printf("\033[H"); /* Position the cursor at top-left */
+ printf("\033[J"); /* Clear display from cursor to end */
+
+ /* Header line containing probe (left) and date (right) */
+ printf("%-*s%s%Y%s\n",
+ $(( ${cols:-80} - 20 )), "$PROBE",
+ console ? "\033[32m" : "",
+ walltimestamp,
+ console ? "\033[39m" : "");
+
+ /* Column headers */
+ printf("%s%8s %-20s %s%s\n",
+ console ? "\033[1m" : "",
+ "COUNT",
+ "SYSCALL",
+ "EXECNAME",
+ console ? "\033[22m" : "");
+EOF
+EVENT_TAG=$( cat <&9 )
+
+############################################################ EVENT DETAILS
+
+exec 9<<EOF
+ printa("%@8u %-20s %s\n", @num);
+ trunc(@num);
+EOF
+EVENT_DETAILS=$( cat <&9 )
+
+################################################################################
+# END
+################################################################################
Modified: projects/clang700-import/cddl/usr.sbin/dwatch/libexec/vop_readdir
==============================================================================
--- projects/clang700-import/cddl/usr.sbin/dwatch/libexec/vop_readdir Sat Aug 11 10:42:12 2018 (r337615)
+++ projects/clang700-import/cddl/usr.sbin/dwatch/libexec/vop_readdir Sat Aug 11 10:49:43 2018 (r337616)
@@ -163,6 +163,7 @@ $PROBE /this->fi_mount != 0/ /* probe ID $(( $ID + $MA
this->path = strjoin(this->path, strjoin(this->name =
(this->d_name != 0 ? this->d_name : ""),
this->name != "" ? "/" : ""));
+}
EOF
ACTIONS=$( cat <&9 )
ID=$(( $ID + $MAX_DEPTH + 5 ))
Modified: projects/clang700-import/contrib/pf/pflogd/pflogd.8
==============================================================================
--- projects/clang700-import/contrib/pf/pflogd/pflogd.8 Sat Aug 11 10:42:12 2018 (r337615)
+++ projects/clang700-import/contrib/pf/pflogd/pflogd.8 Sat Aug 11 10:49:43 2018 (r337616)
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 22 2008
+.Dd August 11, 2018
.Dt PFLOGD 8
.Os
.Sh NAME
@@ -35,7 +35,7 @@
.Sh SYNOPSIS
.Nm pflogd
.Bk -words
-.Op Fl Dx
+.Op Fl \&Dx
.Op Fl d Ar delay
.Op Fl f Ar filename
.Op Fl i Ar interface
Modified: projects/clang700-import/sbin/ifconfig/ifieee80211.c
==============================================================================
--- projects/clang700-import/sbin/ifconfig/ifieee80211.c Sat Aug 11 10:42:12 2018 (r337615)
+++ projects/clang700-import/sbin/ifconfig/ifieee80211.c Sat Aug 11 10:49:43 2018 (r337616)
@@ -3496,7 +3496,7 @@ list_scan(int s)
uint8_t buf[24*1024];
char ssid[IEEE80211_NWID_LEN+1];
const uint8_t *cp;
- int len, ssidmax, idlen;
+ int len, idlen;
if (get80211len(s, IEEE80211_IOC_SCAN_RESULTS, buf, sizeof(buf), &len) < 0)
errx(1, "unable to get scan results");
@@ -3505,9 +3505,8 @@ list_scan(int s)
getchaninfo(s);
- ssidmax = verbose ? IEEE80211_NWID_LEN : 32;
printf("%-*.*s %-17.17s %4s %4s %-7s %3s %4s\n"
- , ssidmax, ssidmax, "SSID/MESH ID"
+ , IEEE80211_NWID_LEN, IEEE80211_NWID_LEN, "SSID/MESH ID"
, "BSSID"
, "CHAN"
, "RATE"
@@ -3530,8 +3529,8 @@ list_scan(int s)
idlen = sr->isr_ssid_len;
}
printf("%-*.*s %s %3d %3dM %4d:%-4d %4d %-4.4s"
- , ssidmax
- , copy_essid(ssid, ssidmax, idp, idlen)
+ , IEE80211_NWID_LEN
+ , copy_essid(ssid, IEE80211_NWID_LEN, idp, idlen)
, ssid
, ether_ntoa((const struct ether_addr *) sr->isr_bssid)
, ieee80211_mhz2ieee(sr->isr_freq, sr->isr_flags)
Modified: projects/clang700-import/sbin/mount_cd9660/mount_cd9660.8
==============================================================================
--- projects/clang700-import/sbin/mount_cd9660/mount_cd9660.8 Sat Aug 11 10:42:12 2018 (r337615)
+++ projects/clang700-import/sbin/mount_cd9660/mount_cd9660.8 Sat Aug 11 10:49:43 2018 (r337616)
@@ -32,7 +32,7 @@
.\" @(#)mount_cd9660.8 8.3 (Berkeley) 3/27/94
.\" $FreeBSD$
.\"
-.Dd March 22, 2017
+.Dd August 11, 2018
.Dt MOUNT_CD9660 8
.Os
.Sh NAME
@@ -140,6 +140,7 @@ The following command can be used to mount a Kodak Pho
.Xr unmount 2 ,
.Xr cd9660 5 ,
.Xr fstab 5 ,
+.Xr mdconfig 8 ,
.Xr mount 8
.Sh HISTORY
The
Modified: projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
==============================================================================
--- projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Sat Aug 11 10:42:12 2018 (r337615)
+++ projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c Sat Aug 11 10:49:43 2018 (r337616)
@@ -4371,18 +4371,14 @@ spa_add_l2cache(spa_t *spa, nvlist_t *config)
}
static void
-spa_add_feature_stats(spa_t *spa, nvlist_t *config)
+spa_feature_stats_from_disk(spa_t *spa, nvlist_t *features)
{
- nvlist_t *features;
zap_cursor_t zc;
zap_attribute_t za;
- ASSERT(spa_config_held(spa, SCL_CONFIG, RW_READER));
- VERIFY(nvlist_alloc(&features, NV_UNIQUE_NAME, KM_SLEEP) == 0);
-
/* We may be unable to read features if pool is suspended. */
if (spa_suspended(spa))
- goto out;
+ return;
if (spa->spa_feat_for_read_obj != 0) {
for (zap_cursor_init(&zc, spa->spa_meta_objset,
@@ -4391,7 +4387,7 @@ spa_add_feature_stats(spa_t *spa, nvlist_t *config)
zap_cursor_advance(&zc)) {
ASSERT(za.za_integer_length == sizeof (uint64_t) &&
za.za_num_integers == 1);
- VERIFY3U(0, ==, nvlist_add_uint64(features, za.za_name,
+ VERIFY0(nvlist_add_uint64(features, za.za_name,
za.za_first_integer));
}
zap_cursor_fini(&zc);
@@ -4404,16 +4400,62 @@ spa_add_feature_stats(spa_t *spa, nvlist_t *config)
zap_cursor_advance(&zc)) {
ASSERT(za.za_integer_length == sizeof (uint64_t) &&
za.za_num_integers == 1);
- VERIFY3U(0, ==, nvlist_add_uint64(features, za.za_name,
+ VERIFY0(nvlist_add_uint64(features, za.za_name,
za.za_first_integer));
}
zap_cursor_fini(&zc);
}
+}
-out:
- VERIFY(nvlist_add_nvlist(config, ZPOOL_CONFIG_FEATURE_STATS,
- features) == 0);
- nvlist_free(features);
+static void
+spa_feature_stats_from_cache(spa_t *spa, nvlist_t *features)
+{
+ int i;
+
+ for (i = 0; i < SPA_FEATURES; i++) {
+ zfeature_info_t feature = spa_feature_table[i];
+ uint64_t refcount;
+
+ if (feature_get_refcount(spa, &feature, &refcount) != 0)
+ continue;
+
+ VERIFY0(nvlist_add_uint64(features, feature.fi_guid, refcount));
+ }
+}
+
+/*
+ * Store a list of pool features and their reference counts in the
+ * config.
+ *
+ * The first time this is called on a spa, allocate a new nvlist, fetch
+ * the pool features and reference counts from disk, then save the list
+ * in the spa. In subsequent calls on the same spa use the saved nvlist
+ * and refresh its values from the cached reference counts. This
+ * ensures we don't block here on I/O on a suspended pool so 'zpool
+ * clear' can resume the pool.
+ */
+static void
+spa_add_feature_stats(spa_t *spa, nvlist_t *config)
+{
+ nvlist_t *features;
+
+ ASSERT(spa_config_held(spa, SCL_CONFIG, RW_READER));
+
+ mutex_enter(&spa->spa_feat_stats_lock);
+ features = spa->spa_feat_stats;
+
+ if (features != NULL) {
+ spa_feature_stats_from_cache(spa, features);
+ } else {
+ VERIFY0(nvlist_alloc(&features, NV_UNIQUE_NAME, KM_SLEEP));
+ spa->spa_feat_stats = features;
+ spa_feature_stats_from_disk(spa, features);
+ }
+
+ VERIFY0(nvlist_add_nvlist(config, ZPOOL_CONFIG_FEATURE_STATS,
+ features));
+
+ mutex_exit(&spa->spa_feat_stats_lock);
}
int
Modified: projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
==============================================================================
--- projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c Sat Aug 11 10:42:12 2018 (r337615)
+++ projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c Sat Aug 11 10:49:43 2018 (r337616)
@@ -708,6 +708,7 @@ spa_add(const char *name, nvlist_t *config, const char
mutex_init(&spa->spa_scrub_lock, NULL, MUTEX_DEFAULT, NULL);
mutex_init(&spa->spa_suspend_lock, NULL, MUTEX_DEFAULT, NULL);
mutex_init(&spa->spa_vdev_top_lock, NULL, MUTEX_DEFAULT, NULL);
+ mutex_init(&spa->spa_feat_stats_lock, NULL, MUTEX_DEFAULT, NULL);
cv_init(&spa->spa_async_cv, NULL, CV_DEFAULT, NULL);
cv_init(&spa->spa_evicting_os_cv, NULL, CV_DEFAULT, NULL);
@@ -881,6 +882,7 @@ spa_remove(spa_t *spa)
nvlist_free(spa->spa_label_features);
nvlist_free(spa->spa_load_info);
+ nvlist_free(spa->spa_feat_stats);
spa_config_set(spa, NULL);
#ifdef illumos
@@ -922,6 +924,7 @@ spa_remove(spa_t *spa)
mutex_destroy(&spa->spa_scrub_lock);
mutex_destroy(&spa->spa_suspend_lock);
mutex_destroy(&spa->spa_vdev_top_lock);
+ mutex_destroy(&spa->spa_feat_stats_lock);
kmem_free(spa, sizeof (spa_t));
}
Modified: projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
==============================================================================
--- projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h Sat Aug 11 10:42:12 2018 (r337615)
+++ projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h Sat Aug 11 10:49:43 2018 (r337616)
@@ -360,6 +360,8 @@ struct spa {
uint64_t spa_feat_for_read_obj; /* required to read from pool */
uint64_t spa_feat_desc_obj; /* Feature descriptions */
uint64_t spa_feat_enabled_txg_obj; /* Feature enabled txg */
+ kmutex_t spa_feat_stats_lock; /* protects spa_feat_stats */
+ nvlist_t *spa_feat_stats; /* Cache of enabled features */
/* cache feature refcounts */
uint64_t spa_feat_refcount_cache[SPA_FEATURES];
#ifdef illumos
Modified: projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
==============================================================================
--- projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c Sat Aug 11 10:42:12 2018 (r337615)
+++ projects/clang700-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c Sat Aug 11 10:49:43 2018 (r337616)
@@ -220,7 +220,7 @@ spa_features_check(spa_t *spa, boolean_t for_write,
*
* Note: well-designed features will not need to use this; they should
* use spa_feature_is_enabled() and spa_feature_is_active() instead.
- * However, this is non-static for zdb and zhack.
+ * However, this is non-static for zdb, zhack, and spa_add_feature_stats().
*/
int
feature_get_refcount(spa_t *spa, zfeature_info_t *feature, uint64_t *res)
Modified: projects/clang700-import/sys/dev/cxgbe/adapter.h
==============================================================================
--- projects/clang700-import/sys/dev/cxgbe/adapter.h Sat Aug 11 10:42:12 2018 (r337615)
+++ projects/clang700-import/sys/dev/cxgbe/adapter.h Sat Aug 11 10:49:43 2018 (r337616)
@@ -670,6 +670,7 @@ struct sge_wrq {
#define INVALID_NM_RXQ_CNTXT_ID ((uint16_t)(-1))
struct sge_nm_rxq {
+ volatile int nm_state; /* NM_OFF, NM_ON, or NM_BUSY */
struct vi_info *vi;
struct iq_desc *iq_desc;
@@ -797,7 +798,6 @@ struct adapter {
struct irq {
struct resource *res;
int rid;
- volatile int nm_state; /* NM_OFF, NM_ON, or NM_BUSY */
void *tag;
struct sge_rxq *rxq;
struct sge_nm_rxq *nm_rxq;
@@ -1186,9 +1186,10 @@ void release_tid(struct adapter *, int, struct sge_wrq
#ifdef DEV_NETMAP
/* t4_netmap.c */
+struct sge_nm_rxq;
void cxgbe_nm_attach(struct vi_info *);
void cxgbe_nm_detach(struct vi_info *);
-void t4_nm_intr(void *);
+void service_nm_rxq(struct sge_nm_rxq *);
#endif
/* t4_sge.c */
@@ -1207,7 +1208,10 @@ int t4_setup_vi_queues(struct vi_info *);
int t4_teardown_vi_queues(struct vi_info *);
void t4_intr_all(void *);
void t4_intr(void *);
+#ifdef DEV_NETMAP
+void t4_nm_intr(void *);
void t4_vi_intr(void *);
+#endif
void t4_intr_err(void *);
void t4_intr_evt(void *);
void t4_wrq_tx_locked(struct adapter *, struct sge_wrq *, struct wrqe *);
Modified: projects/clang700-import/sys/dev/cxgbe/t4_main.c
==============================================================================
--- projects/clang700-import/sys/dev/cxgbe/t4_main.c Sat Aug 11 10:42:12 2018 (r337615)
+++ projects/clang700-import/sys/dev/cxgbe/t4_main.c Sat Aug 11 10:49:43 2018 (r337616)
@@ -684,8 +684,8 @@ struct {
#ifdef TCP_OFFLOAD
/*
- * service_iq() has an iq and needs the fl. Offset of fl from the iq should be
- * exactly the same for both rxq and ofld_rxq.
+ * service_iq_fl() has an iq and needs the fl. Offset of fl from the iq should
+ * be exactly the same for both rxq and ofld_rxq.
*/
CTASSERT(offsetof(struct sge_ofld_rxq, iq) == offsetof(struct sge_rxq, iq));
CTASSERT(offsetof(struct sge_ofld_rxq, fl) == offsetof(struct sge_rxq, fl));
@@ -4819,9 +4819,26 @@ t4_setup_intr_handlers(struct adapter *sc)
#ifdef DEV_NETMAP
if (q < vi->nnmrxq)
irq->nm_rxq = nm_rxq++;
+
+ if (irq->nm_rxq != NULL &&
+ irq->rxq == NULL) {
+ /* Netmap rx only */
+ rc = t4_alloc_irq(sc, irq, rid,
+ t4_nm_intr, irq->nm_rxq, s);
+ }
+ if (irq->nm_rxq != NULL &&
+ irq->rxq != NULL) {
+ /* NIC and Netmap rx */
+ rc = t4_alloc_irq(sc, irq, rid,
+ t4_vi_intr, irq, s);
+ }
#endif
- rc = t4_alloc_irq(sc, irq, rid,
- t4_vi_intr, irq, s);
+ if (irq->rxq != NULL &&
+ irq->nm_rxq == NULL) {
+ /* NIC rx only */
+ rc = t4_alloc_irq(sc, irq, rid,
+ t4_intr, irq->rxq, s);
+ }
if (rc != 0)
return (rc);
#ifdef RSS
Modified: projects/clang700-import/sys/dev/cxgbe/t4_netmap.c
==============================================================================
--- projects/clang700-import/sys/dev/cxgbe/t4_netmap.c Sat Aug 11 10:42:12 2018 (r337615)
+++ projects/clang700-import/sys/dev/cxgbe/t4_netmap.c Sat Aug 11 10:49:43 2018 (r337616)
@@ -358,8 +358,6 @@ cxgbe_netmap_on(struct adapter *sc, struct vi_info *vi
nm_set_native_flags(na);
for_each_nm_rxq(vi, i, nm_rxq) {
- struct irq *irq = &sc->irq[vi->first_intr + i];
-
kring = na->rx_rings[nm_rxq->nid];
if (!nm_kring_pending_on(kring) ||
nm_rxq->iq_cntxt_id != INVALID_NM_RXQ_CNTXT_ID)
@@ -387,7 +385,7 @@ cxgbe_netmap_on(struct adapter *sc, struct vi_info *vi
t4_write_reg(sc, sc->sge_kdoorbell_reg,
nm_rxq->fl_db_val | V_PIDX(j));
- atomic_cmpset_int(&irq->nm_state, NM_OFF, NM_ON);
+ atomic_cmpset_int(&nm_rxq->nm_state, NM_OFF, NM_ON);
}
for_each_nm_txq(vi, i, nm_txq) {
@@ -459,14 +457,12 @@ cxgbe_netmap_off(struct adapter *sc, struct vi_info *v
free_nm_txq_hwq(vi, nm_txq);
}
for_each_nm_rxq(vi, i, nm_rxq) {
- struct irq *irq = &sc->irq[vi->first_intr + i];
-
kring = na->rx_rings[nm_rxq->nid];
if (!nm_kring_pending_off(kring) ||
nm_rxq->iq_cntxt_id == INVALID_NM_RXQ_CNTXT_ID)
continue;
- while (!atomic_cmpset_int(&irq->nm_state, NM_ON, NM_OFF))
+ while (!atomic_cmpset_int(&nm_rxq->nm_state, NM_ON, NM_OFF))
pause("nmst", 1);
free_nm_rxq_hwq(vi, nm_rxq);
@@ -955,9 +951,8 @@ handle_nm_sge_egr_update(struct adapter *sc, struct if
}
void
-t4_nm_intr(void *arg)
+service_nm_rxq(struct sge_nm_rxq *nm_rxq)
{
- struct sge_nm_rxq *nm_rxq = arg;
struct vi_info *vi = nm_rxq->vi;
struct adapter *sc = vi->pi->adapter;
struct ifnet *ifp = vi->ifp;
Modified: projects/clang700-import/sys/dev/cxgbe/t4_sge.c
==============================================================================
--- projects/clang700-import/sys/dev/cxgbe/t4_sge.c Sat Aug 11 10:42:12 2018 (r337615)
+++ projects/clang700-import/sys/dev/cxgbe/t4_sge.c Sat Aug 11 10:49:43 2018 (r337616)
@@ -204,6 +204,7 @@ struct sgl {
};
static int service_iq(struct sge_iq *, int);
+static int service_iq_fl(struct sge_iq *, int);
static struct mbuf *get_fl_payload(struct adapter *, struct sge_fl *, uint32_t);
static int t4_eth_rx(struct sge_iq *, const struct rss_header *, struct mbuf *);
static inline void init_iq(struct sge_iq *, struct adapter *, int, int, int);
@@ -1333,8 +1334,12 @@ t4_teardown_vi_queues(struct vi_info *vi)
}
/*
- * Deals with errors and the firmware event queue. All data rx queues forward
- * their interrupt to the firmware event queue.
+ * Interrupt handler when the driver is using only 1 interrupt. This is a very
+ * unusual scenario.
+ *
+ * a) Deals with errors, if any.
+ * b) Services firmware event queue, which is taking interrupts for all other
+ * queues.
*/
void
t4_intr_all(void *arg)
@@ -1342,14 +1347,16 @@ t4_intr_all(void *arg)
struct adapter *sc = arg;
struct sge_iq *fwq = &sc->sge.fwq;
+ MPASS(sc->intr_count == 1);
+
t4_intr_err(arg);
- if (atomic_cmpset_int(&fwq->state, IQS_IDLE, IQS_BUSY)) {
- service_iq(fwq, 0);
- atomic_cmpset_int(&fwq->state, IQS_BUSY, IQS_IDLE);
- }
+ t4_intr_evt(fwq);
}
-/* Deals with error interrupts */
+/*
+ * Interrupt handler for errors (installed directly when multiple interrupts are
+ * being used, or called by t4_intr_all).
+ */
void
t4_intr_err(void *arg)
{
@@ -1359,6 +1366,10 @@ t4_intr_err(void *arg)
t4_slow_intr_handler(sc);
}
+/*
+ * Interrupt handler for iq-only queues. The firmware event queue is the only
+ * such queue right now.
+ */
void
t4_intr_evt(void *arg)
{
@@ -1370,90 +1381,74 @@ t4_intr_evt(void *arg)
}
}
+/*
+ * Interrupt handler for iq+fl queues.
+ */
void
t4_intr(void *arg)
{
struct sge_iq *iq = arg;
if (atomic_cmpset_int(&iq->state, IQS_IDLE, IQS_BUSY)) {
- service_iq(iq, 0);
+ service_iq_fl(iq, 0);
atomic_cmpset_int(&iq->state, IQS_BUSY, IQS_IDLE);
}
}
+#ifdef DEV_NETMAP
+/*
+ * Interrupt handler for netmap rx queues.
+ */
void
-t4_vi_intr(void *arg)
+t4_nm_intr(void *arg)
{
- struct irq *irq = arg;
+ struct sge_nm_rxq *nm_rxq = arg;
-#ifdef DEV_NETMAP
- if (atomic_cmpset_int(&irq->nm_state, NM_ON, NM_BUSY)) {
- t4_nm_intr(irq->nm_rxq);
- atomic_cmpset_int(&irq->nm_state, NM_BUSY, NM_ON);
+ if (atomic_cmpset_int(&nm_rxq->nm_state, NM_ON, NM_BUSY)) {
+ service_nm_rxq(nm_rxq);
+ atomic_cmpset_int(&nm_rxq->nm_state, NM_BUSY, NM_ON);
}
-#endif
- if (irq->rxq != NULL)
- t4_intr(irq->rxq);
}
-static inline int
-sort_before_lro(struct lro_ctrl *lro)
+/*
+ * Interrupt handler for vectors shared between NIC and netmap rx queues.
+ */
+void
+t4_vi_intr(void *arg)
{
+ struct irq *irq = arg;
- return (lro->lro_mbuf_max != 0);
+ MPASS(irq->nm_rxq != NULL);
+ t4_nm_intr(irq->nm_rxq);
+
+ MPASS(irq->rxq != NULL);
+ t4_intr(irq->rxq);
}
+#endif
/*
- * Deals with anything and everything on the given ingress queue.
+ * Deals with interrupts on an iq-only (no freelist) queue.
*/
static int
service_iq(struct sge_iq *iq, int budget)
{
struct sge_iq *q;
- struct sge_rxq *rxq = iq_to_rxq(iq); /* Use iff iq is part of rxq */
- struct sge_fl *fl; /* Use iff IQ_HAS_FL */
struct adapter *sc = iq->adapter;
struct iq_desc *d = &iq->desc[iq->cidx];
int ndescs = 0, limit;
- int rsp_type, refill;
+ int rsp_type;
uint32_t lq;
- uint16_t fl_hw_cidx;
- struct mbuf *m0;
STAILQ_HEAD(, sge_iq) iql = STAILQ_HEAD_INITIALIZER(iql);
-#if defined(INET) || defined(INET6)
- const struct timeval lro_timeout = {0, sc->lro_timeout};
- struct lro_ctrl *lro = &rxq->lro;
-#endif
KASSERT(iq->state == IQS_BUSY, ("%s: iq %p not BUSY", __func__, iq));
+ KASSERT((iq->flags & IQ_HAS_FL) == 0,
+ ("%s: called for iq %p with fl (iq->flags 0x%x)", __func__, iq,
+ iq->flags));
+ MPASS((iq->flags & IQ_ADJ_CREDIT) == 0);
+ MPASS((iq->flags & IQ_LRO_ENABLED) == 0);
limit = budget ? budget : iq->qsize / 16;
- if (iq->flags & IQ_HAS_FL) {
- fl = &rxq->fl;
- fl_hw_cidx = fl->hw_cidx; /* stable snapshot */
- } else {
- fl = NULL;
- fl_hw_cidx = 0; /* to silence gcc warning */
- }
-
-#if defined(INET) || defined(INET6)
- if (iq->flags & IQ_ADJ_CREDIT) {
- MPASS(sort_before_lro(lro));
- iq->flags &= ~IQ_ADJ_CREDIT;
- if ((d->rsp.u.type_gen & F_RSPD_GEN) != iq->gen) {
- tcp_lro_flush_all(lro);
- t4_write_reg(sc, sc->sge_gts_reg, V_CIDXINC(1) |
- V_INGRESSQID((u32)iq->cntxt_id) |
- V_SEINTARM(iq->intr_params));
- return (0);
- }
- ndescs = 1;
- }
-#else
- MPASS((iq->flags & IQ_ADJ_CREDIT) == 0);
-#endif
-
/*
* We always come back and check the descriptor ring for new indirect
* interrupts and other responses after running a single handler.
@@ -1463,74 +1458,40 @@ service_iq(struct sge_iq *iq, int budget)
rmb();
- refill = 0;
- m0 = NULL;
rsp_type = G_RSPD_TYPE(d->rsp.u.type_gen);
lq = be32toh(d->rsp.pldbuflen_qid);
switch (rsp_type) {
case X_RSPD_TYPE_FLBUF:
+ panic("%s: data for an iq (%p) with no freelist",
+ __func__, iq);
- KASSERT(iq->flags & IQ_HAS_FL,
- ("%s: data for an iq (%p) with no freelist",
- __func__, iq));
+ /* NOTREACHED */
- m0 = get_fl_payload(sc, fl, lq);
- if (__predict_false(m0 == NULL))
- goto process_iql;
- refill = IDXDIFF(fl->hw_cidx, fl_hw_cidx, fl->sidx) > 2;
-#ifdef T4_PKT_TIMESTAMP
- /*
- * 60 bit timestamp for the payload is
- * *(uint64_t *)m0->m_pktdat. Note that it is
- * in the leading free-space in the mbuf. The
- * kernel can clobber it during a pullup,
- * m_copymdata, etc. You need to make sure that
- * the mbuf reaches you unmolested if you care
- * about the timestamp.
- */
- *(uint64_t *)m0->m_pktdat =
- be64toh(ctrl->u.last_flit) &
- 0xfffffffffffffff;
-#endif
-
- /* fall through */
-
case X_RSPD_TYPE_CPL:
KASSERT(d->rss.opcode < NUM_CPL_CMDS,
("%s: bad opcode %02x.", __func__,
d->rss.opcode));
- t4_cpl_handler[d->rss.opcode](iq, &d->rss, m0);
+ t4_cpl_handler[d->rss.opcode](iq, &d->rss, NULL);
break;
case X_RSPD_TYPE_INTR:
-
/*
- * Interrupts should be forwarded only to queues
- * that are not forwarding their interrupts.
- * This means service_iq can recurse but only 1
- * level deep.
- */
- KASSERT(budget == 0,
- ("%s: budget %u, rsp_type %u", __func__,
- budget, rsp_type));
-
- /*
* There are 1K interrupt-capable queues (qids 0
* through 1023). A response type indicating a
* forwarded interrupt with a qid >= 1K is an
* iWARP async notification.
*/
- if (lq >= 1024) {
- t4_an_handler(iq, &d->rsp);
- break;
- }
+ if (__predict_true(lq >= 1024)) {
+ t4_an_handler(iq, &d->rsp);
+ break;
+ }
q = sc->sge.iqmap[lq - sc->sge.iq_start -
sc->sge.iq_base];
if (atomic_cmpset_int(&q->state, IQS_IDLE,
IQS_BUSY)) {
- if (service_iq(q, q->qsize / 16) == 0) {
+ if (service_iq_fl(q, q->qsize / 16) == 0) {
atomic_cmpset_int(&q->state,
IQS_BUSY, IQS_IDLE);
} else {
@@ -1563,33 +1524,12 @@ service_iq(struct sge_iq *iq, int budget)
V_SEINTARM(V_QINTR_TIMER_IDX(X_TIMERREG_UPDATE_CIDX)));
ndescs = 0;
-#if defined(INET) || defined(INET6)
- if (iq->flags & IQ_LRO_ENABLED &&
- !sort_before_lro(lro) &&
- sc->lro_timeout != 0) {
- tcp_lro_flush_inactive(lro,
- &lro_timeout);
- }
-#endif
-
if (budget) {
- if (iq->flags & IQ_HAS_FL) {
- FL_LOCK(fl);
- refill_fl(sc, fl, 32);
- FL_UNLOCK(fl);
- }
return (EINPROGRESS);
}
}
- if (refill) {
- FL_LOCK(fl);
- refill_fl(sc, fl, 32);
- FL_UNLOCK(fl);
- fl_hw_cidx = fl->hw_cidx;
- }
}
-process_iql:
if (STAILQ_EMPTY(&iql))
break;
@@ -1599,13 +1539,168 @@ process_iql:
*/
q = STAILQ_FIRST(&iql);
STAILQ_REMOVE_HEAD(&iql, link);
- if (service_iq(q, q->qsize / 8) == 0)
+ if (service_iq_fl(q, q->qsize / 8) == 0)
atomic_cmpset_int(&q->state, IQS_BUSY, IQS_IDLE);
else
STAILQ_INSERT_TAIL(&iql, q, link);
}
+ t4_write_reg(sc, sc->sge_gts_reg, V_CIDXINC(ndescs) |
+ V_INGRESSQID((u32)iq->cntxt_id) | V_SEINTARM(iq->intr_params));
+
+ return (0);
+}
+
+static inline int
+sort_before_lro(struct lro_ctrl *lro)
+{
+
+ return (lro->lro_mbuf_max != 0);
+}
+
+/*
+ * Deals with interrupts on an iq+fl queue.
+ */
+static int
+service_iq_fl(struct sge_iq *iq, int budget)
+{
+ struct sge_rxq *rxq = iq_to_rxq(iq);
+ struct sge_fl *fl;
+ struct adapter *sc = iq->adapter;
+ struct iq_desc *d = &iq->desc[iq->cidx];
+ int ndescs = 0, limit;
+ int rsp_type, refill, starved;
+ uint32_t lq;
+ uint16_t fl_hw_cidx;
+ struct mbuf *m0;
#if defined(INET) || defined(INET6)
+ const struct timeval lro_timeout = {0, sc->lro_timeout};
+ struct lro_ctrl *lro = &rxq->lro;
+#endif
+
+ KASSERT(iq->state == IQS_BUSY, ("%s: iq %p not BUSY", __func__, iq));
+ MPASS(iq->flags & IQ_HAS_FL);
+
+ limit = budget ? budget : iq->qsize / 16;
+ fl = &rxq->fl;
+ fl_hw_cidx = fl->hw_cidx; /* stable snapshot */
+
+#if defined(INET) || defined(INET6)
+ if (iq->flags & IQ_ADJ_CREDIT) {
+ MPASS(sort_before_lro(lro));
+ iq->flags &= ~IQ_ADJ_CREDIT;
+ if ((d->rsp.u.type_gen & F_RSPD_GEN) != iq->gen) {
+ tcp_lro_flush_all(lro);
+ t4_write_reg(sc, sc->sge_gts_reg, V_CIDXINC(1) |
+ V_INGRESSQID((u32)iq->cntxt_id) |
+ V_SEINTARM(iq->intr_params));
+ return (0);
+ }
+ ndescs = 1;
+ }
+#else
+ MPASS((iq->flags & IQ_ADJ_CREDIT) == 0);
+#endif
+
+ while ((d->rsp.u.type_gen & F_RSPD_GEN) == iq->gen) {
+
+ rmb();
+
+ refill = 0;
+ m0 = NULL;
+ rsp_type = G_RSPD_TYPE(d->rsp.u.type_gen);
+ lq = be32toh(d->rsp.pldbuflen_qid);
+
+ switch (rsp_type) {
+ case X_RSPD_TYPE_FLBUF:
+
+ m0 = get_fl_payload(sc, fl, lq);
+ if (__predict_false(m0 == NULL))
+ goto out;
+ refill = IDXDIFF(fl->hw_cidx, fl_hw_cidx, fl->sidx) > 2;
+#ifdef T4_PKT_TIMESTAMP
+ /*
+ * 60 bit timestamp for the payload is
+ * *(uint64_t *)m0->m_pktdat. Note that it is
+ * in the leading free-space in the mbuf. The
+ * kernel can clobber it during a pullup,
+ * m_copymdata, etc. You need to make sure that
+ * the mbuf reaches you unmolested if you care
+ * about the timestamp.
+ */
+ *(uint64_t *)m0->m_pktdat =
+ be64toh(ctrl->u.last_flit) & 0xfffffffffffffff;
+#endif
+
+ /* fall through */
+
+ case X_RSPD_TYPE_CPL:
+ KASSERT(d->rss.opcode < NUM_CPL_CMDS,
+ ("%s: bad opcode %02x.", __func__, d->rss.opcode));
+ t4_cpl_handler[d->rss.opcode](iq, &d->rss, m0);
+ break;
+
+ case X_RSPD_TYPE_INTR:
+
+ /*
+ * There are 1K interrupt-capable queues (qids 0
+ * through 1023). A response type indicating a
+ * forwarded interrupt with a qid >= 1K is an
+ * iWARP async notification. That is the only
+ * acceptable indirect interrupt on this queue.
+ */
+ if (__predict_false(lq < 1024)) {
+ panic("%s: indirect interrupt on iq_fl %p "
+ "with qid %u", __func__, iq, lq);
+ }
+
+ t4_an_handler(iq, &d->rsp);
+ break;
+
+ default:
+ KASSERT(0, ("%s: illegal response type %d on iq %p",
+ __func__, rsp_type, iq));
+ log(LOG_ERR, "%s: illegal response type %d on iq %p",
+ device_get_nameunit(sc->dev), rsp_type, iq);
+ break;
+ }
+
+ d++;
+ if (__predict_false(++iq->cidx == iq->sidx)) {
+ iq->cidx = 0;
+ iq->gen ^= F_RSPD_GEN;
+ d = &iq->desc[0];
+ }
+ if (__predict_false(++ndescs == limit)) {
+ t4_write_reg(sc, sc->sge_gts_reg, V_CIDXINC(ndescs) |
+ V_INGRESSQID(iq->cntxt_id) |
+ V_SEINTARM(V_QINTR_TIMER_IDX(X_TIMERREG_UPDATE_CIDX)));
+ ndescs = 0;
+
+#if defined(INET) || defined(INET6)
+ if (iq->flags & IQ_LRO_ENABLED &&
+ !sort_before_lro(lro) &&
+ sc->lro_timeout != 0) {
+ tcp_lro_flush_inactive(lro, &lro_timeout);
+ }
+#endif
+ if (budget) {
+ FL_LOCK(fl);
+ refill_fl(sc, fl, 32);
+ FL_UNLOCK(fl);
+
+ return (EINPROGRESS);
+ }
+ }
+ if (refill) {
+ FL_LOCK(fl);
+ refill_fl(sc, fl, 32);
+ FL_UNLOCK(fl);
+ fl_hw_cidx = fl->hw_cidx;
+ }
+ }
+out:
+#if defined(INET) || defined(INET6)
if (iq->flags & IQ_LRO_ENABLED) {
if (ndescs > 0 && lro->lro_mbuf_count > 8) {
MPASS(sort_before_lro(lro));
@@ -1621,15 +1716,11 @@ process_iql:
t4_write_reg(sc, sc->sge_gts_reg, V_CIDXINC(ndescs) |
V_INGRESSQID((u32)iq->cntxt_id) | V_SEINTARM(iq->intr_params));
- if (iq->flags & IQ_HAS_FL) {
- int starved;
-
- FL_LOCK(fl);
- starved = refill_fl(sc, fl, 64);
- FL_UNLOCK(fl);
- if (__predict_false(starved != 0))
- add_fl_to_sfl(sc, fl);
- }
+ FL_LOCK(fl);
+ starved = refill_fl(sc, fl, 64);
+ FL_UNLOCK(fl);
+ if (__predict_false(starved != 0))
+ add_fl_to_sfl(sc, fl);
return (0);
}
Modified: projects/clang700-import/usr.bin/stat/stat.c
==============================================================================
--- projects/clang700-import/usr.bin/stat/stat.c Sat Aug 11 10:42:12 2018 (r337615)
+++ projects/clang700-import/usr.bin/stat/stat.c Sat Aug 11 10:49:43 2018 (r337616)
@@ -619,8 +619,6 @@ format1(const struct stat *st,
char *stmp, lfmt[24], tmp[20];
const char *sdata;
char smode[12], sid[12], path[PATH_MAX + 4];
- struct passwd *pw;
- struct group *gr;
const struct timespec *tsp;
struct timespec ts;
struct tm *tm;
@@ -717,9 +715,8 @@ format1(const struct stat *st,
case SHOW_st_uid:
small = (sizeof(st->st_uid) == 4);
data = st->st_uid;
- if ((pw = getpwuid(st->st_uid)) != NULL)
- sdata = pw->pw_name;
- else {
+ sdata = user_from_uid(st->st_uid, 1);
+ if (sdata == NULL) {
snprintf(sid, sizeof(sid), "(%ld)", (long)st->st_uid);
sdata = sid;
}
@@ -731,9 +728,8 @@ format1(const struct stat *st,
case SHOW_st_gid:
small = (sizeof(st->st_gid) == 4);
data = st->st_gid;
- if ((gr = getgrgid(st->st_gid)) != NULL)
- sdata = gr->gr_name;
- else {
+ sdata = group_from_gid(st->st_gid, 1);
+ if (sdata == NULL) {
snprintf(sid, sizeof(sid), "(%ld)", (long)st->st_gid);
sdata = sid;
}
More information about the svn-src-projects
mailing list