From nobody Thu Oct 08 20:12:18 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 4j11PH0yjQz6wB9Y for ; Thu, 08 Oct 2026 20:12:19 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j11PG6k8Tz4XKl for ; Thu, 08 Oct 2026 20:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791490339; 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=CpCE/GU0WN+2s1iisqZ6SFyVI2MjxU4HMqlyHyGgNCw=; b=GV+zUeL4cnTd74zAY2qUJmYetY2SAu5r5wdMc6u+pxyGox8T9yx4/dnpU/1kEMU5zxM/0x i8XFMCPmj9pMuWiy6Rsnx4yvJFwemt2yY3Of29VsukBNqGXnIZ0mIVhNk0vwu4MaFKRWiL GAT9gGc/TmJ7+uPkBLAOVk6rLMQg2sFHJtNh7ZkKpdPNBQmMnMMDkE67d/6kIkUPu1SlkF hRP05080ZEgoukZ/+liMq/8V3k6OSvLx6T2O5TEMv6nplTPIRFG5PgsP2TcpTrkaUWq/AY Oj7oqeQEqLOogWVH7FJgFyf/uP0TDIS43K+pcvhwQafKZBPuUFCZ8ZMgsLCjMA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791490339; b=kfB9lt7rtTfI7Z2QO0aM2Qloj69Lnchilv+aHC7qqV42+GRU23u78iqrQtdvJV2OgUWNoE ONhQhHLjXulb91pSpU2fjp8ApT6Atdyaf3kCUm+baeWJ9ACvS5wOFPlcY77BdoEfbT03xV N2y2BrptWu7L4z9oFQ+5xtkujxSOK8S3/cVdVBH1cOuxI33WSonsdaQm/21NP81yIbofla FJtw9kKKfKHlrlTqlVZOz9Ky5ioTxF86L1+r5WWYb4gP3YbUa8xD543Z/G+N7eI9C0khbg CRMiqbC5yLlutmKt8KnxMAgntB47WrKBuHdmsjJbyGq4PyvBsfyHczNwvH6wRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791490339; 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=CpCE/GU0WN+2s1iisqZ6SFyVI2MjxU4HMqlyHyGgNCw=; b=oNsApTQ0Nls/zkUkgi9VtshcDP+ZFm6/+CqS3Sxu1xCxmKK9BwCDXIk444QMNlh8I0R/WC sJx7N0V7t3jx0hYVnhNBMrh58Ku2y35pVWglGbdWx3CoSDgM/aPLuEVhMXnEhmTDPFOL2g w9Vrfrj3XTV2Pf9GqWdl/JYMxq69naJ56dIodbSnpl66ZynegLQNQIONYgKTlzMg2ouSeq LSUboSkOOxLian8ih0xVr+XtToVXYT/HA1UIP0DUozOHkU2ye6OyH9+tgzNOCy4G7YrABw lfkxT+S8d8GRZakvTHsa6leH5Sa0FymnZbVKjs+saGAH44d9wENfAZPvVofT4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j11PG5846zvMR for ; Thu, 08 Oct 2026 20:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25fe9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 20:12:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 3f5bbee131b4 - stable/15 - route/fib_algo: Respect immediate_sync in fd_ref_nhop 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3f5bbee131b4ad8b31aedeabae7f184c83abe6e6 Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 20:12:18 +0000 Message-Id: <6ac7f922.25fe9.3ca61add@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=3f5bbee131b4ad8b31aedeabae7f184c83abe6e6 commit 3f5bbee131b4ad8b31aedeabae7f184c83abe6e6 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-09-22 19:23:00 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-10-08 19:59:21 +0000 route/fib_algo: Respect immediate_sync in fd_ref_nhop Now fd_ref_nhop() returns zero for cross family routes, Do not schedule nhop references and try to rebuild it immediately for connected and static routes. PR: 298733 Fixes: 633438224304 ("route/fib_algo: Fix nexthop index ...") (cherry picked from commit 3d030136ad1906e6d463673a8d2ef313eb054fb3) --- sys/net/route/fib_algo.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/net/route/fib_algo.c b/sys/net/route/fib_algo.c index e61a966624c2..b3c1c0bc1a1a 100644 --- a/sys/net/route/fib_algo.c +++ b/sys/net/route/fib_algo.c @@ -849,8 +849,10 @@ handle_rtable_change_cb(struct rib_head *rnh, struct rib_cmd_info *rc, */ if (rc->rc_nh_new != NULL) { if (fib_ref_nhop(fd, rc->rc_nh_new) == 0) { - /* ran out of indexes */ - schedule_fd_rebuild(fd, "ran out of nhop indexes"); + if (immediate_sync) + rebuild_fd(fd, "ran out of nhop indexes"); + else + schedule_fd_rebuild(fd, "ran out of nhop indexes"); return; } }