Author: glebius
Date: Thu Jan 31 21:04:50 2019
New Revision: 343619
URL: https://svnweb.freebsd.org/changeset/base/343619

Log:
  Revert r316461: Remove "IPFW static rules" rmlock, and use pfil's global lock.
  
  The pfil(9) system is about to be converted to epoch(9) synchronization, so
  we need [temporarily] go back with ipfw internal locking.
  
  Discussed with:       ae

Modified:
  head/sys/net/pfil.c
  head/sys/net/pfil.h
  head/sys/netpfil/ipfw/ip_fw2.c
  head/sys/netpfil/ipfw/ip_fw_dynamic.c
  head/sys/netpfil/ipfw/ip_fw_iface.c
  head/sys/netpfil/ipfw/ip_fw_nat.c
  head/sys/netpfil/ipfw/ip_fw_private.h
  head/sys/netpfil/ipfw/ip_fw_sockopt.c
  head/sys/netpfil/ipfw/ip_fw_table.c
  head/sys/netpfil/ipfw/ip_fw_table_value.c

Modified: head/sys/net/pfil.c
==============================================================================
--- head/sys/net/pfil.c Thu Jan 31 20:04:18 2019        (r343618)
+++ head/sys/net/pfil.c Thu Jan 31 21:04:50 2019        (r343619)
@@ -64,6 +64,7 @@ LIST_HEAD(pfilheadhead, pfil_head);
 VNET_DEFINE(struct pfilheadhead, pfil_head_list);
 #define        V_pfil_head_list        VNET(pfil_head_list)
 VNET_DEFINE(struct rmlock, pfil_lock);
+#define        V_pfil_lock     VNET(pfil_lock)
 
 #define        PFIL_LOCK_INIT_REAL(l, t)       \
        rm_init_flags(l, "PFil " t " rmlock", RM_RECURSE)

Modified: head/sys/net/pfil.h
==============================================================================
--- head/sys/net/pfil.h Thu Jan 31 20:04:18 2019        (r343618)
+++ head/sys/net/pfil.h Thu Jan 31 21:04:50 2019        (r343619)
@@ -40,7 +40,6 @@
 #include <sys/_mutex.h>
 #include <sys/lock.h>
 #include <sys/rmlock.h>
-#include <net/vnet.h>
 
 struct mbuf;
 struct ifnet;
@@ -100,9 +99,6 @@ struct pfil_head {
 #define        ph_ifnet         ph_un.phu_ptr
        LIST_ENTRY(pfil_head) ph_list;
 };
-
-VNET_DECLARE(struct rmlock, pfil_lock);
-#define        V_pfil_lock     VNET(pfil_lock)
 
 /* Public functions for pfil hook management by packet filters. */
 struct pfil_head *pfil_head_get(int, u_long);

Modified: head/sys/netpfil/ipfw/ip_fw2.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw2.c      Thu Jan 31 20:04:18 2019        
(r343618)
+++ head/sys/netpfil/ipfw/ip_fw2.c      Thu Jan 31 21:04:50 2019        
(r343619)
@@ -1404,6 +1404,7 @@ ipfw_chk(struct ip_fw_args *args)
        int is_ipv4 = 0;
 
        int done = 0;           /* flag to exit the outer loop */
+       IPFW_RLOCK_TRACKER;
 
        if (m->m_flags & M_SKIP_FIREWALL || (! V_ipfw_vnet_ready))
                return (IP_FW_PASS);    /* accept */

Modified: head/sys/netpfil/ipfw/ip_fw_dynamic.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_dynamic.c       Thu Jan 31 20:04:18 2019        
(r343618)
+++ head/sys/netpfil/ipfw/ip_fw_dynamic.c       Thu Jan 31 21:04:50 2019        
(r343619)
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
 #include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_var.h>
-#include <net/pfil.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>

Modified: head/sys/netpfil/ipfw/ip_fw_iface.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_iface.c Thu Jan 31 20:04:18 2019        
(r343618)
+++ head/sys/netpfil/ipfw/ip_fw_iface.c Thu Jan 31 21:04:50 2019        
(r343619)
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/eventhandler.h>
 #include <net/if.h>
 #include <net/if_var.h>
-#include <net/pfil.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>

Modified: head/sys/netpfil/ipfw/ip_fw_nat.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_nat.c   Thu Jan 31 20:04:18 2019        
(r343618)
+++ head/sys/netpfil/ipfw/ip_fw_nat.c   Thu Jan 31 21:04:50 2019        
(r343619)
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 
 #include <net/if.h>
 #include <net/if_var.h>
-#include <net/pfil.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>

