From nobody Mon Apr 11 14:53:17 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 231051AAB4D0; Mon, 11 Apr 2022 14:53:18 +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 4KcX0Z0HCZz3Qb7; Mon, 11 Apr 2022 14:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649688798; 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=4hVZiuubm4rnSX4egdTTPzPZCtlBUhM78kiVHILbM+I=; b=Gbf+d++ESsg2XEEWGFex1Q0YszfMFOU0D6hB7Xt/qLrtQTNWekR83voKU7/aMsUwXEfKNo V0kMhSXHfe8NafKnSumWb3huSVbptgSxaN+pf6P9T2zTo2FrfWLtAFg279YApOIXFoIu5j k19tkbJtHRU8i2Ih/8jLJaeRsv5hkeczReG9dMrg6MfpCzIM8eU10AWaSsp49fMFBoPMiy qYrdVpMyuXZgSHCIZ0a87ou7Fwg1PX1N0o/tM8t1vu40QWMnMfSDAlIX9MvxB+wab3fZDl TC5bj1g0/ASG+ucXiaJrgSmWoKHytt5Bk+r5a71QgbCA+w8nbmykoDHebr6UNQ== 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 DEC0825192; Mon, 11 Apr 2022 14:53:17 +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 23BErHp5023017; Mon, 11 Apr 2022 14:53:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23BErHa4023012; Mon, 11 Apr 2022 14:53:17 GMT (envelope-from git) Date: Mon, 11 Apr 2022 14:53:17 GMT Message-Id: <202204111453.23BErHa4023012@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: 68efe27ffaec - stable/13 - pfsync: Add CTLFLAG_VNET to carp_demotion_factor sysctl 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 68efe27ffaec8bec9968800f2eddeca2940b78e4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649688798; 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=4hVZiuubm4rnSX4egdTTPzPZCtlBUhM78kiVHILbM+I=; b=eRgDDo4WeidnbqIDaFccABsvZJPQamrZ0DGg4lQOa2HtNGjRosQBOxlkoxCD3bGLQWzZkS rtBhRKXvY1CgJ9NMpzLyrIT3ITqO11vTPr5EVMczF2EUhkMRBV/jK/G3f/0ooW9Mu69RBh mqvJj1feeSW+3jIe86fdm4X/X80+3oazTx4J3W/zUUI2bk1nRUDerrWhWOq+VvOxvVShwF CjPlbTuQHIzkMIHbL4ZNv3rMc5h53bw6k2eM8iRJd/y1JhnOaAR9GcUgB78ybAyvooegbD c212XLpQo7ONDRsrhkjlF5v06z3fe3gMHyp6pSZOr30E+g3+twbO7wtnK6TVmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649688798; a=rsa-sha256; cv=none; b=EF/resye0e5E1mCIHb10HVETEsefry0WXuYeGdCZW44k1HujBzTF3C/S3jpQ70tV937Enh 9TToDWjBoHzknwYODsU2AXpTilUWTnmsuzGWwoG+hTCp/bXpUov21zcx4s65Sz/M0BAP10 WTV4ZnzsQ6qtbnLao0XP4JKj1tjEkUkoTfaezPinJeeDkLfRaCS0q4veb/4HB4ruR3GrEL ulitf+U87J63R/6FY4JXzBdd+qhSuDrwNu8UAmXVSawn1SPU9cCEGODqecfENDut0ZZVqd DMqoFCSwXRapwRZGcQR1ST3qf6weVguE3z7zY6vgaK7OIVf/J9n3oKLtRLB3qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=68efe27ffaec8bec9968800f2eddeca2940b78e4 commit 68efe27ffaec8bec9968800f2eddeca2940b78e4 Author: Luiz Amaral AuthorDate: 2022-04-02 10:09:06 +0000 Commit: Kristof Provost CommitDate: 2022-04-11 14:52:33 +0000 pfsync: Add CTLFLAG_VNET to carp_demotion_factor sysctl When trying to avoid a CARP demotion during a pfsync service restart, I noticed that a non-default value for the net.pfsync.carp_demotion_factor sysctl was not being applied during the demotion. The CARP was always demoted by 240. After investigating, I realized that the sysctl was using VNET_NAME() without the CTLFLAG_VNET. PR: 262983 Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D34737 (cherry picked from commit 654c1b8ef3c0fcbad3a77ea2a6f35c0dffc86e88) --- sys/netpfil/pf/if_pfsync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index b4f25728d17b..cc3c4ec0217b 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -278,7 +278,7 @@ SYSCTL_NODE(_net, OID_AUTO, pfsync, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, SYSCTL_STRUCT(_net_pfsync, OID_AUTO, stats, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(pfsyncstats), pfsyncstats, "PFSYNC statistics (struct pfsyncstats, net/if_pfsync.h)"); -SYSCTL_INT(_net_pfsync, OID_AUTO, carp_demotion_factor, CTLFLAG_RW, +SYSCTL_INT(_net_pfsync, OID_AUTO, carp_demotion_factor, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(pfsync_carp_adj), 0, "pfsync's CARP demotion factor adjustment"); SYSCTL_ULONG(_net_pfsync, OID_AUTO, pfsync_buckets, CTLFLAG_RDTUN, &pfsync_buckets, 0, "Number of pfsync hash buckets");