From nobody Mon Feb 16 15:44:35 2026 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 4fF6XM4wZTz6Rxdc for ; Mon, 16 Feb 2026 15:44:35 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fF6XM0hXFz4Pgg for ; Mon, 16 Feb 2026 15:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771256675; 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=KBhxK50DSpKvwGGRKbkrnWAeDGTY0DBaLC2iLeEyfRc=; b=gxrYxpI3yq9JQbG6jLNqORKoeWOkkxwkW9e2rpRE1j6zPHeJkAnREN+uU96rdm5mkVGe0R vTpjbks0yylyuQ4rd3yD0B/pYRTTMonuWBSK0oihqM8X7iaVdXrwkHI19lqT5tsECQq/15 twi9kZPUcomWVHXSimj/i84LEK4P6h3B6hYfeRec86g287UztjzWnokjd9GEFmz/8DrQTJ GMvJPOV80G/mdvDRS72vEU6BNl6NT1O2gmnNoxnNmzMM8Rq/hY21EmmY3eV2+ivZ2+aAbC tEAchXLAsIyFGfQZxy5awn6g/EXH5SMr7X3d0ad6xFGuqfpRhgmXrp6ximRQuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771256675; a=rsa-sha256; cv=none; b=o8011IMkrSrOsoJ+HQr7eiMPVQaoKMHZv/H5ga3gdh3xuA4dE+CicjZMgX3cSOJdA9jVs/ d4xP9oY8Jh76BRvoj7BHTJevhbhNGz0RV4bj8eUXhFHg6255zgyScmR5Vz7GEibBHhCyr5 wNcu73JJDTDbBmnfE/68xQHVXssaPmKBIWeE2O3GGDJ0hEvqeFvqgZChhh5hayuSxjVQ3g tEPsIqTdTWABzGsMlTcbHUBGeViefhyAK1iGtkv2XymkGu5LpmFHBsxjIH4SOrGZiDoM8n uarhTpN8X4I93XzEY81/SFVotDUHdo9k37YOQAX7cyyA2W3t5JNgkybmgNKuTQ== 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=1771256675; 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=KBhxK50DSpKvwGGRKbkrnWAeDGTY0DBaLC2iLeEyfRc=; b=CUbOBh/xvQ7G8WiGTci+wJcwbc1YONYFSkVyRqtdHZELXvAupx/9sTgmwRobHgUGQ4KYp4 m/NZqGTJEGxEbraUeGlmR6JG9EUrAA+zu/MEAXpkxn6wpQgk7HUxA7U6MZnHVQlHSk44C0 HwmJ7pwXeJgFV1ZjPspKr+9yX1QB+KSqYi9uGDfqB6arTXB8on1I7L11Z1WArfKHE6UcUD BEstR2LvgzJYTOkQTbtZ/wy7g8REPaVRpNyMsCVijkVlvDYaiaJX3BC5wmKRfMI2E3ptNY r4Uld5OtSCF+q79I8vOnQRpmqvGh/4A0ekhM8cFYyHONcTpaAwJ04CfSb0/Mxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fF6XM0HyczTvm for ; Mon, 16 Feb 2026 15:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eabe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 15:44:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: be4d110bcdaf - stable/15 - ip6_mroute: Make MF6CFIND a regular function 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: be4d110bcdaf9ac956844c1b5a342c06c4d4536d Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 15:44:35 +0000 Message-Id: <69933b63.1eabe.5e9debf1@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=be4d110bcdaf9ac956844c1b5a342c06c4d4536d commit be4d110bcdaf9ac956844c1b5a342c06c4d4536d Author: Mark Johnston AuthorDate: 2026-02-02 14:57:20 +0000 Commit: Mark Johnston CommitDate: 2026-02-16 13:46:48 +0000 ip6_mroute: Make MF6CFIND a regular function This is more natural and corresponds more closely to the v4 multicast routing code. No functional change intended. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54983 (cherry picked from commit b370fcc716b9cfd4d08e291f0009f02452c84d64) --- sys/netinet6/ip6_mroute.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 5b9330c290d7..7e78120791a1 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -295,26 +295,6 @@ VNET_DEFINE_STATIC(int, pim6); (g).s6_addr32[0] ^ (g).s6_addr32[1] ^ \ (g).s6_addr32[2] ^ (g).s6_addr32[3]) -/* - * Find a route for a given origin IPv6 address and Multicast group address. - */ -#define MF6CFIND(o, g, rt) do { \ - struct mf6c *_rt = mf6ctable[MF6CHASH(o,g)]; \ - rt = NULL; \ - while (_rt) { \ - if (IN6_ARE_ADDR_EQUAL(&_rt->mf6c_origin.sin6_addr, &(o)) && \ - IN6_ARE_ADDR_EQUAL(&_rt->mf6c_mcastgrp.sin6_addr, &(g)) && \ - (_rt->mf6c_stall == NULL)) { \ - rt = _rt; \ - break; \ - } \ - _rt = _rt->mf6c_next; \ - } \ - if (rt == NULL) { \ - MRT6STAT_INC(mrt6s_mfc_misses); \ - } \ -} while (/*CONSTCOND*/ 0) - /* * Macros to compute elapsed time efficiently * Borrowed from Van Jacobson's scheduling code @@ -365,6 +345,22 @@ static int X_ip6_mrouter_set(struct socket *, struct sockopt *); static int X_ip6_mrouter_get(struct socket *, struct sockopt *); static int X_mrt6_ioctl(u_long, caddr_t); +static struct mf6c * +mf6c_find(const struct in6_addr *origin, const struct in6_addr *group) +{ + MFC6_LOCK_ASSERT(); + + for (struct mf6c *rt = mf6ctable[MF6CHASH(*origin, *group)]; rt != NULL; + rt = rt->mf6c_next) { + if (IN6_ARE_ADDR_EQUAL(&rt->mf6c_origin.sin6_addr, origin) && + IN6_ARE_ADDR_EQUAL(&rt->mf6c_mcastgrp.sin6_addr, group) && + rt->mf6c_stall == NULL) + return (rt); + } + MRT6STAT_INC(mrt6s_mfc_misses); + return (NULL); +} + /* * Handle MRT setsockopt commands to modify the multicast routing tables. */ @@ -493,7 +489,7 @@ get_sg_cnt(struct sioc_sg_req6 *req) MFC6_LOCK(); - MF6CFIND(req->src.sin6_addr, req->grp.sin6_addr, rt); + rt = mf6c_find(&req->src.sin6_addr, &req->grp.sin6_addr); if (rt == NULL) { ret = ESRCH; } else { @@ -816,9 +812,8 @@ add_m6fc(struct mf6cctl *mfccp) MFC6_LOCK(); - MF6CFIND(mfccp->mf6cc_origin.sin6_addr, - mfccp->mf6cc_mcastgrp.sin6_addr, rt); - + rt = mf6c_find(&mfccp->mf6cc_origin.sin6_addr, + &mfccp->mf6cc_mcastgrp.sin6_addr); /* If an entry already exists, just update the fields */ if (rt) { MRT6_DLOG(DEBUG_MFC, "no upcall o %s g %s p %x", @@ -1113,7 +1108,7 @@ X_ip6_mforward(struct ip6_hdr *ip6, struct ifnet *ifp, struct mbuf *m) /* * Determine forwarding mifs from the forwarding cache table */ - MF6CFIND(ip6->ip6_src, ip6->ip6_dst, rt); + rt = mf6c_find(&ip6->ip6_src, &ip6->ip6_dst); MRT6STAT_INC(mrt6s_mfc_lookups); /* Entry exists, so forward if necessary */