[Midnightbsd-cvs] src [7844] U trunk/sys/contrib/pf/net: revert to old behavior of allocating table/table entries using M_NOWAIT.

[laffer1 at midnightbsd.org]

Revision: 7844
          http://svnweb.midnightbsd.org/src/?rev=7844
Author:   laffer1
Date:     2016-09-14 11:37:26 -0400 (Wed, 14 Sep 2016)
Log Message:
-----------
revert to old behavior of allocating table/table entries using M_NOWAIT. Use M_NOWAIT while hoding the pf giant lock. Obtained from: FreeBSD SVN 238600

Modified Paths:
--------------
    trunk/sys/contrib/pf/net/pf_if.c
    trunk/sys/contrib/pf/net/pf_table.c

Property Changed:
----------------
    trunk/sys/contrib/pf/net/if_pflog.c
    trunk/sys/contrib/pf/net/if_pflog.h
    trunk/sys/contrib/pf/net/if_pflow.h
    trunk/sys/contrib/pf/net/if_pfsync.c
    trunk/sys/contrib/pf/net/if_pfsync.h
    trunk/sys/contrib/pf/net/pf.c
    trunk/sys/contrib/pf/net/pf_if.c
    trunk/sys/contrib/pf/net/pf_table.c

Index: trunk/sys/contrib/pf/net/if_pflog.c
===================================================================
--- trunk/sys/contrib/pf/net/if_pflog.c	2016-09-07 16:54:27 UTC (rev 7843)
+++ trunk/sys/contrib/pf/net/if_pflog.c	2016-09-14 15:37:26 UTC (rev 7844)

Property changes on: trunk/sys/contrib/pf/net/if_pflog.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6
\ No newline at end of property
Index: trunk/sys/contrib/pf/net/if_pflog.h
===================================================================
--- trunk/sys/contrib/pf/net/if_pflog.h	2016-09-07 16:54:27 UTC (rev 7843)
+++ trunk/sys/contrib/pf/net/if_pflog.h	2016-09-14 15:37:26 UTC (rev 7844)

Property changes on: trunk/sys/contrib/pf/net/if_pflog.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6
\ No newline at end of property
Index: trunk/sys/contrib/pf/net/if_pflow.h
===================================================================
--- trunk/sys/contrib/pf/net/if_pflow.h	2016-09-07 16:54:27 UTC (rev 7843)
+++ trunk/sys/contrib/pf/net/if_pflow.h	2016-09-14 15:37:26 UTC (rev 7844)

Property changes on: trunk/sys/contrib/pf/net/if_pflow.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/sys/contrib/pf/net/if_pfsync.c
===================================================================
--- trunk/sys/contrib/pf/net/if_pfsync.c	2016-09-07 16:54:27 UTC (rev 7843)
+++ trunk/sys/contrib/pf/net/if_pfsync.c	2016-09-14 15:37:26 UTC (rev 7844)

Property changes on: trunk/sys/contrib/pf/net/if_pfsync.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Index: trunk/sys/contrib/pf/net/if_pfsync.h
===================================================================
--- trunk/sys/contrib/pf/net/if_pfsync.h	2016-09-07 16:54:27 UTC (rev 7843)
+++ trunk/sys/contrib/pf/net/if_pfsync.h	2016-09-14 15:37:26 UTC (rev 7844)

Property changes on: trunk/sys/contrib/pf/net/if_pfsync.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Index: trunk/sys/contrib/pf/net/pf.c
===================================================================
--- trunk/sys/contrib/pf/net/pf.c	2016-09-07 16:54:27 UTC (rev 7843)
+++ trunk/sys/contrib/pf/net/pf.c	2016-09-14 15:37:26 UTC (rev 7844)

Property changes on: trunk/sys/contrib/pf/net/pf.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.6
\ No newline at end of property
Modified: trunk/sys/contrib/pf/net/pf_if.c
===================================================================
--- trunk/sys/contrib/pf/net/pf_if.c	2016-09-07 16:54:27 UTC (rev 7843)
+++ trunk/sys/contrib/pf/net/pf_if.c	2016-09-14 15:37:26 UTC (rev 7844)
@@ -506,8 +506,7 @@
 	if (aw->type != PF_ADDR_DYNIFTL)
 		return (0);
 #ifdef __FreeBSD__
-	/* XXX: revisit! */
-	if ((dyn = pool_get(&V_pfi_addr_pl, PR_WAITOK | PR_ZERO))
+	if ((dyn = pool_get(&V_pfi_addr_pl, PR_NOWAIT | PR_ZERO))
 #else
 	if ((dyn = pool_get(&pfi_addr_pl, PR_WAITOK | PR_LIMITFAIL | PR_ZERO))
 #endif


Property changes on: trunk/sys/contrib/pf/net/pf_if.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Modified: trunk/sys/contrib/pf/net/pf_table.c
===================================================================
--- trunk/sys/contrib/pf/net/pf_table.c	2016-09-07 16:54:27 UTC (rev 7843)
+++ trunk/sys/contrib/pf/net/pf_table.c	2016-09-14 15:37:26 UTC (rev 7844)
@@ -926,16 +926,12 @@
 {
 	struct pfr_kentry	*ke;
 
-	if (intr)
 #ifdef __FreeBSD__
-		ke = pool_get(&V_pfr_kentry_pl, PR_NOWAIT | PR_ZERO);
+	ke =  pool_get(&V_pfr_kentry_pl, PR_NOWAIT | PR_ZERO);
 #else
+	if (intr)
 		ke = pool_get(&pfr_kentry_pl, PR_NOWAIT | PR_ZERO);
-#endif
 	else
-#ifdef __FreeBSD__
-		ke = pool_get(&V_pfr_kentry_pl, PR_WAITOK|PR_ZERO);
-#else
 		ke = pool_get(&pfr_kentry_pl, PR_WAITOK|PR_ZERO|PR_LIMITFAIL);
 #endif
 	if (ke == NULL)
@@ -2080,16 +2076,12 @@
 	struct pfr_ktable	*kt;
 	struct pf_ruleset	*rs;
 
-	if (intr)
 #ifdef __FreeBSD__
-		kt = pool_get(&V_pfr_ktable_pl, PR_NOWAIT|PR_ZERO);
+	kt = pool_get(&V_pfr_ktable_pl, PR_NOWAIT|PR_ZERO);
 #else
+	if (intr)
 		kt = pool_get(&pfr_ktable_pl, PR_NOWAIT|PR_ZERO|PR_LIMITFAIL);
-#endif
 	else
-#ifdef __FreeBSD__
-		kt = pool_get(&V_pfr_ktable_pl, PR_WAITOK|PR_ZERO);
-#else
 		kt = pool_get(&pfr_ktable_pl, PR_WAITOK|PR_ZERO|PR_LIMITFAIL);
 #endif
 	if (kt == NULL)


Property changes on: trunk/sys/contrib/pf/net/pf_table.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property