From nobody Wed Apr 8 14:04:39 2026 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 4frPvW5gXpz6YBWf for ; Wed, 08 Apr 2026 14:04:39 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4frPvW4swbz3mQ4 for ; Wed, 08 Apr 2026 14:04:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775657079; 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=b+8u++hndO9m3PX93Wecu7gFbzHQov0gErHr1q0wj9s=; b=CtRTUlxOgwdD5Nucu06tvZqoMruaNEYjeecebpRahGaVEHcf6tFMbbnxiPKm44GihYcDej gtXZBIiBe/qTAZuinEVvkkW6BnhU3pXpbYGQ7SmZUU0bmG9pVONi1jn31XhxSM3eWBnJiz OTHdjVlu2K05u52Q8itmLygl8QgtA8nmOuGvSzwiwwLjsg3+QP5y2YNwhxhjMrziS0q88z pVig4GLMvXvGvo6QV5OVRa1saPk/MetkxSlMHVyT7qLRFLdqDQEN4zl1f7vZ7kNk1Xh23c WKoxVjvaSVjES7TZNup+KnxV2B8X87o5EtKUOKJcm4Bj9w+KNv4xcZxVIvknnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775657079; a=rsa-sha256; cv=none; b=fdo8/EYCp9mY+d/i+9lZu5PF+JVGogDVpdOjI8tNBTYIGRqefamNILDtbbDtx2JTszSCL2 9wnA/JQNqyUsNtEF1Z8aW0y5zi2rdXtEz463xsf3+QF1WoLIZNbfWJX+tXzPXgM0C0CbPc 52ESOXVoF3COqCKtvew3GoBnLO4gEZOrcZUBfKnWyKt6ZnC40Xo/F9Ty4ERHBO35n6pnT4 YfEDv+QbqT6KxS149aR33m03di3TMX7/+88kWGUKsbrKumu/wtIhOQmwLhWIuAkjqPk/iv kIkYyF5DntSwYIx/zzKBajUO87EQLwWoO1H7+y9iOAK30dTgSqK+jP/wBRm/PQ== 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=1775657079; 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=b+8u++hndO9m3PX93Wecu7gFbzHQov0gErHr1q0wj9s=; b=G3mj7mRqKk2k0vBDDmAXGD3ZXHznIyeS9tP3o9dOfF+KtfyTjvF+sib1NpJxSos1qLR4R/ cLjaHwPV8LNonLQc2bypphhrr/fGtOdkwae+fpo6vM8sO+sZ8lX15YBj4a0VmGoFhsAj0W GNi8vdAnzkru6RnxI+zxp4tPz4n17rtvn1NaIuyxJeAK9rMseZjMIDxRqfe9jswvYZXkQB QQWvCt6Ze7+vADlfo2lBRIQYkSm+KE8ySThaeCTcIQzyA/COkN6ZuVXeFLzYidIoep7vu3 sJ1J23EYuoyuhfVFOs/wy1DVsk/XIY7mak06Xs2kkVLLCZXx6oqCp7KVu0Bjjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4frPvW4Mg4zTcr for ; Wed, 08 Apr 2026 14:04:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b597 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 14:04:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 77df0240307e - main - ip6_mroute: VNETify counters 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77df0240307ebbc606e17c9b83c0d940d33c2649 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 14:04:39 +0000 Message-Id: <69d66077.3b597.dd233e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=77df0240307ebbc606e17c9b83c0d940d33c2649 commit 77df0240307ebbc606e17c9b83c0d940d33c2649 Author: Mark Johnston AuthorDate: 2026-04-08 04:20:04 +0000 Commit: Mark Johnston CommitDate: 2026-04-08 14:04:29 +0000 ip6_mroute: VNETify counters Commit a223d6c489c7 made most of the ip6_mroute state per-VNET, but failed to do this for a couple of counter structures. Make them per-VNET too. Reported by: zlei Reviewed by: pouria, zlei Fixes: a223d6c489c7 ("ip6_mroute: Start putting global variables into a structure") Differential Revision: https://reviews.freebsd.org/D56253 --- sys/netinet6/ip6_mroute.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 69eff75596e8..9ae0d699ca31 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -159,12 +159,13 @@ static SYSCTL_NODE(_net_inet6, IPPROTO_PIM, pim, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "PIM"); -static struct mrt6stat mrt6stat; -SYSCTL_STRUCT(_net_inet6_ip6, OID_AUTO, mrt6stat, CTLFLAG_RW, - &mrt6stat, mrt6stat, +VNET_DEFINE_STATIC(struct mrt6stat, mrt6stat); +#define V_mrt6stat VNET(mrt6stat) +SYSCTL_STRUCT(_net_inet6_ip6, OID_AUTO, mrt6stat, CTLFLAG_VNET | CTLFLAG_RW, + &VNET_NAME(mrt6stat), mrt6stat, "Multicast Routing Statistics (struct mrt6stat, netinet6/ip6_mroute.h)"); -#define MRT6STAT_INC(name) mrt6stat.name += 1 +#define MRT6STAT_INC(name) V_mrt6stat.name += 1 #define NO_RTE_FOUND 0x1 #define RTE_FOUND 0x2 @@ -298,12 +299,13 @@ static void expire_upcalls_all(void *); #define EXPIRE_TIMEOUT (hz / 4) /* 4x / second */ #define UPCALL_EXPIRE 6 /* number of timeouts */ -static struct pim6stat pim6stat; -SYSCTL_STRUCT(_net_inet6_pim, PIM6CTL_STATS, stats, CTLFLAG_RW, - &pim6stat, pim6stat, +VNET_DEFINE_STATIC(struct pim6stat, pim6stat); +#define V_pim6stat VNET(pim6stat) +SYSCTL_STRUCT(_net_inet6_pim, PIM6CTL_STATS, stats, CTLFLAG_VNET | CTLFLAG_RW, + &VNET_NAME(pim6stat), pim6stat, "PIM Statistics (struct pim6stat, netinet6/pim6_var.h)"); -#define PIM6STAT_INC(name) pim6stat.name += 1 +#define PIM6STAT_INC(name) V_pim6stat.name += 1 VNET_DEFINE_STATIC(int, pim6); #define V_pim6 VNET(pim6)