svn commit: r241889 - in user/andre/tcp_workqueue/sys: arm/arm cddl/compat/opensolaris/kern cddl/contrib/opensolaris/uts/common/dtrace cddl/contrib/opensolaris/uts/common/fs/zfs ddb dev/acpica dev/...
Andre Oppermann
andre at FreeBSD.org
Mon Oct 22 14:18:24 UTC 2012
Author: andre
Date: Mon Oct 22 14:18:22 2012
New Revision: 241889
URL: http://svn.freebsd.org/changeset/base/241889
Log:
Second pass at making global mutexes use MTX_DEF_SYSINIT().
Modified:
user/andre/tcp_workqueue/sys/arm/arm/busdma_machdep.c
user/andre/tcp_workqueue/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c
user/andre/tcp_workqueue/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
user/andre/tcp_workqueue/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
user/andre/tcp_workqueue/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
user/andre/tcp_workqueue/sys/ddb/db_script.c
user/andre/tcp_workqueue/sys/dev/acpica/acpivar.h
user/andre/tcp_workqueue/sys/dev/ath/ah_osdep.c
user/andre/tcp_workqueue/sys/dev/ipmi/ipmi_smbios.c
user/andre/tcp_workqueue/sys/dev/ppbus/if_plip.c
user/andre/tcp_workqueue/sys/dev/sbni/if_sbni.c
user/andre/tcp_workqueue/sys/dev/snp/snp.c
user/andre/tcp_workqueue/sys/dev/sound/pcm/channel.c
user/andre/tcp_workqueue/sys/fs/devfs/devfs_dir.c
user/andre/tcp_workqueue/sys/fs/devfs/devfs_vnops.c
user/andre/tcp_workqueue/sys/fs/nfsclient/nfs_clvnops.c
user/andre/tcp_workqueue/sys/geom/journal/g_journal.c
user/andre/tcp_workqueue/sys/mips/atheros/if_arge.c
user/andre/tcp_workqueue/sys/mips/cavium/octe/ethernet-mdio.c
user/andre/tcp_workqueue/sys/mips/cavium/octe/ethernet-rgmii.c
user/andre/tcp_workqueue/sys/mips/mips/busdma_machdep.c
user/andre/tcp_workqueue/sys/mips/sibyte/sb_zbbus.c
user/andre/tcp_workqueue/sys/netinet/tcp_syncache.c
user/andre/tcp_workqueue/sys/pc98/cbus/cbus_dma.c
user/andre/tcp_workqueue/sys/security/mac/mac_net.c
user/andre/tcp_workqueue/sys/ufs/ffs/ffs_snapshot.c
user/andre/tcp_workqueue/sys/ufs/ffs/ffs_softdep.c
user/andre/tcp_workqueue/sys/x86/isa/isa_dma.c
user/andre/tcp_workqueue/sys/xen/evtchn/evtchn.c
user/andre/tcp_workqueue/sys/xen/gnttab.c
Modified: user/andre/tcp_workqueue/sys/arm/arm/busdma_machdep.c
==============================================================================
--- user/andre/tcp_workqueue/sys/arm/arm/busdma_machdep.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/arm/arm/busdma_machdep.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -163,9 +163,7 @@ static TAILQ_HEAD(,bus_dmamap) dmamap_fr
#define BUSDMA_STATIC_MAPS 500
static struct bus_dmamap map_pool[BUSDMA_STATIC_MAPS];
-static struct mtx busdma_mtx;
-
-MTX_SYSINIT(busdma_mtx, &busdma_mtx, "busdma lock", MTX_DEF);
+static MTX_DEF_SYSINIT(busdma_mtx, "busdma lock", MTX_DEF);
static void init_bounce_pages(void *dummy);
static int alloc_bounce_zone(bus_dma_tag_t dmat);
Modified: user/andre/tcp_workqueue/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c
==============================================================================
--- user/andre/tcp_workqueue/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -35,8 +35,7 @@ __FBSDID("$FreeBSD$");
#ifdef _KERNEL
#include <sys/kernel.h>
-struct mtx atomic_mtx;
-MTX_SYSINIT(atomic, &atomic_mtx, "atomic", MTX_DEF);
+MTX_DEF_SYSINIT(atomic_mtx, "atomic", MTX_DEF);
#else
#include <pthread.h>
Modified: user/andre/tcp_workqueue/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
==============================================================================
--- user/andre/tcp_workqueue/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -58,8 +58,7 @@ struct kmem_item {
LIST_ENTRY(kmem_item) next;
};
static LIST_HEAD(, kmem_item) kmem_items;
-static struct mtx kmem_items_mtx;
-MTX_SYSINIT(kmem_items_mtx, &kmem_items_mtx, "kmem_items", MTX_DEF);
+static MTX_DEF_SYSINIT(kmem_items_mtx, "kmem_items", MTX_DEF);
#endif /* KMEM_DEBUG */
void *
Modified: user/andre/tcp_workqueue/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
==============================================================================
--- user/andre/tcp_workqueue/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -232,8 +232,7 @@ static dtrace_helpers_t *dtrace_deferred
static dtrace_enabling_t *dtrace_retained; /* list of retained enablings */
static dtrace_dynvar_t dtrace_dynhash_sink; /* end of dynamic hash chains */
#if !defined(sun)
-static struct mtx dtrace_unr_mtx;
-MTX_SYSINIT(dtrace_unr_mtx, &dtrace_unr_mtx, "Unique resource identifier", MTX_DEF);
+static MTX_DEF_SYSINIT(dtrace_unr_mtx, "Unique resource identifier", MTX_DEF);
int dtrace_in_probe; /* non-zero if executing a probe */
#if defined(__i386__) || defined(__amd64__) || defined(__mips__)
uintptr_t dtrace_in_probe_addr; /* Address of invop when already in probe */
Modified: user/andre/tcp_workqueue/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- user/andre/tcp_workqueue/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -63,8 +63,7 @@
#include <sys/jail.h>
#include "zfs_comutil.h"
-struct mtx zfs_debug_mtx;
-MTX_SYSINIT(zfs_debug_mtx, &zfs_debug_mtx, "zfs_debug", MTX_DEF);
+MTX_DEF_SYSINIT(zfs_debug_mtx, "zfs_debug", MTX_DEF);
SYSCTL_NODE(_vfs, OID_AUTO, zfs, CTLFLAG_RW, 0, "ZFS file system");
Modified: user/andre/tcp_workqueue/sys/ddb/db_script.c
==============================================================================
--- user/andre/tcp_workqueue/sys/ddb/db_script.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/ddb/db_script.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -111,8 +111,7 @@ static char db_static_buffer[DB_MAXSCRIP
* processes. Sysctl procedures acquire db_script_mtx before accessing the
* global script data structures.
*/
-static struct mtx db_script_mtx;
-MTX_SYSINIT(db_script_mtx, &db_script_mtx, "db_script_mtx", MTX_DEF);
+static MTX_DEF_SYSINIT(db_script_mtx, "db_script_mtx", MTX_DEF);
/*
* Some script names have special meaning, such as those executed
Modified: user/andre/tcp_workqueue/sys/dev/acpica/acpivar.h
==============================================================================
--- user/andre/tcp_workqueue/sys/dev/acpica/acpivar.h Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/dev/acpica/acpivar.h Mon Oct 22 14:18:22 2012 (r241889)
@@ -149,8 +149,7 @@ extern struct mtx acpi_mutex;
#define ACPI_UNLOCK(sys) mtx_unlock(&sys##_mutex)
#define ACPI_LOCK_ASSERT(sys) mtx_assert(&sys##_mutex, MA_OWNED);
#define ACPI_LOCK_DECL(sys, name) \
- static struct mtx sys##_mutex; \
- MTX_SYSINIT(sys##_mutex, &sys##_mutex, name, MTX_DEF)
+ static MTX_DEF_SYSINIT(sys##_mutex, name, MTX_DEF)
#define ACPI_SERIAL_BEGIN(sys) sx_xlock(&sys##_sxlock)
#define ACPI_SERIAL_END(sys) sx_xunlock(&sys##_sxlock)
#define ACPI_SERIAL_ASSERT(sys) sx_assert(&sys##_sxlock, SX_XLOCKED);
Modified: user/andre/tcp_workqueue/sys/dev/ath/ah_osdep.c
==============================================================================
--- user/andre/tcp_workqueue/sys/dev/ath/ah_osdep.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/dev/ath/ah_osdep.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -70,9 +70,7 @@
* XXX This is a global lock for now; it should be pushed to
* a per-device lock in some platform-independent fashion.
*/
-struct mtx ah_regser_mtx;
-MTX_SYSINIT(ah_regser, &ah_regser_mtx, "Atheros register access mutex",
- MTX_SPIN);
+MTX_DEF_SYSINIT(ah_regser_mtx, "Atheros register access mutex", MTX_SPIN);
extern void ath_hal_printf(struct ath_hal *, const char*, ...)
__printflike(2,3);
Modified: user/andre/tcp_workqueue/sys/dev/ipmi/ipmi_smbios.c
==============================================================================
--- user/andre/tcp_workqueue/sys/dev/ipmi/ipmi_smbios.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/dev/ipmi/ipmi_smbios.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -83,8 +83,7 @@ typedef void (*smbios_callback_t)(struct
static struct ipmi_get_info ipmi_info;
static int ipmi_probed;
-static struct mtx ipmi_info_mtx;
-MTX_SYSINIT(ipmi_info, &ipmi_info_mtx, "ipmi info", MTX_DEF);
+static MTX_DEF_SYSINIT(ipmi_info_mtx, "ipmi info", MTX_DEF);
static void ipmi_smbios_probe(struct ipmi_get_info *);
static int smbios_cksum(struct smbios_eps *);
Modified: user/andre/tcp_workqueue/sys/dev/ppbus/if_plip.c
==============================================================================
--- user/andre/tcp_workqueue/sys/dev/ppbus/if_plip.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/dev/ppbus/if_plip.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -156,8 +156,7 @@ struct lp_data {
void *sc_intr_cookie;
};
-static struct mtx lp_tables_lock;
-MTX_SYSINIT(lp_tables, &lp_tables_lock, "plip tables", MTX_DEF);
+static MTX_DEF_SYSINIT(lp_tables_lock, "plip tables", MTX_DEF);
/* Tables for the lp# interface */
static u_char *txmith;
Modified: user/andre/tcp_workqueue/sys/dev/sbni/if_sbni.c
==============================================================================
--- user/andre/tcp_workqueue/sys/dev/sbni/if_sbni.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/dev/sbni/if_sbni.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -125,8 +125,7 @@ static __inline void sbni_outsb(struct s
static u_int32_t crc32tab[];
#ifdef SBNI_DUAL_COMPOUND
-static struct mtx headlist_lock;
-MTX_SYSINIT(headlist_lock, &headlist_lock, "sbni headlist", MTX_DEF);
+static MTX_DEF_SYSINIT(headlist_lock, "sbni headlist", MTX_DEF);
static struct sbni_softc *sbni_headlist;
#endif
Modified: user/andre/tcp_workqueue/sys/dev/snp/snp.c
==============================================================================
--- user/andre/tcp_workqueue/sys/dev/snp/snp.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/dev/snp/snp.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -47,8 +47,7 @@ static MALLOC_DEFINE(M_SNP, "snp", "tty
/* XXX: should be mtx, but TTY can be locked by Giant. */
#if 0
-static struct mtx snp_register_lock;
-MTX_SYSINIT(snp_register_lock, &snp_register_lock,
+static MTX_DEF_SYSINIT(snp_register_lock,
"tty snoop registration", MTX_DEF);
#define SNP_LOCK() mtx_lock(&snp_register_lock)
#define SNP_UNLOCK() mtx_unlock(&snp_register_lock)
Modified: user/andre/tcp_workqueue/sys/dev/sound/pcm/channel.c
==============================================================================
--- user/andre/tcp_workqueue/sys/dev/sound/pcm/channel.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/dev/sound/pcm/channel.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -211,8 +211,7 @@ SYSCTL_INT(_hw_snd, OID_AUTO, syncdelay,
* Clients should acquire this lock @b without holding any channel locks
* before touching syncgroups or the main syncgroup list.
*/
-struct mtx snd_pcm_syncgroups_mtx;
-MTX_SYSINIT(pcm_syncgroup, &snd_pcm_syncgroups_mtx, "PCM channel sync group lock", MTX_DEF);
+MTX_DEF_SYSINIT(snd_pcm_syncgroups_mtx, "PCM channel sync group lock", MTX_DEF);
/**
* @brief syncgroups' master list
*
Modified: user/andre/tcp_workqueue/sys/fs/devfs/devfs_dir.c
==============================================================================
--- user/andre/tcp_workqueue/sys/fs/devfs/devfs_dir.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/fs/devfs/devfs_dir.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -52,8 +52,7 @@ static LIST_HEAD(, dirlistent) devfs_dir
static MALLOC_DEFINE(M_DEVFS4, "DEVFS4", "DEVFS directory list");
-static struct mtx dirlist_mtx;
-MTX_SYSINIT(dirlist_mtx, &dirlist_mtx, "devfs dirlist lock", MTX_DEF);
+static MTX_DEF_SYSINIT(dirlist_mtx, "devfs dirlist lock", MTX_DEF);
/* Returns 1 if the path is in the directory list. */
int
Modified: user/andre/tcp_workqueue/sys/fs/devfs/devfs_vnops.c
==============================================================================
--- user/andre/tcp_workqueue/sys/fs/devfs/devfs_vnops.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/fs/devfs/devfs_vnops.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -73,12 +73,10 @@ static struct fileops devfs_ops_f;
static MALLOC_DEFINE(M_CDEVPDATA, "DEVFSP", "Metainfo for cdev-fp data");
-struct mtx devfs_de_interlock;
-MTX_SYSINIT(devfs_de_interlock, &devfs_de_interlock, "devfs interlock", MTX_DEF);
+MTX_DEF_SYSINIT(devfs_de_interlock, "devfs interlock", MTX_DEF);
struct sx clone_drain_lock;
SX_SYSINIT(clone_drain_lock, &clone_drain_lock, "clone events drain lock");
-struct mtx cdevpriv_mtx;
-MTX_SYSINIT(cdevpriv_mtx, &cdevpriv_mtx, "cdevpriv lock", MTX_DEF);
+MTX_DEF_SYSINIT(cdevpriv_mtx, "cdevpriv lock", MTX_DEF);
static int
devfs_fp_check(struct file *fp, struct cdev **devp, struct cdevsw **dswp,
Modified: user/andre/tcp_workqueue/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- user/andre/tcp_workqueue/sys/fs/nfsclient/nfs_clvnops.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/fs/nfsclient/nfs_clvnops.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -1481,9 +1481,7 @@ nfs_mknod(struct vop_mknod_args *ap)
return (nfs_mknodrpc(ap->a_dvp, ap->a_vpp, ap->a_cnp, ap->a_vap));
}
-static struct mtx nfs_cverf_mtx;
-MTX_SYSINIT(nfs_cverf_mtx, &nfs_cverf_mtx, "NFS create verifier mutex",
- MTX_DEF);
+static MTX_DEF_SYSINIT(nfs_cverf_mtx, "NFS create verifier mutex", MTX_DEF);
static nfsquad_t
nfs_get_cverf(void)
Modified: user/andre/tcp_workqueue/sys/geom/journal/g_journal.c
==============================================================================
--- user/andre/tcp_workqueue/sys/geom/journal/g_journal.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/geom/journal/g_journal.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -73,8 +73,7 @@ CTASSERT(sizeof(struct g_journal_header)
CTASSERT(sizeof(struct g_journal_record_header) <= 512);
static MALLOC_DEFINE(M_JOURNAL, "journal_data", "GEOM_JOURNAL Data");
-static struct mtx g_journal_cache_mtx;
-MTX_SYSINIT(g_journal_cache, &g_journal_cache_mtx, "cache usage", MTX_DEF);
+static MTX_DEF_SYSINIT(g_journal_cache_mtx, "cache usage", MTX_DEF);
const struct g_journal_desc *g_journal_filesystems[] = {
&g_journal_ufs,
Modified: user/andre/tcp_workqueue/sys/mips/atheros/if_arge.c
==============================================================================
--- user/andre/tcp_workqueue/sys/mips/atheros/if_arge.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/mips/atheros/if_arge.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -240,9 +240,7 @@ DRIVER_MODULE(mdio, argemdio, mdio_drive
*/
extern uint32_t ar711_base_mac[ETHER_ADDR_LEN];
-static struct mtx miibus_mtx;
-
-MTX_SYSINIT(miibus_mtx, &miibus_mtx, "arge mii lock", MTX_DEF);
+static MTX_DEF_SYSINIT(miibus_mtx, "arge mii lock", MTX_DEF);
/*
* Flushes all
Modified: user/andre/tcp_workqueue/sys/mips/cavium/octe/ethernet-mdio.c
==============================================================================
--- user/andre/tcp_workqueue/sys/mips/cavium/octe/ethernet-mdio.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/mips/cavium/octe/ethernet-mdio.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -46,8 +46,7 @@ __FBSDID("$FreeBSD$");
#include "wrapper-cvmx-includes.h"
#include "ethernet-headers.h"
-struct mtx cvm_oct_mdio_mtx;
-MTX_SYSINIT(cvm_oct_mdio, &cvm_oct_mdio_mtx, "MDIO", MTX_DEF);
+MTX_DEF_SYSINIT(cvm_oct_mdio_mtx, "MDIO", MTX_DEF);
/**
* Perform an MII read. Called by the generic MII routines
Modified: user/andre/tcp_workqueue/sys/mips/cavium/octe/ethernet-rgmii.c
==============================================================================
--- user/andre/tcp_workqueue/sys/mips/cavium/octe/ethernet-rgmii.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/mips/cavium/octe/ethernet-rgmii.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -52,9 +52,7 @@ __FBSDID("$FreeBSD$");
extern int octeon_is_simulation(void);
extern struct ifnet *cvm_oct_device[];
-static struct mtx global_register_lock;
-MTX_SYSINIT(global_register_lock, &global_register_lock,
- "RGMII Global", MTX_SPIN);
+static MTX_DEF_SYSINIT(global_register_lock, "RGMII Global", MTX_SPIN);
static int number_rgmii_ports;
Modified: user/andre/tcp_workqueue/sys/mips/mips/busdma_machdep.c
==============================================================================
--- user/andre/tcp_workqueue/sys/mips/mips/busdma_machdep.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/mips/mips/busdma_machdep.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -156,9 +156,7 @@ static TAILQ_HEAD(,bus_dmamap) dmamap_fr
#define BUSDMA_STATIC_MAPS 500
static struct bus_dmamap map_pool[BUSDMA_STATIC_MAPS];
-static struct mtx busdma_mtx;
-
-MTX_SYSINIT(busdma_mtx, &busdma_mtx, "busdma lock", MTX_DEF);
+static MTX_DEF_SYSINIT(busdma_mtx, "busdma lock", MTX_DEF);
static void init_bounce_pages(void *dummy);
static int alloc_bounce_zone(bus_dma_tag_t dmat);
Modified: user/andre/tcp_workqueue/sys/mips/sibyte/sb_zbbus.c
==============================================================================
--- user/andre/tcp_workqueue/sys/mips/sibyte/sb_zbbus.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/mips/sibyte/sb_zbbus.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -44,9 +44,7 @@ __FBSDID("$FreeBSD$");
static MALLOC_DEFINE(M_INTMAP, "sb1250 intmap", "Sibyte 1250 Interrupt Mapper");
-static struct mtx zbbus_intr_mtx;
-MTX_SYSINIT(zbbus_intr_mtx, &zbbus_intr_mtx, "zbbus_intr_mask/unmask lock",
- MTX_SPIN);
+static MTX_DEF_SYSINIT(zbbus_intr_mtx, "zbbus_intr_mask/unmask lock", MTX_SPIN);
/*
* This array holds the mapping between a MIPS hard interrupt and the
Modified: user/andre/tcp_workqueue/sys/netinet/tcp_syncache.c
==============================================================================
--- user/andre/tcp_workqueue/sys/netinet/tcp_syncache.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/netinet/tcp_syncache.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -991,7 +991,9 @@ syncache_expand(struct in_conninfo *inc,
"rejected\n", s, __func__, th->th_seq, sc->sc_irs);
goto failed;
}
-
+ /*
+ * If timestamps were not negotiated we don't expect them.
+ */
if (!(sc->sc_flags & SCF_TIMESTAMP) && (to->to_flags & TOF_TS)) {
if ((s = tcp_log_addrs(inc, th, NULL, NULL)))
log(LOG_DEBUG, "%s; %s: Timestamp not expected, "
@@ -999,6 +1001,19 @@ syncache_expand(struct in_conninfo *inc,
goto failed;
}
/*
+ * If timestamps were negotiated every packet is required
+ * to carry them.
+ * RFC1323, Section X
+ */
+ if ((sc->sc_flags & SCF_TIMESTAMP) && !(to->to_flags & TOF_TS)) {
+ if ((s = tcp_log_addrs(inc, th, NULL, NULL)))
+ log(LOG_DEBUG, "%s; %s: Timestamp expected, "
+ "rfc violation ignored\n", s, __func__);
+#if 0
+ goto failed;
+#endif
+ }
+ /*
* If timestamps were negotiated the reflected timestamp
* must be equal to what we actually sent in the SYN|ACK.
*/
Modified: user/andre/tcp_workqueue/sys/pc98/cbus/cbus_dma.c
==============================================================================
--- user/andre/tcp_workqueue/sys/pc98/cbus/cbus_dma.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/pc98/cbus/cbus_dma.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -72,8 +72,7 @@ static u_int8_t dma_bounced = 0;
static u_int8_t dma_busy = 0; /* Used in isa_dmastart() */
static u_int8_t dma_inuse = 0; /* User for acquire/release */
static u_int8_t dma_auto_mode = 0;
-static struct mtx isa_dma_lock;
-MTX_SYSINIT(isa_dma_lock, &isa_dma_lock, "isa DMA lock", MTX_DEF);
+static MTX_DEF_SYSINIT(isa_dma_lock, "isa DMA lock", MTX_DEF);
#define VALID_DMA_MASK (3)
Modified: user/andre/tcp_workqueue/sys/security/mac/mac_net.c
==============================================================================
--- user/andre/tcp_workqueue/sys/security/mac/mac_net.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/security/mac/mac_net.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -79,8 +79,7 @@ __FBSDID("$FreeBSD$");
* our own global mutex for struct ifnet. Non-ideal, but should help in the
* SMP environment.
*/
-struct mtx mac_ifnet_mtx;
-MTX_SYSINIT(mac_ifnet_mtx, &mac_ifnet_mtx, "mac_ifnet", MTX_DEF);
+MTX_DEF_SYSINIT(mac_ifnet_mtx, "mac_ifnet", MTX_DEF);
/*
* Retrieve the label associated with an mbuf by searching for the tag.
Modified: user/andre/tcp_workqueue/sys/ufs/ffs/ffs_snapshot.c
==============================================================================
--- user/andre/tcp_workqueue/sys/ufs/ffs/ffs_snapshot.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/ufs/ffs/ffs_snapshot.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -136,8 +136,7 @@ ffs_sync_snap(mp, waitfor)
FEATURE(ffs_snapshot, "FFS snapshot support");
LIST_HEAD(, snapdata) snapfree;
-static struct mtx snapfree_lock;
-MTX_SYSINIT(ffs_snapfree, &snapfree_lock, "snapdata free list", MTX_DEF);
+static MTX_DEF_SYSINIT(snapfree_lock, "snapdata free list", MTX_DEF);
static int cgaccount(int, struct vnode *, struct buf *, int);
static int expunge_ufs1(struct vnode *, struct inode *, struct fs *,
Modified: user/andre/tcp_workqueue/sys/ufs/ffs/ffs_softdep.c
==============================================================================
--- user/andre/tcp_workqueue/sys/ufs/ffs/ffs_softdep.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/ufs/ffs/ffs_softdep.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -993,8 +993,7 @@ static void softdep_disk_write_complete(
static void softdep_deallocate_dependencies(struct buf *);
static int softdep_count_dependencies(struct buf *bp, int);
-static struct mtx lk;
-MTX_SYSINIT(softdep_lock, &lk, "Softdep Lock", MTX_DEF);
+static MTX_DEF_SYSINIT(lk, "Softdep Lock", MTX_DEF);
#define TRY_ACQUIRE_LOCK(lk) mtx_trylock(lk)
#define ACQUIRE_LOCK(lk) mtx_lock(lk)
Modified: user/andre/tcp_workqueue/sys/x86/isa/isa_dma.c
==============================================================================
--- user/andre/tcp_workqueue/sys/x86/isa/isa_dma.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/x86/isa/isa_dma.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -71,8 +71,7 @@ static u_int8_t dma_bounced = 0;
static u_int8_t dma_busy = 0; /* Used in isa_dmastart() */
static u_int8_t dma_inuse = 0; /* User for acquire/release */
static u_int8_t dma_auto_mode = 0;
-static struct mtx isa_dma_lock;
-MTX_SYSINIT(isa_dma_lock, &isa_dma_lock, "isa DMA lock", MTX_DEF);
+static MTX_DEF_SYSINIT(isa_dma_lock, "isa DMA lock", MTX_DEF);
#define VALID_DMA_MASK (7)
Modified: user/andre/tcp_workqueue/sys/xen/evtchn/evtchn.c
==============================================================================
--- user/andre/tcp_workqueue/sys/xen/evtchn/evtchn.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/xen/evtchn/evtchn.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -44,7 +44,14 @@ static inline unsigned long __ffs(unsign
return word;
}
-static struct mtx irq_mapping_update_lock;
+/*
+ * irq_mapping_update_lock: in order to allow an interrupt to occur in a critical
+ * section, to set pcpu->ipending (etc...) properly, we
+ * must be able to get the icu lock, so it can't be
+ * under witness.
+ */
+static MTX_DEF_SYSINIT(irq_mapping_update_lock, "xp", MTX_SPIN);
+
static struct xenpic *xp;
struct xenpic_intsrc {
struct intsrc xp_intsrc;
@@ -1130,11 +1137,4 @@ evtchn_init(void *dummy __unused)
}
SYSINIT(evtchn_init, SI_SUB_INTR, SI_ORDER_MIDDLE, evtchn_init, NULL);
- /*
- * irq_mapping_update_lock: in order to allow an interrupt to occur in a critical
- * section, to set pcpu->ipending (etc...) properly, we
- * must be able to get the icu lock, so it can't be
- * under witness.
- */
-MTX_SYSINIT(irq_mapping_update_lock, &irq_mapping_update_lock, "xp", MTX_SPIN);
Modified: user/andre/tcp_workqueue/sys/xen/gnttab.c
==============================================================================
--- user/andre/tcp_workqueue/sys/xen/gnttab.c Mon Oct 22 14:10:17 2012 (r241888)
+++ user/andre/tcp_workqueue/sys/xen/gnttab.c Mon Oct 22 14:18:22 2012 (r241889)
@@ -49,7 +49,8 @@ static unsigned int nr_grant_frames;
static unsigned int boot_max_nr_grant_frames;
static int gnttab_free_count;
static grant_ref_t gnttab_free_head;
-static struct mtx gnttab_list_lock;
+
+static MTX_DEF_SYSINIT(gnttab_list_lock, "GNTTAB LOCK", MTX_DEF);
static grant_entry_t *shared;
@@ -706,4 +707,3 @@ ini_nomem:
}
-MTX_SYSINIT(gnttab, &gnttab_list_lock, "GNTTAB LOCK", MTX_DEF);
More information about the svn-src-user
mailing list