git: 367d0c7d6617 - releng/13.1 - pf: Initialize the table entry zone limit at initialization time

From: Mark Johnston <>
Date: Mon, 04 Apr 2022 14:04:51 UTC
The branch releng/13.1 has been updated by markj:


commit 367d0c7d6617c8ef316b71e420b8a7a7a7e66a8a
Author:     Mark Johnston <>
AuthorDate: 2022-03-30 19:41:44 +0000
Commit:     Mark Johnston <>
CommitDate: 2022-04-04 14:04:14 +0000

    pf: Initialize the table entry zone limit at initialization time
    The limit may later be updated by the "set limit" directive in pf.conf.
    UMA does not permit a limit to be set on a zone after any items have
    been allocated from a zone.
    Other UMA zones used by pf do not appear to be susceptible to this
    problem: they either set a limit at zone creation time or never set one
    at all.
    Approved by:    re (gjb)
    PR:             260406
    Reviewed by:    kp
    Sponsored by:   The FreeBSD Foundation
    (cherry picked from commit 7d1ab866911a2b29e041d64bc83a93638533f957)
    (cherry picked from commit 1487f84223ce1341ebdfc87e50fbcddedc6d1de8)
 sys/netpfil/pf/pf_table.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys/netpfil/pf/pf_table.c b/sys/netpfil/pf/pf_table.c
index 2352e43cb342..a2afd5c24cff 100644
--- a/sys/netpfil/pf/pf_table.c
+++ b/sys/netpfil/pf/pf_table.c
@@ -210,6 +210,7 @@ pfr_initialize(void)
 	V_pfr_kentry_z = uma_zcreate("pf table entries",
 	    sizeof(struct pfr_kentry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR,
+	uma_zone_set_max(V_pfr_kentry_z, PFR_KENTRY_HIWAT);
 	V_pf_limits[PF_LIMIT_TABLE_ENTRIES].zone = V_pfr_kentry_z;