From nobody Mon Oct 02 00:50:47 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 4RzMng5Msjz4w2wB; Mon, 2 Oct 2023 00:50:47 +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 4RzMng4qJBz4r7J; Mon, 2 Oct 2023 00:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696207847; 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=76SIPGKLgEkL9TOLwbzKK18QPIodl+BSeDKYdEtDj7Q=; b=qg7HbjTxxUA5173vsLLRryMkiGd5xgEJD2/T937pq8ek9naB2SerzLYrWfNds12EOqgW+m I09cp1c5WwFt+mtbQ9PM8fHNT/s9TJjO9sZTuxwh6ro2BI5FXaKfolQJ7asAjLd+HA8hUk SO5BOLlX3jAdqKM1TV4WOPJtpded4oXJgKAJ6t6LqJwPBwKPswqZiN0W30zRPRrgTGjbRx 9QnbXjzlW4D5o04GgaL63aT2vc06/oGdPkaN5SYtEITZvtjS7XjbvCKjARIxmWXdAUbKu/ pdnZQNApnRG6QJPyLguGNUBvSn5kDyPI35F4lx4B+7b4xKWApFQy4GoZoxlLPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696207847; a=rsa-sha256; cv=none; b=rWaoVbz3AGZAf+wZswa9zREnAUO4uVgGqvXPaUNN4VzwdvkEhHwKkzFjpl/YCPT2Cix68n W04eCBbbrQgeIdR9Zmfv7ncTZzp5Z2JJ+zZrJb6jhzxDbsBqrEjeLNuIFOInaz9XZgoxlK 0VMRabDPKfFPFuALYtrq/MuoD5pkcVZ7sVFIva00fAvbshUauBqAgf9PcZ/aYwLy2KW9N1 rzBPKfkUV5/voN/7RoFPcbFEB2PjI+6mUm65wQIV2LRuwDk7KDg5Tu/Bjuak1z5PQ1IrcP okwlWix9a78MTkaGj/RaMonif0hg6GCoztRFrlSCYuzG3Z4QOA9/ytgIqU12VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696207847; 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=76SIPGKLgEkL9TOLwbzKK18QPIodl+BSeDKYdEtDj7Q=; b=VqUsA7Q284/3ugl+SGrm+HXy+PVey4hbVUWYGqc3DMsnK2zHV40NqxFOF9HMH7duOjsFfB xgE+OrbN2XIFAz5qaxEmfKzWQN3MBz5gSGmJUQHPTmM/autV1AY5mvo1CLQgxoCAsQnOwo t3nrBYJVWFlPOuf2bDagF1DmIlj9t1mq53KTiUovDfbiOVxqQrj0T8ZRS51JO2QSdboKiN 45mMq8P2IE/P2V4A4xsPJGBwoBmMTRnkVOQTRfuiAtSGOl6OAZaaWANi2wZTP1InO4epN3 /umFImDGhazpVYx8CoYMzWRsKHQ5wnxezgFXdHzNRqUOUb/UETtbF8yAS4FCFg== 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 4RzMng3jhczrGD; Mon, 2 Oct 2023 00:50:47 +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 3920olqm029412; Mon, 2 Oct 2023 00:50:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3920olZM029409; Mon, 2 Oct 2023 00:50:47 GMT (envelope-from git) Date: Mon, 2 Oct 2023 00:50:47 GMT Message-Id: <202310020050.3920olZM029409@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: b0f026435a15 - stable/14 - ip_mroute: Fix sysctl knobs 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b0f026435a150933ecb6f2d1359fd1b4898657f1 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=b0f026435a150933ecb6f2d1359fd1b4898657f1 commit b0f026435a150933ecb6f2d1359fd1b4898657f1 Author: Zhenlei Huang AuthorDate: 2023-09-27 16:23:22 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-02 00:49:38 +0000 ip_mroute: Fix sysctl knobs The loader tunable `net.inet.ip.mfchashsize` does not have corresponding sysctl MIB entry. Just add it. While here, the sysctl variable `net.inet.pim.squelch_wholepkt` is actually a loader tunable. Add sysctl flag CTLFLAG_TUN to it so that `sysctl -T` will report it correctly. Reviewed by: kp Fixes: 443fc3176dee Introduce a number of changes to the MROUTING code MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41997 (cherry picked from commit f549e22901b3a391c76659bee55802b1214112fd) --- sys/netinet/ip_mroute.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 2444fd9686f7..cda5f160e8fb 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -172,7 +172,9 @@ VNET_DEFINE_STATIC(u_long, mfchash); ((g).s_addr >> 20) ^ ((g).s_addr >> 10) ^ (g).s_addr) & V_mfchash) #define MFCHASHSIZE 256 -static u_long mfchashsize; /* Hash size */ +static u_long mfchashsize = MFCHASHSIZE; /* Hash size */ +SYSCTL_ULONG(_net_inet_ip, OID_AUTO, mfchashsize, CTLFLAG_RDTUN, + &mfchashsize, 0, "IPv4 Multicast Forwarding Table hash size"); VNET_DEFINE_STATIC(u_char *, nexpire); /* 0..mfchashsize-1 */ #define V_nexpire VNET(nexpire) VNET_DEFINE_STATIC(LIST_HEAD(mfchashhdr, mfc)*, mfchashtbl); @@ -226,7 +228,7 @@ SYSCTL_VNET_PCPUSTAT(_net_inet_pim, PIMCTL_STATS, stats, struct pimstat, pimstat, "PIM Statistics (struct pimstat, netinet/pim_var.h)"); static u_long pim_squelch_wholepkt = 0; -SYSCTL_ULONG(_net_inet_pim, OID_AUTO, squelch_wholepkt, CTLFLAG_RW, +SYSCTL_ULONG(_net_inet_pim, OID_AUTO, squelch_wholepkt, CTLFLAG_RWTUN, &pim_squelch_wholepkt, 0, "Disable IGMP_WHOLEPKT notifications if rendezvous point is unspecified"); @@ -2817,18 +2819,12 @@ ip_mroute_modevent(module_t mod, int type, void *unused) return (EINVAL); } - mfchashsize = MFCHASHSIZE; - if (TUNABLE_ULONG_FETCH("net.inet.ip.mfchashsize", &mfchashsize) && - !powerof2(mfchashsize)) { + if (!powerof2(mfchashsize)) { printf("WARNING: %s not a power of 2; using default\n", "net.inet.ip.mfchashsize"); mfchashsize = MFCHASHSIZE; } - pim_squelch_wholepkt = 0; - TUNABLE_ULONG_FETCH("net.inet.pim.squelch_wholepkt", - &pim_squelch_wholepkt); - pim_encap_cookie = ip_encap_attach(&ipv4_encap_cfg, NULL, M_WAITOK); ip_mcast_src = X_ip_mcast_src;