From nobody Tue Sep 22 20:03:00 2026 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 4hq9y202S3z6t0hk for ; Tue, 22 Sep 2026 20:03:06 +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 4hq9y16cGZz4cmM for ; Tue, 22 Sep 2026 20:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790107385; 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=efV4mSybwDVXSatfj4GRrv8b5/ers+L/LA/M/tZIgA0=; b=PkZip02tqSUOAheRTQzvKUrP8mKdRgVwbeCxzCYxLhh216dHDDVyZTJKR4tIfzWQZsccHy YXnp0fv7BA68ZyFbNqf8spw+fzjvNqXpbMOZTIxsHlXY7UNwHhwnIz8GiBoxl4nqeESc5J 9PAnh00V9leEKmfYSDDXpZb1qeq8/iapNzQ2Dihzxv+3zqFu41I1an0jDPDM9/48J9Y7si ru5B4MMkGX2h/wDbE6RWJd9ugrwgeK3mAlQ6VYmAXkk/XM+8saLi/t52uIUfFWya4HTRcK 3b0k2YX5Y9oGGtaP7zqeE2apYU9l7ZTnlzqPKZVvX4mf/6TSnsovgRV1KcQpFA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790107385; b=vHFysSNd560mr6b4G5LCj70Y4/j0mQbtrcwV7TfF8TBV8wIHrMu9CaHh27/BDW4t3PMfcb iidsQQsALYqMwtiagDw3swRYQFgycI8q0RWZ5Rn6vAXxQsMrQf5SHLaCHRqD1IEh9BfxeA NtNah1RSylDWb3wAxxvP1MM6bNAP/nC0x9LYiP+yaP4QRuvA13B4irdYZR1c+70UnhrLiY 6hvd9qaUzActT5elnt7+7vSjDGkZvZZgbf5fy/AM8aYJ61mbK7onDUL37nzknvJgSEy4MQ rXtqw/kPzv72oCMDCUWzP1KJkOia1nnskvgRxO0luHI0kBcwpJfoy2ROrC/a+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790107385; 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=efV4mSybwDVXSatfj4GRrv8b5/ers+L/LA/M/tZIgA0=; b=mWjV4yddW7gegNzQQSWZlmA3f+N5EV/X4XUW0FvwZue6tl5AYxdlVcoJZ4PzzV7cC0TLR6 799p1biWBqmm/doNpqayocgGgJnylTfUoZnA7PfKLFBzCtwx3gIvm9q87g4hDnknbTAfAy K//bN++4e3jllcZwmnQ3CC/DXbYgKtmeTUdwv5tKmCcPCFqgHWsT6tiuCcfrd5OGc8TbQW pUuJ8Sym76QgWaXaoOE4PiVNyAOsEmj/h89YTQfCO/NXUTZehfJMiRhKEar2ONc0nxwrc7 fW7VMAFs0ueBYvKD5mEhop9etbHolR/5UzLXHRZCvYKBOl4p4SOvu4inOuqPkQ== 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 4hq9y15h7lzLYF for ; Tue, 22 Sep 2026 20:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20c3a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 22 Sep 2026 20:03:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 3d030136ad19 - main - route/fib_algo: Respect immediate_sync in fd_ref_nhop 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 3d030136ad1906e6d463673a8d2ef313eb054fb3 Auto-Submitted: auto-generated Date: Tue, 22 Sep 2026 20:03:00 +0000 Message-Id: <6ab2def4.20c3a.6d889efa@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=3d030136ad1906e6d463673a8d2ef313eb054fb3 commit 3d030136ad1906e6d463673a8d2ef313eb054fb3 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-09-22 19:23:00 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-09-22 19:23:00 +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 ...") --- 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 44a8b7ff445a..edeac703fedc 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; } }