Modified: head/sys/netpfil/ipfw/ip_fw_private.h
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_private.h       Thu Jan 31 20:04:18 2019        
(r343618)
+++ head/sys/netpfil/ipfw/ip_fw_private.h       Thu Jan 31 21:04:50 2019        
(r343619)
@@ -312,6 +312,8 @@ struct ip_fw_chain {
        void            **srvstate;     /* runtime service mappings */
 #if defined( __linux__ ) || defined( _WIN32 )
        spinlock_t rwmtx;
+#else
+       struct rmlock   rwmtx;
 #endif
        int             static_len;     /* total len of static rules (v0) */
        uint32_t        gencnt;         /* NAT generation count */
@@ -452,23 +454,25 @@ struct ipfw_ifc {
 #define        IPFW_PF_RUNLOCK(p)              IPFW_RUNLOCK(p)
 #else /* FreeBSD */
 #define        IPFW_LOCK_INIT(_chain) do {                     \
+       rm_init_flags(&(_chain)->rwmtx, "IPFW static rules", RM_RECURSE); \
        rw_init(&(_chain)->uh_lock, "IPFW UH lock");    \
        } while (0)
 
 #define        IPFW_LOCK_DESTROY(_chain) do {                  \
+       rm_destroy(&(_chain)->rwmtx);                   \
        rw_destroy(&(_chain)->uh_lock);                 \
        } while (0)
 
-#define        IPFW_RLOCK_ASSERT(_chain)       rm_assert(&V_pfil_lock, 
RA_RLOCKED)
-#define        IPFW_WLOCK_ASSERT(_chain)       rm_assert(&V_pfil_lock, 
RA_WLOCKED)
+#define        IPFW_RLOCK_ASSERT(_chain)       rm_assert(&(_chain)->rwmtx, 
RA_RLOCKED)
+#define        IPFW_WLOCK_ASSERT(_chain)       rm_assert(&(_chain)->rwmtx, 
RA_WLOCKED)
 
 #define        IPFW_RLOCK_TRACKER              struct rm_priotracker _tracker
-#define        IPFW_RLOCK(p)                   rm_rlock(&V_pfil_lock, 
&_tracker)
-#define        IPFW_RUNLOCK(p)                 rm_runlock(&V_pfil_lock, 
&_tracker)
-#define        IPFW_WLOCK(p)                   rm_wlock(&V_pfil_lock)
-#define        IPFW_WUNLOCK(p)                 rm_wunlock(&V_pfil_lock)
-#define        IPFW_PF_RLOCK(p)
-#define        IPFW_PF_RUNLOCK(p)
+#define        IPFW_RLOCK(p)                   rm_rlock(&(p)->rwmtx, &_tracker)
+#define        IPFW_RUNLOCK(p)                 rm_runlock(&(p)->rwmtx, 
&_tracker)
+#define        IPFW_WLOCK(p)                   rm_wlock(&(p)->rwmtx)
+#define        IPFW_WUNLOCK(p)                 rm_wunlock(&(p)->rwmtx)
+#define        IPFW_PF_RLOCK(p)                IPFW_RLOCK(p)
+#define        IPFW_PF_RUNLOCK(p)              IPFW_RUNLOCK(p)
 #endif
 
 #define        IPFW_UH_RLOCK_ASSERT(_chain)    rw_assert(&(_chain)->uh_lock, 
RA_RLOCKED)

Modified: head/sys/netpfil/ipfw/ip_fw_sockopt.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_sockopt.c       Thu Jan 31 20:04:18 2019        
(r343618)
+++ head/sys/netpfil/ipfw/ip_fw_sockopt.c       Thu Jan 31 21:04:50 2019        
(r343619)
@@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/syslog.h>
 #include <sys/fnv_hash.h>
 #include <net/if.h>
-#include <net/pfil.h>
 #include <net/route.h>
 #include <net/vnet.h>
 #include <vm/vm.h>

Modified: head/sys/netpfil/ipfw/ip_fw_table.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_table.c Thu Jan 31 20:04:18 2019        
(r343618)
+++ head/sys/netpfil/ipfw/ip_fw_table.c Thu Jan 31 21:04:50 2019        
(r343619)
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socketvar.h>
 #include <sys/queue.h>
 #include <net/if.h>    /* ip_fw.h requires IFNAMSIZ */
-#include <net/pfil.h>
 
 #include <netinet/in.h>
 #include <netinet/ip_var.h>    /* struct ipfw_rule_ref */

Modified: head/sys/netpfil/ipfw/ip_fw_table_value.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_table_value.c   Thu Jan 31 20:04:18 2019        
(r343618)
+++ head/sys/netpfil/ipfw/ip_fw_table_value.c   Thu Jan 31 21:04:50 2019        
(r343619)
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socketvar.h>
 #include <sys/queue.h>
 #include <net/if.h>    /* ip_fw.h requires IFNAMSIZ */
-#include <net/pfil.h>
 
 #include <netinet/in.h>
 #include <netinet/ip_var.h>    /* struct ipfw_rule_ref */
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to