From nobody Sat Apr 02 15:18:26 2022 X-Original-To: dev-commits-src-branches@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 802BF1A4D14F; Sat, 2 Apr 2022 15:18:26 +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 4KW0zk3BHCz3PJt; Sat, 2 Apr 2022 15:18:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648912706; 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=bKfKqHV+uYfKI4Cmm4ADgyg6JnTyQ739AcW2BpEFSsM=; b=SqG/LMw52NsfkUUUb6qkNSX+Rx0I68qv+uyLc9x+PnSBOqx2qsC3d1l59UA6g/oPOyqOiq rQcWCNuoIEtEkrkKgZJ2zDKhf2FY8ODA5tUWQ1OEGpcE1i9g9Bv5+tVotagfwxG9w4Pc9C x69eAnD1ClCJJxjtqGIzVwGTAJ2xIloNhBrGITe/eTZnplYMMbdCZNYFwBSYDDg3JyQmt0 kD9OlRvgDsD2/eNA3M/ug0pJ7Tr4pwDau8f01NsHRkBC9OgilS9Agjt1pLmkJup2zrYQIh FLgs7l22yI417Lm1JYzf0LfpqmRvPp9r0Wu+Jy/+q3XV3f65zWJQGVTpbIuKpA== 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 49E013406; Sat, 2 Apr 2022 15:18:26 +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 232FIQt6039976; Sat, 2 Apr 2022 15:18:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 232FIQ5Y039975; Sat, 2 Apr 2022 15:18:26 GMT (envelope-from git) Date: Sat, 2 Apr 2022 15:18:26 GMT Message-Id: <202204021518.232FIQ5Y039975@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1487f84223ce - stable/13 - pf: Initialize the table entry zone limit at initialization time List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 1487f84223ce1341ebdfc87e50fbcddedc6d1de8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648912706; 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=bKfKqHV+uYfKI4Cmm4ADgyg6JnTyQ739AcW2BpEFSsM=; b=TEdD3WxG5uXUCfNFn+BbkZx8r5nApAHBABdvVKvAlhAH6iFrsqE6NPHo2MDpZRp39HUlSy Xm5Wq563yHwCUWElZCLe6OL+OZsjH7UfGR3s3hDrOsHivIbQEK6OMvwm8euMJU2GC3voBf JLI7rO9BCWPs/pwEINTihN1d3xunbBmuFojQ/Gnj0EnggW7N1nz1YNeMp7q2CqRiQWMmbo bapVWcdZHK8ZTsIHxwoHCiGzv7FUD2Cl5H2HtRudyKWXMu4dtcXRCqsw/GjO7bXheyoAAn 9aGHZfMfJFtJG+fKUaKuEwG4Vgva3pL+1GuiZzNVrYz8hj0rcmNbWDrzpmXVtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648912706; a=rsa-sha256; cv=none; b=Pf9nrae1JLnbuEpgn1iB0yqLtzaUyoTyq0OFoUNLa3eH/2/yzEnCUC3OS4DwzhiqW/xtGB ZmLGQJ214IQP/+VUsh6T+ZdkTqHzDyAI0flmxa9e5UqFIOAoKot4hJVXXv/YFqsrummqOz foJXOyCR00qMlt3A+Jrf1fOAOWmHAytF0e64N2xOB9r5bmQMojEXo4GTFWI0YhbkdY2N45 BQwsOh9+DgMFIneNVxxK4qB4Lq0vIMprodDRDT3gcflYpaRvzYxk6zp7i9I99ETlqmzWnG FCuJ54CqGXHHtfAkKgzpKWomHkTPwJCyPJ+CkZOfBOmtQqMsaPGg/hFxDaRY0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1487f84223ce1341ebdfc87e50fbcddedc6d1de8 commit 1487f84223ce1341ebdfc87e50fbcddedc6d1de8 Author: Mark Johnston AuthorDate: 2022-03-30 19:41:44 +0000 Commit: Mark Johnston CommitDate: 2022-04-02 15:18:15 +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 Sponsored by: The FreeBSD Foundation (cherry picked from commit 7d1ab866911a2b29e041d64bc83a93638533f957) --- 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; }