aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorKristof Provost <kp@FreeBSD.org>2020-04-26 16:30:00 +0000
committerKristof Provost <kp@FreeBSD.org>2020-04-26 16:30:00 +0000
commitdf03977dd83c5040004be18ab507b799ad4ad67b (patch)
treefc84ca4ef1b2ee84ef1851a02c19b53b6271d4a6 /sys
parent5377560783d95b92fce3bea3caac37d2860b1d48 (diff)
downloadsrc-df03977dd83c5040004be18ab507b799ad4ad67b.tar.gz
src-df03977dd83c5040004be18ab507b799ad4ad67b.zip
pf: Virtualise pf_frag_mtx
The pf_frag_mtx mutex protects the fragments queue. The fragments queue is virtualised already (i.e. per-vnet) so it makes no sense to block jail A from accessing its fragments queue while jail B is accessing its own fragments queue. Virtualise the lock for improved concurrency. Differential Revision: https://reviews.freebsd.org/D24504
Notes
Notes: svn path=/head/; revision=360347
Diffstat (limited to 'sys')
-rw-r--r--sys/netpfil/pf/pf_norm.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c
index 2a6f97e1efe5..47407014adf0 100644
--- a/sys/netpfil/pf/pf_norm.c
+++ b/sys/netpfil/pf/pf_norm.c
@@ -106,11 +106,11 @@ struct pf_fragment_tag {
uint32_t ft_id; /* fragment id */
};
-static struct mtx pf_frag_mtx;
-MTX_SYSINIT(pf_frag_mtx, &pf_frag_mtx, "pf fragments", MTX_DEF);
-#define PF_FRAG_LOCK() mtx_lock(&pf_frag_mtx)
-#define PF_FRAG_UNLOCK() mtx_unlock(&pf_frag_mtx)
-#define PF_FRAG_ASSERT() mtx_assert(&pf_frag_mtx, MA_OWNED)
+VNET_DEFINE_STATIC(struct mtx, pf_frag_mtx);
+#define V_pf_frag_mtx VNET(pf_frag_mtx)
+#define PF_FRAG_LOCK() mtx_lock(&V_pf_frag_mtx)
+#define PF_FRAG_UNLOCK() mtx_unlock(&V_pf_frag_mtx)
+#define PF_FRAG_ASSERT() mtx_assert(&V_pf_frag_mtx, MA_OWNED)
VNET_DEFINE(uma_zone_t, pf_state_scrub_z); /* XXX: shared with pfsync */
@@ -192,6 +192,8 @@ pf_normalize_init(void)
sizeof(struct pf_state_scrub), NULL, NULL, NULL, NULL,
UMA_ALIGN_PTR, 0);
+ mtx_init(&V_pf_frag_mtx, "pf fragments", NULL, MTX_DEF);
+
V_pf_limits[PF_LIMIT_FRAGS].zone = V_pf_frent_z;
V_pf_limits[PF_LIMIT_FRAGS].limit = PFFRAG_FRENT_HIWAT;
uma_zone_set_max(V_pf_frent_z, PFFRAG_FRENT_HIWAT);
@@ -207,6 +209,8 @@ pf_normalize_cleanup(void)
uma_zdestroy(V_pf_state_scrub_z);
uma_zdestroy(V_pf_frent_z);
uma_zdestroy(V_pf_frag_z);
+
+ mtx_destroy(&V_pf_frag_mtx);
}
static int