From nobody Wed Mar 30 19:59:38 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6CF9E1A5C2F6; Wed, 30 Mar 2022 19:59:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KTHMZ2ctKz3mXV; Wed, 30 Mar 2022 19:59:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648670378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6ed/RLT3ACID85r/FFjG+fnmDlR154/d4sf1HylT70s=; b=Pykizfkh86+Cs3ckN5WXYp9hCL8U/X1E9bYiFIDU3cZ+bIKo1TEvihc2935HbLT+VA8Rwr o8sQdvPbOab54CXhRmZqj+Id/LhdON3gkPFMANO3UGL+uTt2xdXkqtfSxFZ1P3hV/mY8vL iMruTk/6abqqVddoVttJsuFpKcSRnf3qhsTY3oHBXi/4sVclWxeaLp+aS3UlSOAR86L4Ru N7zADk3rF/rtiGEZ1c9TSKSz0ze5F9AKpXnIrtpQYVQtNaLmNlTJzL9WyfUrLa5sOpcG1O R1aYo/xbwyprOcyGxXkfrYz+paRjr9pUwmzvPikXTORGX2AoD1Zf/jfXldpD0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 360BD198AC; Wed, 30 Mar 2022 19:59:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22UJxcK3058091; Wed, 30 Mar 2022 19:59:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22UJxcYW058090; Wed, 30 Mar 2022 19:59:38 GMT (envelope-from git) Date: Wed, 30 Mar 2022 19:59:38 GMT Message-Id: <202203301959.22UJxcYW058090@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7d1ab866911a - main - pf: Initialize the table entry zone limit at initialization time List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d1ab866911a2b29e041d64bc83a93638533f957 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648670378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6ed/RLT3ACID85r/FFjG+fnmDlR154/d4sf1HylT70s=; b=aG45Umy4oNYkKGyWtpXK1gsivIPU9Su7m1ij0gxoW2ijvVC/g9jKlTBQS+8yWfiCKQAv9o EWUztahI5eTdZXIJ/dourZevgPIMWBk3r5YUGqFPRSINY/ui+KKNaVTJxRLPh4aFVtbb/h RV6mf7Bn0PBrZfBw1MsgAnYGfY7AocsNC09+R0iGpNH3Rv/0dpN1Zi0jhsYzIST+plgs72 +cCp1a7HJ5RQ9ZmBcPNHe9Qm4XmEy4W3RNSzJ3RZVw0ehTDioRxxuakXbaIAfcroWGhPIr 3UUvcRmRgEqEbPGMHp8a2AM6ZRfLM72OhAGtSSbFkZ9q9oDUXpWjJ3mINUIRhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648670378; a=rsa-sha256; cv=none; b=GnuTxM+DOFMUmu8M0uiXWJGxiyqv+msLzQLEH7ajx8DJhIUW7FpxAtTcAzhRSkF+Fv8otE c/I8/dYLgaP9bWDWVx2lT09YpSSpHP0Y6bmgTH+C7BHnDlwgpZY3GUHOn39xGLRAVSDu+b GRcJ3kMS7Ins6TjN8rhyxD4ZVqp5Y4cjFq9okcENNnsSX8tqsJRNmB0L3NWcN2wRB1fNqJ DYXqyMegGd/90Y/iJqPsLsrl8JXD54KMOhLz86GJ+SnoYb7i9o4zhCIvXpPYyI5WvkKlv1 jjCTCbKa4nuugDI8a7J21ddRtNQ6UmlRzbHAyOlJiNsQDJFVIiFx+XIUEHmR1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7d1ab866911a2b29e041d64bc83a93638533f957 commit 7d1ab866911a2b29e041d64bc83a93638533f957 Author: Mark Johnston AuthorDate: 2022-03-30 19:41:44 +0000 Commit: Mark Johnston CommitDate: 2022-03-30 19:41:44 +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. PR: 260406 Reviewed by: kp MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34713 --- 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, 0); + uma_zone_set_max(V_pfr_kentry_z, PFR_KENTRY_HIWAT); V_pf_limits[PF_LIMIT_TABLE_ENTRIES].zone = V_pfr_kentry_z; V_pf_limits[PF_LIMIT_TABLE_ENTRIES].limit = PFR_KENTRY_HIWAT; }