From nobody Wed Oct 28 20:35:42 2026 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 4jFJz33lq1z6x6Gs for ; Wed, 28 Oct 2026 20:35:43 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFJz313dvz4R4W for ; Wed, 28 Oct 2026 20:35:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219743; 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=xJkB05lycfyqgB7FXGbzT5ayvJKViAIOq1UbqaiLmhA=; b=n8gHDSC0jJIkeFvhcEQhPgJ8b+8ali++t6rzun53E8X8uYEuDuifMTfmdj0sWx4axpLO7n OnN0WHtnUJGZSvkH1qFheyWXqUKvEUycvTvSDeKTUGH8wh0LhyeW4CIhjXAMkaa4sv0Pby oKZJsWS85Ldu889x7UcQrtpK7WEhhKw5InsWSAsTt/SKPLxysaVgqIywaAwXiJF2cJKv9V isocneHVrh/POWH16cgoxQ4dGPDi4x/Y2KJluMqosjOOUeBqmRneQwV0fJ0TAm7YLjN4Gb zxyWNzOxylL+3/X6g/fvdVJouK493xAKeYybI3ZjO+nCFWebXYLDuuu1FGT0jA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793219743; b=KhkTjQEZ4logcjJvlxJCe+Ut2XJEq8jT4+CiqVH6bWnJfk/Y22W14c04+ijS+vhJ891B6F FA+xBXQyQQqk4K/oS4HVA94UpCfm/V5KaXqQ1yq/UDBcCJVlK1t0hF5xhLKUprOaH/gCWS p/KbNkEhx+gi4nt+9MKwolgPPSkY9h+Sj5cnw8yd5caFZVoZoWTsTAFxAYy08dRaECXVpx Hu0XOkhGrK2TCYg/QuBZoi45+/PmsOcW1GUSqEn+CgpU0XClUe2/1TGso8wiFlfUVN4d4l SrS1y6BZwIGu6mKxqd/B9QItulqA428QF6FXuhBTbMo5xCLnKofRJ6pX2Qn0jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793219743; 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=xJkB05lycfyqgB7FXGbzT5ayvJKViAIOq1UbqaiLmhA=; b=fcWRphrzXdOTi7Ycgb2i7vNKetc/keDjQgyF7u+wCtza+FyuW8j5Pe5CZ2/SaThsW7JCZy vial9FHHGKLjRGKMezm5F6L2PIKYEz0Q03nn8FuuUatxLEN+C1v6zGXdyyL09zYce444Fz OJx7v1+O73H2Y1vo0hS42eMnPUdJZO/DVX0lmKCh9Xf9DEdSBHWdBpxrDn5sN7kF2ZwBa1 tosYTfCqL5Y2oTqTfgJqtJeK6UVSjeyGSp3XJ4EYRHdA9/CvCG/tapG1R7RMvblaXX67zy wfEtSCfqRRCN/TrChvloiws5vdO0n1VOyrgMCi6hKI2ddn1KPgeCgyuJ7Xspcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jFJz26kFBz1MTV for ; Wed, 28 Oct 2026 20:35:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d10b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 20:35:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: R. Christian McDonald Subject: git: 395b8ad1751b - stable/15 - pf: take the rules read lock in pf_handle_getrule() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rcm X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 395b8ad1751b9b8414bf2f8a692c7e79ac2a1e6a Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 20:35:42 +0000 Message-Id: <6ae25c9e.1d10b.386c3760@gitrepo.freebsd.org> The branch stable/15 has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=395b8ad1751b9b8414bf2f8a692c7e79ac2a1e6a commit 395b8ad1751b9b8414bf2f8a692c7e79ac2a1e6a Author: R. Christian McDonald AuthorDate: 2026-09-30 23:33:43 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-28 20:34:05 +0000 pf: take the rules read lock in pf_handle_getrule() pfctl -sr calls PFNL_CMD_GETRULE once per rule, and pf_handle_getrule() takes the rules write lock each time, so listing a ruleset of N rules stops packet processing N times. Only zeroing the counters (pfctl -z) needs the write lock. Take the read lock otherwise, as DIOCGETRULENV does. Reviewed by: kp Approved by: kp (mentor) Fixes: 777a4702c591 ("pf: implement addrule via netlink") MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D60161 (cherry picked from commit 6d7f0162bd5d25919cc18119a6e5a371acb2cf78) --- sys/netpfil/pf/pf_nl.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index cfed37fdba80..d0c10a165969 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -884,6 +884,17 @@ pf_handle_getrule(struct nlmsghdr *hdr, struct nl_pstate *npt) u_int64_t src_nodes_total = 0; int rs_num; int error; + PF_RULES_RLOCK_TRACKER; + +/* The write lock to clear counters, the read lock to only read them. */ +#define PF_GETRULE_LOCKOP(op) do { \ + if (attrs.clear) \ + PF_RULES_W##op(); \ + else \ + PF_RULES_R##op(); \ +} while (0) +#define PF_GETRULE_LOCK() PF_GETRULE_LOCKOP(LOCK) +#define PF_GETRULE_UNLOCK() PF_GETRULE_LOCKOP(UNLOCK) error = nl_parse_nlmsg(hdr, &getrule_parser, npt, &attrs); if (error != 0) @@ -897,23 +908,23 @@ pf_handle_getrule(struct nlmsghdr *hdr, struct nl_pstate *npt) ghdr_new->version = 0; ghdr_new->reserved = 0; - PF_RULES_WLOCK(); + PF_GETRULE_LOCK(); ruleset = pf_find_kruleset(attrs.anchor); if (ruleset == NULL) { - PF_RULES_WUNLOCK(); + PF_GETRULE_UNLOCK(); error = ENOENT; goto out; } rs_num = pf_get_ruleset_number(attrs.action); if (rs_num >= PF_RULESET_MAX) { - PF_RULES_WUNLOCK(); + PF_GETRULE_UNLOCK(); error = EINVAL; goto out; } if (attrs.ticket != ruleset->rules[rs_num].active.ticket) { - PF_RULES_WUNLOCK(); + PF_GETRULE_UNLOCK(); error = EBUSY; goto out; } @@ -922,7 +933,7 @@ pf_handle_getrule(struct nlmsghdr *hdr, struct nl_pstate *npt) while ((rule != NULL) && (rule->nr != attrs.nr)) rule = TAILQ_NEXT(rule, entries); if (rule == NULL) { - PF_RULES_WUNLOCK(); + PF_GETRULE_UNLOCK(); error = EBUSY; goto out; } @@ -1034,7 +1045,10 @@ pf_handle_getrule(struct nlmsghdr *hdr, struct nl_pstate *npt) if (attrs.clear) pf_krule_clear_counters(rule); - PF_RULES_WUNLOCK(); + PF_GETRULE_UNLOCK(); +#undef PF_GETRULE_LOCKOP +#undef PF_GETRULE_LOCK +#undef PF_GETRULE_UNLOCK if (!nlmsg_end(nw)) { error = ENOMEM;