From nobody Sat Jul 19 19:47:41 2025 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 4bkxyk1KpZz62FBv; Sat, 19 Jul 2025 19:47:42 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bkxyj4dJlz3pRF; Sat, 19 Jul 2025 19:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752954461; 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=b7NbsnS41HqAD0y9CGjPlp+2Yob1ZZED7QlZFf8fDDE=; b=SwP1HO/EhvPv42xkhdI05brym85Qi0rmnggCDovE4VR2xqRMR4K0ynGod72ykBjUs5vLRE H4BaL/C1ILa/eQczv22Y/vov0dnOsgEZe2xIH6CUzG3eJIzddrVFFp7y9TZepa7q3b9XmN XrAesH9qKZmDKkYD+zbTVMHmP89NpbGlratIbxjzbsPuLx24kspmwRMq3K8s0VyIOlxJOE GhQs38ee6JRXA8MbePotVDJO40q9c+XlXNnk+i7OmHcvdb7NPyGWbrh1i9u+feMx/AprL2 3RYh0W2Fl6CvAbGxx5Rk+bdWI7HzVvnLJXtLVWfXEKjsZcojyv+DuClbOaFKFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752954461; 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=b7NbsnS41HqAD0y9CGjPlp+2Yob1ZZED7QlZFf8fDDE=; b=xWOg5VVdY0HGRA+1eAYGdOUQoUIJqOpZMbuuhpUbqyU0EFnb1e01rRK+jlFeGkN4CmkYNk Oxmh7tqz6NVsIlnqyRh0+iGKG38gVifAFEf7PIn8e1JBwkhSLuC04OjfzLsyYByiSnK3F5 nHHiVVKum4L6q8ZEzUSPnpP4QlrOlannFqY21SoQAzLAPKzqYEAf+PY/MVJvkV++nLPEWc 7Lj29zWI2S7q14QUg4EtJ6T6djZUkjEgfPRQCqls6LC/u0Po5lWrfu+Jfwvk+aEDHXj870 FeryNlpcxxQNnsFnqUwJsyi2HLnRgBrDfjEenQi9b4LnCq+pFy9AhNigcZnZ1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752954461; a=rsa-sha256; cv=none; b=vmCCdLClXR3gkvFhuKVX4HrnQBahdsS7TzldDn/SwyAa86mb3RFtjGelhDUxXYCrWqG8YG ZTzbuRPn0Twr8VNCf2SIL4J3RTqoqfwHdCa+bJZcpABs1eGN5d33J8bmYAhbvyt7/ZvcwE P3Ko5FtjDnqdTpz528SJeLRNQr2OOWaO920DCyUDhM8zXLJ3BlYHxy5H+pZ1eGj3qNucxq Q3Xw9T+lHZ/fhQVxJx5aGcnMhYXDirDz57V0hYZSx1kpqhmIymDL52bW7O01M1Zg8C3o+d gu1ta85DaiBt7FzcmdVTiQpl5oPLJB8et6PKQBmpZb8nhheqNilXS0pYT0QqSw== 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 4bkxyj3s7Zzg4F; Sat, 19 Jul 2025 19:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56JJlftG065421; Sat, 19 Jul 2025 19:47:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56JJlfsA065418; Sat, 19 Jul 2025 19:47:41 GMT (envelope-from git) Date: Sat, 19 Jul 2025 19:47:41 GMT Message-Id: <202507191947.56JJlfsA065418@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: b153804256c5 - main - mld: allow sysctls to be set per vnet 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b153804256c53736ce45f1ef7a610d99efece0f7 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b153804256c53736ce45f1ef7a610d99efece0f7 commit b153804256c53736ce45f1ef7a610d99efece0f7 Author: Kristof Provost AuthorDate: 2025-07-18 11:22:54 +0000 Commit: Kristof Provost CommitDate: 2025-07-19 19:47:06 +0000 mld: allow sysctls to be set per vnet Allow net.inet6.mld.use_allow, net.inet6.mld.v2enable and net.inet6.mld.v1enable to be set per vnet. While here convert them to booleans. Reviewed by: glebius, zlei Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D51409 --- sys/netinet6/mld6.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index 06fe9e8820c9..a825658bd9ee 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -234,17 +234,20 @@ static SYSCTL_NODE(_net_inet6_mld, OID_AUTO, ifinfo, CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_mld_ifinfo, "Per-interface MLDv2 state"); -static int mld_v1enable = 1; -SYSCTL_INT(_net_inet6_mld, OID_AUTO, v1enable, CTLFLAG_RWTUN, - &mld_v1enable, 0, "Enable fallback to MLDv1"); +VNET_DEFINE_STATIC(bool, mld_v1enable) = true; +#define V_mld_v1enable VNET(mld_v1enable) +SYSCTL_BOOL(_net_inet6_mld, OID_AUTO, v1enable, CTLFLAG_VNET | CTLFLAG_RWTUN, + &VNET_NAME(mld_v1enable), 0, "Enable fallback to MLDv1"); -static int mld_v2enable = 1; -SYSCTL_INT(_net_inet6_mld, OID_AUTO, v2enable, CTLFLAG_RWTUN, - &mld_v2enable, 0, "Enable MLDv2"); +VNET_DEFINE_STATIC(bool, mld_v2enable) = true; +#define V_mld_v2enable VNET(mld_v2enable) +SYSCTL_BOOL(_net_inet6_mld, OID_AUTO, v2enable, CTLFLAG_VNET | CTLFLAG_RWTUN, + &VNET_NAME(mld_v2enable), 0, "Enable MLDv2"); -static int mld_use_allow = 1; -SYSCTL_INT(_net_inet6_mld, OID_AUTO, use_allow, CTLFLAG_RWTUN, - &mld_use_allow, 0, "Use ALLOW/BLOCK for RFC 4604 SSM joins/leaves"); +VNET_DEFINE_STATIC(bool, mld_use_allow) = true; +#define V_mld_use_allow VNET(mld_use_allow) +SYSCTL_BOOL(_net_inet6_mld, OID_AUTO, use_allow, CTLFLAG_VNET | CTLFLAG_RWTUN, + &VNET_NAME(mld_use_allow), 0, "Use ALLOW/BLOCK for RFC 4604 SSM joins/leaves"); /* * Packed Router Alert option structure declaration. @@ -481,7 +484,7 @@ mld_domifattach(struct ifnet *ifp) mbufq_init(&mli->mli_gq, MLD_MAX_RESPONSE_PACKETS); if ((ifp->if_flags & IFF_MULTICAST) == 0) mli->mli_flags |= MLIF_SILENT; - if (mld_use_allow) + if (V_mld_use_allow) mli->mli_flags |= MLIF_USEALLOW; MLD_LOCK(); @@ -614,7 +617,7 @@ mld_v1_input_query(struct ifnet *ifp, const struct ip6_hdr *ip6, is_general_query = 0; - if (!mld_v1enable) { + if (!V_mld_v1enable) { CTR3(KTR_MLD, "ignore v1 query %s on ifp %p(%s)", ip6_sprintf(ip6tbuf, &mld->mld_addr), ifp, if_name(ifp)); @@ -790,7 +793,7 @@ mld_v2_input_query(struct ifnet *ifp, const struct ip6_hdr *ip6, NET_EPOCH_ASSERT(); - if (!mld_v2enable) { + if (!V_mld_v2enable) { CTR3(KTR_MLD, "ignore v2 query src %s on ifp %p(%s)", ip6_sprintf(ip6tbuf, &ip6->ip6_src), ifp, if_name(ifp)); @@ -1076,7 +1079,7 @@ mld_v1_input_report(struct ifnet *ifp, const struct ip6_hdr *ip6, NET_EPOCH_ASSERT(); - if (!mld_v1enable) { + if (!V_mld_v1enable) { CTR3(KTR_MLD, "ignore v1 report %s on ifp %p(%s)", ip6_sprintf(ip6tbuf, &mld->mld_addr), ifp, if_name(ifp));