From nobody Wed Sep 27 16:24:28 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 4RwhlK28Tgz4vfL8; Wed, 27 Sep 2023 16:24:29 +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 4RwhlK1XDqz3Qd0; Wed, 27 Sep 2023 16:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695831869; 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=+Hdev44iTjvdXgH1r9xdZsJdxKGQ6dcDqiPqtP8gtCY=; b=EKAf7T42rL/zpGjNrcLNUz/iiKQ2He+p0fThvZPyuJdTYT7DMw1I+zhKAGvllEn4DuRf0W Eg6bhHlXlpW/kmlCFDmxTj2EdWguSSijHBFLRY3pJNwcj2khREcYQVZdeHXEAih8IMe/WG NQ5cCUO6M80Ev7a7Y0sASzZ9xbxk+pkGP054ywT1gOFVg+fDwzBbWMWdn6SI/ets/H7fiN HGNOSWV6cYpatZhcc5XfFTXax/pWPcAmiyCFCT7fnV/YkI9rvsfe7jPh4bu9lppSnfZJhL 56BOGfCZTZT52QPuyL3/CpsaoL+0JJ7/6Ow4zodrTSHHxluCo+ycyYcnUbcjZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695831869; a=rsa-sha256; cv=none; b=qaM57tGDja/qL8PjrNhBYuZ2kXf9gROwDH+d0soSU1R/3ymPhGg3YMqjPXmrTW+X23zIys qh2UVB9ggrx/Vt1IH9BlJBO1aW3DMgt8JiHgcz6zqG3qylCqHcggkI7fKJ96pTu6sQjzUR dN69uPGvS//4gz9mttfYQQJy2oO3WJi2GKL+OOWbhscXx1Xs7zhAgpe0ZU0DBK6r1zrvrb Uj2oVlGQGOgXIQAdhq1Sn5CyXDCDqMz1WPoG5va3qpSwO3tu/B64mtTrOmnzIfCko2rBlj dE873AV+TSCcOX/ygYO1K3wQIc7TNMrpdw/HAKVq/WGZkFLbxC/z52Yt4JjoNA== 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=1695831869; 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=+Hdev44iTjvdXgH1r9xdZsJdxKGQ6dcDqiPqtP8gtCY=; b=nfK4YBYQut/LY8Yn4VgvGHz3N8FVw6Dmyb28cA28FmyRTBetjPsRr5Oi3/UY/Zm3CFAwvx IstNYs6CdfmOX57W/H1/8nN5W5uaowViFW4uI4KcikFL0ap6wBcfB3ipadtGHB5sS/b8oF wjQu7ke8cjLKZVN7FY8Nkg7/omlozinMAL+FJh8//1TxdjgjcnO/x/D4zXuUruix7Yq8iI 2C5WJ+1Yh+VVP06IYK8JrYVQJHud5L3vzIWnIAZeKmW+oHekudLvdmKzIe/C2rPHUUj6DC M6NSf80IeN64//cemnsCh+knPVI4BmC7Nks8+5VlGYwQfLW4eQns1GTKylooWg== 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 4RwhlK0bHQzm7P; Wed, 27 Sep 2023 16:24:29 +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 38RGOS8G076705; Wed, 27 Sep 2023 16:24:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38RGOSFV076702; Wed, 27 Sep 2023 16:24:28 GMT (envelope-from git) Date: Wed, 27 Sep 2023 16:24:28 GMT Message-Id: <202309271624.38RGOSFV076702@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: f549e22901b3 - main - 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/main X-Git-Reftype: branch X-Git-Commit: f549e22901b3a391c76659bee55802b1214112fd Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f549e22901b3a391c76659bee55802b1214112fd commit f549e22901b3a391c76659bee55802b1214112fd Author: Zhenlei Huang AuthorDate: 2023-09-27 16:23:22 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-27 16:23:22 +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 --- 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;