Back out r249318, r249320 and r249327 due to a heisenbug most

likely related to a race condition in the ipi_hash_lock with
the exact cause currently unknown but under investigation.

5 files changed, 6 insertions, 6 deletions

diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 5274a90..2df90b0 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -330,7 +330,7 @@ struct inpcbinfo {
 	/*
 	 * Global lock protecting non-pcbgroup hash lookup tables.
 	 */
-	struct rwlock_padalign	 ipi_hash_lock;
+	struct rwlock		 ipi_hash_lock;
 
 	/*
 	 * Global hash of inpcbs, hashed by local and foreign addresses and
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index bf27652..8657dbb 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -116,7 +116,7 @@ VNET_DECLARE(u_long, in_ifaddrhmask);		/* mask for hash table */
 #define INADDR_HASH(x) \
 	(&V_in_ifaddrhashtbl[INADDR_HASHVAL(x) & V_in_ifaddrhmask])
 
-extern	struct rwlock_padalign in_ifaddr_lock;
+extern	struct rwlock in_ifaddr_lock;
 
 #define	IN_IFADDR_LOCK_ASSERT()	rw_assert(&in_ifaddr_lock, RA_LOCKED)
 #define	IN_IFADDR_RLOCK()	rw_rlock(&in_ifaddr_lock)
diff --git a/sys/netinet/ip_id.c b/sys/netinet/ip_id.c
index 7b9710f..ce8c6b4 100644
--- a/sys/netinet/ip_id.c
+++ b/sys/netinet/ip_id.c
@@ -97,7 +97,7 @@ static int		 array_ptr = 0;
 static int		 array_size = 8192;
 static int		 random_id_collisions = 0;
 static int		 random_id_total = 0;
-static struct mtx_padalign  ip_id_mtx;
+static struct mtx	 ip_id_mtx;
 
 static void	ip_initid(void);
 static int	sysctl_ip_id_change(SYSCTL_HANDLER_ARGS);
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 17a4e1d..f38c6fa 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -85,7 +85,7 @@ __FBSDID("$FreeBSD$");
 CTASSERT(sizeof(struct ip) == 20);
 #endif
 
-struct rwlock_padalign	in_ifaddr_lock;
+struct	rwlock in_ifaddr_lock;
 RW_SYSINIT(in_ifaddr_lock, &in_ifaddr_lock, "in_ifaddr_lock");
 
 VNET_DEFINE(int, rsvp_on);
@@ -155,7 +155,7 @@ VNET_DEFINE(u_long, in_ifaddrhmask);		/* mask for hash table */
 
 static VNET_DEFINE(uma_zone_t, ipq_zone);
 static VNET_DEFINE(TAILQ_HEAD(ipqhead, ipq), ipq[IPREASS_NHASH]);
-static struct mtx_padalign	ipqlock;
+static struct mtx ipqlock;
 
 #define	V_ipq_zone		VNET(ipq_zone)
 #define	V_ipq			VNET(ipq)
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 1236d7d..e87d58e 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -255,7 +255,7 @@ static VNET_DEFINE(uma_zone_t, tcpcb_zone);
 #define	V_tcpcb_zone			VNET(tcpcb_zone)
 
 MALLOC_DEFINE(M_TCPLOG, "tcplog", "TCP address and flags print buffers");
-static struct mtx_padalign	isn_mtx;
+static struct mtx isn_mtx;
 
 #define	ISN_LOCK_INIT()	mtx_init(&isn_mtx, "isn_mtx", NULL, MTX_DEF)
 #define	ISN_LOCK()	mtx_lock(&isn_mtx)