From nobody Mon Nov 13 09:35:30 2023 X-Original-To: dev-commits-src-all@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 4STPRk4Bqbz50plf; Mon, 13 Nov 2023 09:35:30 +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 4STPRk3dfgz3cH6; Mon, 13 Nov 2023 09:35:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699868130; 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=4PZtEVNyMMrlRrbZlQVQeiO/3QWL13Mkz3vXEstSud8=; b=KyIVJn0DYaIzGj3F+90wj4KZHJmzmfioTshbkiBWmQ7XWl5xgS6bsVHqDvvicLR3B4gsNq WNMaWLcNtofJ7lOM+uN+wB2GAdsbQGW9YKrKgsTWzgsEvGDRn14HREqjqb0qagCmzhiVkV 3n6oTJrh8smtf72860kgLwfI+2jQF2lOOCvVgB+nQ8U4dJA2mMfMD4qrEM9I6QBsKBBHs4 lG1T1wm93zrgBmNuneRVVUCQEEmvQiWU9FFZxkMNLmqozAorES1Hg05GVFdmgNNy+cBSbl p1H0nvYPSiiaRGHsRPnFqh+UaEF3P/EmWwpb/ZSvXftN2cHs7AQg6VTxmW+qvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699868130; 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=4PZtEVNyMMrlRrbZlQVQeiO/3QWL13Mkz3vXEstSud8=; b=rtLchKdYySvMw2VhatrzA3+TnreH7EGsJ06L5KEODw/T0h9St+aAmw82Q6PzaYAxIT0pzz QWg1qrjnr4OBt52ex44e+5Y84IxiTnUeUklm0C09dPRy49qx1ippsyEvHhZMmIalN81cpS yiJECaHm5LeRgc+17fg00jUjgeELgyTXhlSPRGtd9DxMQPKTFLGer+X0jvJbv5Jae9DDMd TmmTk4JmT6OXz9kaHMx2pVaWvSURVBoDMtWy0l6eaqMqfF/suPJplE4ms39lgvjub+PzFr hBe59FGAhqyfhTNaD4qQAZAKrdsIT5cWXrWAkBpMsOtBdt/v6nQVlEorzxe6EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699868130; a=rsa-sha256; cv=none; b=uqUcSJk0A1cCe4qCTlhvEfSI3KHz2+etXi5nyGrCKIfq2IBgd0iTSoqai+1ZffAd0LcV9h QEadD+meEItStFibs2CHYnunPaopwVA4dhbwB9tOZnS+1ezCVTZOJkL9EHS8whoMu0FbrI rUr4UAHC35jh1DGOZ8bzwIXrjuwBIepWPNSGLO161dB+2ZATmPy0eZA/ATicq/fhci2q2C S7caKi4S9p5vr1ul58J6v4Olq8lMEnlc5kfv3nZR8VGChJMAMHfHxg1cwE7K1UDMZbEjYi 50qB+C68/7bA0bbt1Z69vhXV97hXndTG80bYoWWxHpriCA35x+eA1Xtwst2Waw== 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 4STPRk2hzXz118V; Mon, 13 Nov 2023 09:35:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AD9ZUo4075835; Mon, 13 Nov 2023 09:35:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AD9ZUpC075832; Mon, 13 Nov 2023 09:35:30 GMT (envelope-from git) Date: Mon, 13 Nov 2023 09:35:30 GMT Message-Id: <202311130935.3AD9ZUpC075832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 94b8a547c53b - stable/14 - pf: expose more syncookie state information to userspace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 94b8a547c53b675a775fa824b433e23e5a28aee6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=94b8a547c53b675a775fa824b433e23e5a28aee6 commit 94b8a547c53b675a775fa824b433e23e5a28aee6 Author: Kristof Provost AuthorDate: 2023-11-06 21:20:32 +0000 Commit: Kristof Provost CommitDate: 2023-11-13 07:10:27 +0000 pf: expose more syncookie state information to userspace Allow userspace to retrieve low and high water marks, as well as the current number of half open states. MFC after: 1 week Sponsored by: Modirum MDPay (cherry picked from commit a6173e94635b03aa7aab90a67785c8c3e7c6247b) --- lib/libpfctl/libpfctl.c | 1 + lib/libpfctl/libpfctl.h | 1 + sbin/pfctl/pfctl_parser.c | 5 +++++ sys/netpfil/pf/pf_ioctl.c | 1 + sys/netpfil/pf/pf_syncookies.c | 2 ++ 5 files changed, 10 insertions(+) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 03907698e7d2..72da534ac1df 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -1476,6 +1476,7 @@ pfctl_get_syncookies(int dev, struct pfctl_syncookies *s) s->highwater = nvlist_get_number(nvl, "highwater") * 100 / state_limit; s->lowwater = nvlist_get_number(nvl, "lowwater") * 100 / state_limit; + s->halfopen_states = nvlist_get_number(nvl, "halfopen_states"); nvlist_destroy(nvl); diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index f436e722496f..edaffdd12118 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -381,6 +381,7 @@ struct pfctl_syncookies { enum pfctl_syncookies_mode mode; uint8_t highwater; /* Percent */ uint8_t lowwater; /* Percent */ + uint32_t halfopen_states; }; struct pfctl_status* pfctl_get_status(int dev); diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index 0268d1b07c79..cb307cd6ede5 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -628,6 +628,11 @@ print_status(struct pfctl_status *s, struct pfctl_syncookies *cookies, int opts) PFCTL_SYNCOOKIES_MODE_NAMES[cookies->mode]); printf(" %-25s %s\n", "active", s->syncookies_active ? "active" : "inactive"); + if (opts & PF_OPT_VERBOSE2) { + printf(" %-25s %d %%\n", "highwater", cookies->highwater); + printf(" %-25s %d %%\n", "lowwater", cookies->lowwater); + printf(" %-25s %d\n", "halfopen states", cookies->halfopen_states); + } printf("Reassemble %24s %s\n", s->reass & PF_REASS_ENABLED ? "yes" : "no", s->reass & PF_REASS_NODF ? "no-df" : "" diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 6b8fbf77fd29..de43570176cb 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -5918,6 +5918,7 @@ pf_getstatus(struct pfioc_nv *nv) nvlist_add_number(nvl, "reass", V_pf_status.reass); nvlist_add_bool(nvl, "syncookies_active", V_pf_status.syncookies_active); + nvlist_add_number(nvl, "halfopen_states", V_pf_status.states_halfopen); /* counters */ error = pf_add_status_counters(nvl, "counters", V_pf_status.counters, diff --git a/sys/netpfil/pf/pf_syncookies.c b/sys/netpfil/pf/pf_syncookies.c index b5e59178e7e8..c5ee64c6aed0 100644 --- a/sys/netpfil/pf/pf_syncookies.c +++ b/sys/netpfil/pf/pf_syncookies.c @@ -162,6 +162,8 @@ pf_get_syncookies(struct pfioc_nv *nv) V_pf_status.syncookies_mode == PF_SYNCOOKIES_ADAPTIVE); nvlist_add_number(nvl, "highwater", V_pf_syncookie_status.hiwat); nvlist_add_number(nvl, "lowwater", V_pf_syncookie_status.lowat); + nvlist_add_number(nvl, "halfopen_states", + atomic_load_32(&V_pf_status.states_halfopen)); nvlpacked = nvlist_pack(nvl, &nv->len); if (nvlpacked == NULL)