]> git.puffer.fish Git - mirror/frr.git/log
mirror/frr.git
2 months agoMerge pull request #17994 from FRRouting/mergify/bp/stable/10.2/pr-17991
Jafar Al-Gharaibeh [Tue, 4 Feb 2025 16:15:34 +0000 (10:15 -0600)]
Merge pull request #17994 from FRRouting/mergify/bp/stable/10.2/pr-17991

zebra: fix evpn svd hash avoid double free (backport #17991)

2 months agoMerge pull request #17997 from FRRouting/mergify/bp/stable/10.2/pr-17992
Jafar Al-Gharaibeh [Tue, 4 Feb 2025 16:14:57 +0000 (10:14 -0600)]
Merge pull request #17997 from FRRouting/mergify/bp/stable/10.2/pr-17992

bgpd: fix route-distinguisher in vrf leak json cmd (backport #17992)

2 months agobgpd: fix route-distinguisher in vrf leak json cmd 17997/head
Chirag Shah [Mon, 3 Feb 2025 20:00:41 +0000 (12:00 -0800)]
bgpd: fix route-distinguisher in vrf leak json cmd

For auto configured value RD value comes as NULL,
switching back to original change will ensure to cover
for both auto and user configured RD value in JSON.

tor-11# show bgp vrf blue ipv4 unicast route-leak json
{
  "vrf":"blue",
  "afiSafi":"ipv4Unicast",
  "importFromVrfs":[
    "purple"
  ],
  "importRts":"10.10.3.11:6",
  "exportToVrfs":[
    "purple"
  ],
  "routeDistinguisher":"(null)", <<<<<
  "exportRts":"10.10.3.11:10"
}

Signed-off-by: Chirag Shah <chirag@nvidia.com>
(cherry picked from commit 892704d07f5286464728720648ad392b485a9966)

2 months agozebra: evpn svd hash avoid double free 17994/head
Chirag Shah [Fri, 31 Jan 2025 01:26:46 +0000 (17:26 -0800)]
zebra: evpn svd hash avoid double free

Upon zebra shutdown hash_clean_and_free is called
where user free function is passed,
The free function should not call hash_release
which lead to double free of hash bucket.

Fix:
The fix is to avoid calling hash_release from
free function if its called from hash_clean_and_free
path.

10 0x00007f0422b7df1f in free () from /lib/x86_64-linux-gnu/libc.so.6
11 0x00007f0422edd779 in qfree (mt=0x7f0423047ca0 <MTYPE_HASH_BUCKET>,
    ptr=0x55fc8bc81980) at ../lib/memory.c:130
12 0x00007f0422eb97e2 in hash_clean (hash=0x55fc8b979a60,
    free_func=0x55fc8a529478 <svd_nh_del_terminate>) at
    ../lib/hash.c:290
13 0x00007f0422eb98a1 in hash_clean_and_free (hash=0x55fc8a675920
    <svd_nh_table>, free_func=0x55fc8a529478 <svd_nh_del_terminate>) at
    ../lib/hash.c:305
14 0x000055fc8a5323a5 in zebra_vxlan_terminate () at
    ../zebra/zebra_vxlan.c:6099
15 0x000055fc8a4c9227 in zebra_router_terminate () at
    ../zebra/zebra_router.c:276
16 0x000055fc8a4413b3 in zebra_finalize (dummy=0x7fffb881c1d0) at
    ../zebra/main.c:269
17 0x00007f0422f44387 in event_call (thread=0x7fffb881c1d0) at
    ../lib/event.c:2011
18 0x00007f0422ecb6fa in frr_run (master=0x55fc8b733cb0) at
    ../lib/libfrr.c:1243
19 0x000055fc8a441987 in main (argc=14, argv=0x7fffb881c4a8) at
    ../zebra/main.c:584

Signed-off-by: Chirag Shah <chirag@nvidia.com>
(cherry picked from commit 1d4f5b9b19588d77d3eaf06440c26a8c974831a3)

2 months agoMerge pull request #17983 from opensourcerouting/fix/backports_auto_vrf
Russ White [Tue, 4 Feb 2025 12:06:58 +0000 (07:06 -0500)]
Merge pull request #17983 from opensourcerouting/fix/backports_auto_vrf

bgpd: Auto vrf instance (backports)

2 months agoMerge pull request #17968 from nabahr/merge-pr-17934
Donatas Abraitis [Mon, 3 Feb 2025 08:58:31 +0000 (10:58 +0200)]
Merge pull request #17968 from nabahr/merge-pr-17934

pimd: Close AutoRP socket when not needed (backport #17934)

2 months agobgpd: fix static analyzer issues around bgp pointer 17983/head
Philippe Guibert [Thu, 9 Jan 2025 20:31:01 +0000 (21:31 +0100)]
bgpd: fix static analyzer issues around bgp pointer

Some static analyzer issues can be observed in BGP code:

> In file included from ./lib/zebra.h:13,
>                  from lib/event.c:8:
> ./lib/compiler.h:222:26: note: '#pragma message: Remove `clear thread cpu` command'
>   222 | #define CPP_NOTICE(text) _Pragma(CPP_STR(message text))
>       |                          ^~~~~~~
> lib/event.c:433:1: note: in expansion of macro 'CPP_NOTICE'
>   433 | CPP_NOTICE("Remove `clear thread cpu` command")
>       | ^~~~~~~~~~
> bgpd/bgp_vty.c:1592:5: warning: Access to field 'as_pretty' results in a dereference of a null pointer (loaded from variable 'bgp') [core.NullDereference]
> 1592 |                                 bgp->as_pretty);
>       |                                 ^~~~~~~~~~~~~~
> bgpd/bgp_vty.c:1599:5: warning: Access to field 'as_pretty' results in a dereference of a null pointer (loaded from variable 'bgp') [core.NullDereference]
> 1599 |                                 bgp->as_pretty);
>       |                                 ^~~~~~~~~~~~~~
> bgpd/bgp_vty.c:1612:7: warning: Access to field 'flags' results in a dereference of a null pointer (loaded from variable 'bgp') [core.NullDereference]
> 1612 |                     IS_BGP_INSTANCE_HIDDEN(bgp)) {
>       |                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> ./bgpd/bgpd.h:2906:3: note: expanded from macro 'IS_BGP_INSTANCE_HIDDEN'
> 2906 |         (CHECK_FLAG(_bgp->flags, BGP_FLAG_INSTANCE_HIDDEN) &&                  \
>       |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ./lib/zebra.h:274:31: note: expanded from macro 'CHECK_FLAG'
>   274 | #define CHECK_FLAG(V,F)      ((V) & (F))
>       |                               ^~~
> bgpd/bgp_vty.c:1614:4: warning: Access to field 'flags' results in a dereference of a null pointer (loaded from variable 'bgp') [core.NullDereference]
> 1614 |                         UNSET_FLAG(bgp->flags, BGP_FLAG_INSTANCE_HIDDEN);
>       |                         ^          ~~~
> ./lib/zebra.h:276:34: note: expanded from macro 'UNSET_FLAG'
>   276 | #define UNSET_FLAG(V,F)      (V) &= ~(F)
>       |                               ~  ^
> 4 warnings generated.
> Static Analysis warning summary compared to base:

Fix those issues by protecting the bgp pointer.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
2 months agobgpd: Do not ignore auto generated VRF instances when deleting
Donatas Abraitis [Tue, 28 Jan 2025 15:11:58 +0000 (17:11 +0200)]
bgpd: Do not ignore auto generated VRF instances when deleting

When VRF instance is going to be deleted inside bgp_vrf_disable(), it uses
a helper method that skips auto created VRF instances and that leads to STALE
issue.

When creating a VNI for a particular VRF vrfX with e.g. `advertise-all-vni`,
auto VRF instance is created, and then we do `router bgp ASN vrf vrfX`.

But when we do a reload bgp_vrf_disable() is called, and we miss previously
created auto instance.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
2 months agobgpd: fix import vrf creates multiple bgp instances
Philippe Guibert [Thu, 9 Jan 2025 09:26:02 +0000 (10:26 +0100)]
bgpd: fix import vrf creates multiple bgp instances

The more the vrf green is referenced in the import bgp command, the more
there are instances created. The below configuration shows that the vrf
green is referenced twice, and two BGP instances of vrf green are
created.

The below configuration:
> router bgp 99
> [..]
>  import vrf green
> exit
> router bgp 99 vrf blue
> [..]
>  import vrf green
> exit
> router bgp 99 vrf green
> [..]
> exit
>
> r4# show bgp vrfs
> Type  Id     routerId          #PeersCfg  #PeersEstb  Name
>              L3-VNI            RouterMAC              Interface
> DFLT  0      10.0.3.4          0          0           default
>              0                 00:00:00:00:00:00      unknown
>  VRF  5      10.0.40.4         0          0           blue
>              0                 00:00:00:00:00:00      unknown
>  VRF  6      0.0.0.0           0          0           green
>              0                 00:00:00:00:00:00      unknown
>  VRF  6      10.0.94.4         0          0           green
>              0                 00:00:00:00:00:00      unknown

Fix this at import command, by looking at an already present bgp
instance.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
2 months agobgpd: fix duplicate BGP instance created with unified config
Philippe Guibert [Tue, 31 Dec 2024 13:38:11 +0000 (14:38 +0100)]
bgpd: fix duplicate BGP instance created with unified config

When running the bgp_evpn_rt5 setup with unified config, memory leak
about a non deleted BGP instance happens.

> root@ubuntu2204hwe:~/frr/tests/topotests/bgp_evpn_rt5# cat /tmp/topotests/bgp_evpn_rt5.test_bgp_evpn/r1.asan.bgpd.1164105
>
> =================================================================
> ==1164105==ERROR: LeakSanitizer: detected memory leaks
>
> Indirect leak of 12496 byte(s) in 1 object(s) allocated from:
>     #0 0x7f358eeb4a57 in __interceptor_calloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:154
>     #1 0x7f358e877233 in qcalloc lib/memory.c:106
>     #2 0x55d06c95680a in bgp_create bgpd/bgpd.c:3405
>     #3 0x55d06c95a7b3 in bgp_get bgpd/bgpd.c:3805
>     #4 0x55d06c87a9b5 in bgp_get_vty bgpd/bgp_vty.c:603
>     #5 0x55d06c68dc71 in bgp_evpn_local_l3vni_add bgpd/bgp_evpn.c:7032
>     #6 0x55d06c92989b in bgp_zebra_process_local_l3vni bgpd/bgp_zebra.c:3204
>     #7 0x7f358e9e3feb in zclient_read lib/zclient.c:4626
>     #8 0x7f358e98082d in event_call lib/event.c:1996
>     #9 0x7f358e848931 in frr_run lib/libfrr.c:1232
>     #10 0x55d06c60eae1 in main bgpd/bgp_main.c:557
>     #11 0x7f358e229d8f in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58

Actually, a BGP VRF Instance is created in auto mode when creating the
global BGP instance for the L3 VNI. And again, an other BGP VRF instance
is created. Fix this by ensuring that a non existing BGP instance is not
present. If it is present, and with auto mode or in hidden mode, then
override the AS value.

Fixes: f153b9a9b636 ("bgpd: Ignore auto created VRF BGP instances")
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
2 months agoMerge pull request #17975 from FRRouting/mergify/bp/stable/10.2/pr-17971
Donatas Abraitis [Sun, 2 Feb 2025 07:51:29 +0000 (09:51 +0200)]
Merge pull request #17975 from FRRouting/mergify/bp/stable/10.2/pr-17971

bgpd: With suppress-fib-pending ensure withdrawal is sent (backport #17971)

2 months agobgpd: With suppress-fib-pending ensure withdrawal is sent 17975/head
Donald Sharp [Fri, 31 Jan 2025 23:53:30 +0000 (18:53 -0500)]
bgpd: With suppress-fib-pending ensure withdrawal is sent

When you have suppress-fib-pending turned on it is possible
to end up in a situation where the prefix is not withdrawn
from downstream peers.

Here is the timing that I believe is happening:

a) have 2 paths to a peer.
b) receive a withdrawal from 1 path, set BGP_NODE_FIB_INSTALL_PENDING
   and send the route install to zebra.
c) receive a withdrawal from the other path.
d) At this point we have a dest->flags set BGP_NODE_FIB_INSTALL_PENDING
   old_select the path_info going away, new_select is NULL
e) A bit further down we call group_announce_route() which calls
   the code to see if we should advertise the path.  It sees the
   BGP_NODE_FIB_INSTALL_PENDING flag and says, nope.
f) the route is sent to zebra to withdraw, which unsets the
   BGP_NODE_FIB_INSTALL_PENDING.
g) This function winds up and deletes the path_info.  Dest now
   has no path infos.
h) BGP receives the route install(from step b) and unsets the
   BGP_NODE_FIB_INSTALL_PENDING flag
i) BGP receives the route removed from zebra (from step f) and
   unsets the flag again.

We know if there is no new_select, let's go ahead and just
unset the PENDING flag to allow the withdrawal to go out
at the time when the second withdrawal is received.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 4e8eda74ec7d30ba84e7f53f077f4b896728505a)

2 months agopimd: Close AutoRP socket when not needed 17968/head
Nathan Bahr [Mon, 27 Jan 2025 15:57:04 +0000 (15:57 +0000)]
pimd: Close AutoRP socket when not needed

Don't leave the socket open if we are not enabled for discovery
or announcements.

Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
(cherry picked from commit 5d102a0a7014e9c526381bacc398a9b06a64ca24)

2 months agoMerge pull request #17949 from FRRouting/mergify/bp/stable/10.2/pr-17946
Donatas Abraitis [Wed, 29 Jan 2025 15:06:17 +0000 (17:06 +0200)]
Merge pull request #17949 from FRRouting/mergify/bp/stable/10.2/pr-17946

tools: Fix frr-reload for ebgp-multihop TTL reconfiguration. (backport #17946)

2 months agotools: Fix frr-reload for ebgp-multihop TTL reconfiguration. 17949/head
Nobuhiro MIKI [Wed, 29 Jan 2025 04:31:53 +0000 (04:31 +0000)]
tools: Fix frr-reload for ebgp-multihop TTL reconfiguration.

In ebgp-multihop, there is a difference in reload behavior when TTL is
unspecified (meaning default 255) and when 255 is explicitly specified.
For example, when reloading with 'neighbor <neighbor> ebgp-multihop
255' in the config, the following difference is created. This commit
fixes that.

    Lines To Delete
    ===============
    router bgp 65001
     no neighbor 10.0.0.4 ebgp-multihop
    exit

    Lines To Add
    ============
    router bgp 65001
     neighbor 10.0.0.4 ebgp-multihop 255
    exit

The commit 767aaa3a8048 is not sufficient and frr-reload needs to be
fixed to handle both unspecified and specified cases.

Signed-off-by: Nobuhiro MIKI <nob@bobuhiro11.net>
(cherry picked from commit 594e917656da5502b302309aed3cf596df24713f)

2 months agoMerge pull request #17944 from FRRouting/mergify/bp/stable/10.2/pr-17802
Donald Sharp [Tue, 28 Jan 2025 20:28:35 +0000 (15:28 -0500)]
Merge pull request #17944 from FRRouting/mergify/bp/stable/10.2/pr-17802

bgpd: fix table-map option (backport #17802)

2 months agobgpd: fix table-map option 17944/head
Alexander Skorichenko [Thu, 23 Jan 2025 10:35:44 +0000 (11:35 +0100)]
bgpd: fix table-map option

Schedule zebra to withdraw routes filtered out by a table-map.

Signed-off-by: Alexander Skorichenko <askorichenko@netgate.com>
(cherry picked from commit 0fd5ba93e342f254423569071480d5078020db8e)

3 months agoMerge pull request #17938 from opensourcerouting/fix/revert_4338e21aa2feba57ea7004c36...
Donald Sharp [Tue, 28 Jan 2025 14:35:44 +0000 (09:35 -0500)]
Merge pull request #17938 from opensourcerouting/fix/revert_4338e21aa2feba57ea7004c36362e5d8186340b8_10.2

Revert "bgpd: Handle Addpath capability using dynamic capabilities" (backport)

3 months agoRevert "bgpd: Handle Addpath capability using dynamic capabilities" 17938/head
Donatas Abraitis [Sat, 25 Jan 2025 18:28:26 +0000 (20:28 +0200)]
Revert "bgpd: Handle Addpath capability using dynamic capabilities"

This reverts commit 05cf9d03b345393b8d63ffe9345c42debd8362b6.

TL;DR; Handling BGP AddPath capability is not trivial (possible) dynamically.

When the sender is AddPath-capable and sends NLRIs encoded with AddPath ID,
and at the same time the receiver sends AddPath capability "disable-addpath-rx"
(flag update) via dynamic capabilities, both peers are out of sync about the
AddPath state. The receiver thinks already he's not AddPath-capable anymore,
hence it tries to parse NLRIs as non-AddPath, while they are actually encoded
as AddPath.

AddPath capability itself does not provide (in RFC) any mechanism on backward
compatible way to handle NLRIs if they come mixed (AddPath + non-AddPath).

This explains why we have failures in our CI periodically.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
3 months agoMerge pull request #17922 from donaldsharp/backport_17229_some_to_10_2
Donatas Abraitis [Sun, 26 Jan 2025 07:11:26 +0000 (09:11 +0200)]
Merge pull request #17922 from donaldsharp/backport_17229_some_to_10_2

Backport 17229 some to 10 2

3 months agoMerge pull request #17916 from FRRouting/mergify/bp/stable/10.2/pr-17911
Jafar Al-Gharaibeh [Fri, 24 Jan 2025 19:04:01 +0000 (13:04 -0600)]
Merge pull request #17916 from FRRouting/mergify/bp/stable/10.2/pr-17911

bgpd: Fix bgp peer solo option (backport #17911)

3 months agobgpd: Fix wrong pthread event cancelling 17922/head
Donald Sharp [Thu, 24 Oct 2024 21:44:31 +0000 (17:44 -0400)]
bgpd: Fix wrong pthread event cancelling

0  __pthread_kill_implementation (no_tid=0, signo=6, threadid=130719886083648) at ./nptl/pthread_kill.c:44
1  __pthread_kill_internal (signo=6, threadid=130719886083648) at ./nptl/pthread_kill.c:78
2  __GI___pthread_kill (threadid=130719886083648, signo=signo@entry=6) at ./nptl/pthread_kill.c:89
3  0x000076e399e42476 in __GI_raise (sig=6) at ../sysdeps/posix/raise.c:26
4  0x000076e39a34f950 in core_handler (signo=6, siginfo=0x76e3985fca30, context=0x76e3985fc900) at lib/sigevent.c:258
5  <signal handler called>
6  __pthread_kill_implementation (no_tid=0, signo=6, threadid=130719886083648) at ./nptl/pthread_kill.c:44
7  __pthread_kill_internal (signo=6, threadid=130719886083648) at ./nptl/pthread_kill.c:78
8  __GI___pthread_kill (threadid=130719886083648, signo=signo@entry=6) at ./nptl/pthread_kill.c:89
9  0x000076e399e42476 in __GI_raise (sig=sig@entry=6) at ../sysdeps/posix/raise.c:26
10 0x000076e399e287f3 in __GI_abort () at ./stdlib/abort.c:79
11 0x000076e39a39874b in _zlog_assert_failed (xref=0x76e39a46cca0 <_xref.27>, extra=0x0) at lib/zlog.c:789
12 0x000076e39a369dde in cancel_event_helper (m=0x5eda32df5e40, arg=0x5eda33afeed0, flags=1) at lib/event.c:1428
13 0x000076e39a369ef6 in event_cancel_event_ready (m=0x5eda32df5e40, arg=0x5eda33afeed0) at lib/event.c:1470
14 0x00005eda0a94a5b3 in bgp_stop (connection=0x5eda33afeed0) at bgpd/bgp_fsm.c:1355
15 0x00005eda0a94b4ae in bgp_stop_with_notify (connection=0x5eda33afeed0, code=8 '\b', sub_code=0 '\000') at bgpd/bgp_fsm.c:1610
16 0x00005eda0a979498 in bgp_packet_add (connection=0x5eda33afeed0, peer=0x5eda33b11800, s=0x76e3880daf90) at bgpd/bgp_packet.c:152
17 0x00005eda0a97a80f in bgp_keepalive_send (peer=0x5eda33b11800) at bgpd/bgp_packet.c:639
18 0x00005eda0a9511fd in peer_process (hb=0x5eda33c9ab80, arg=0x76e3985ffaf0) at bgpd/bgp_keepalives.c:111
19 0x000076e39a2cd8e6 in hash_iterate (hash=0x76e388000be0, func=0x5eda0a95105e <peer_process>, arg=0x76e3985ffaf0) at lib/hash.c:252
20 0x00005eda0a951679 in bgp_keepalives_start (arg=0x5eda3306af80) at bgpd/bgp_keepalives.c:214
21 0x000076e39a2c9932 in frr_pthread_inner (arg=0x5eda3306af80) at lib/frr_pthread.c:180
22 0x000076e399e94ac3 in start_thread (arg=<optimized out>) at ./nptl/pthread_create.c:442
23 0x000076e399f26850 in clone3 () at ../sysdeps/unix/sysv/linux/x86_64/clone3.S:81
(gdb) f 12
12 0x000076e39a369dde in cancel_event_helper (m=0x5eda32df5e40, arg=0x5eda33afeed0, flags=1) at lib/event.c:1428
1428 assert(m->owner == pthread_self());

In this decode the attempt to cancel the connection's events from
the wrong thread is causing the crash.  Modify the code to create an
event on the bm->master to cancel the events for the connection.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 months agobgpd: Fix deadlock in bgp_keepalive and master pthreads
Donald Sharp [Thu, 24 Oct 2024 18:17:51 +0000 (14:17 -0400)]
bgpd: Fix deadlock in bgp_keepalive and master pthreads

(gdb) bt
0  futex_wait (private=0, expected=2, futex_word=0x5c438e9a98d8) at ../sysdeps/nptl/futex-internal.h:146
1  __GI___lll_lock_wait (futex=futex@entry=0x5c438e9a98d8, private=0) at ./nptl/lowlevellock.c:49
2  0x00007af16d698002 in lll_mutex_lock_optimized (mutex=0x5c438e9a98d8) at ./nptl/pthread_mutex_lock.c:48
3  ___pthread_mutex_lock (mutex=0x5c438e9a98d8) at ./nptl/pthread_mutex_lock.c:93
4  0x00005c4369c17e70 in _frr_mtx_lock (mutex=0x5c438e9a98d8, func=0x5c4369dc2750 <__func__.265> "bgp_notify_send_internal") at ./lib/frr_pthread.h:258
5  0x00005c4369c1a07a in bgp_notify_send_internal (connection=0x5c438e9a98c0, code=8 '\b', sub_code=0 '\000', data=0x0, datalen=0, use_curr=true) at bgpd/bgp_packet.c:928
6  0x00005c4369c1a707 in bgp_notify_send (connection=0x5c438e9a98c0, code=8 '\b', sub_code=0 '\000') at bgpd/bgp_packet.c:1069
7  0x00005c4369bea422 in bgp_stop_with_notify (connection=0x5c438e9a98c0, code=8 '\b', sub_code=0 '\000') at bgpd/bgp_fsm.c:1597
8  0x00005c4369c18480 in bgp_packet_add (connection=0x5c438e9a98c0, peer=0x5c438e9b6010, s=0x7af15c06bf70) at bgpd/bgp_packet.c:151
9  0x00005c4369c19816 in bgp_keepalive_send (peer=0x5c438e9b6010) at bgpd/bgp_packet.c:639
10 0x00005c4369bf01fd in peer_process (hb=0x5c438ed05520, arg=0x7af16bdffaf0) at bgpd/bgp_keepalives.c:111
11 0x00007af16dacd8e6 in hash_iterate (hash=0x7af15c000be0, func=0x5c4369bf005e <peer_process>, arg=0x7af16bdffaf0) at lib/hash.c:252
12 0x00005c4369bf0679 in bgp_keepalives_start (arg=0x5c438e0db110) at bgpd/bgp_keepalives.c:214
13 0x00007af16dac9932 in frr_pthread_inner (arg=0x5c438e0db110) at lib/frr_pthread.c:180
14 0x00007af16d694ac3 in start_thread (arg=<optimized out>) at ./nptl/pthread_create.c:442
15 0x00007af16d726850 in clone3 () at ../sysdeps/unix/sysv/linux/x86_64/clone3.S:81
(gdb)

The bgp keepalive pthread gets deadlocked with itself and consequently
the bgp master pthread gets locked when it attempts to lock
the peerhash_mtx, since it is also locked by the keepalive_pthread

The keepalive pthread is locking the peerhash_mtx in
bgp_keepalives_start.  Next the connection->io_mtx mutex in
bgp_keepalives_send is locked and then when it notices a problem it invokes
bgp_stop_with_notify which relocks the same mutex ( and of course
the relock causes it to get stuck on itself ).  This generates a
deadlock condition.

Modify the code to only hold the connection->io_mtx as short as
possible.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 months agobgpd: Fix bgp peer solo option 17916/head
Alexander Skorichenko [Thu, 23 Jan 2025 11:14:41 +0000 (12:14 +0100)]
bgpd: Fix bgp peer solo option

Signed-off-by: Alexander Skorichenko <askorichenko@netgate.com>
(cherry picked from commit 7bda2b36a9f2ef9abe8619eeb4432c8f3507e3ec)

3 months agoMerge pull request #17891 from FRRouting/mergify/bp/stable/10.2/pr-17888
Donatas Abraitis [Tue, 21 Jan 2025 19:28:41 +0000 (21:28 +0200)]
Merge pull request #17891 from FRRouting/mergify/bp/stable/10.2/pr-17888

bgpd: Fix for local interface MAC cache issue in 'bgp mac hash' table (backport #17888)

3 months agobgpd: Fix for local interface MAC cache issue in 'bgp mac hash' table 17891/head
Krishnasamy R [Tue, 21 Jan 2025 09:06:53 +0000 (01:06 -0800)]
bgpd: Fix for local interface MAC cache issue in 'bgp mac hash' table

Issue:
During FRR restart, we fail to add some of the local interface's MAC
to the 'bgp mac hash'. Not having local MAC in the hash table can cause
lookup issues while receiving EVPN RT-2.

Currently, we have code to add local MAC(bgp_mac_add_mac_entry) while handling
interface add/up events in BGP(bgp_ifp_up/bgp_ifp_create). But the code
'bgp_mac_add_mac_entry' in bgp_ifp_create is not getting invoked as it
is placed under a specific check(vrf->bgp link check).

Fix:
We can skip this check 'vrf->bgp link existence' as the tenant VRF might
not have BGP instance but still we want to cache the tenant VRF local
MACs. So keeping this check in bgp_ifp_create inline with bgp_ifp_up.

Ticket: #4204154

Signed-off-by: Krishnasamy R <krishnasamyr@nvidia.com>
(cherry picked from commit 016528364e686fb3b23a688707bd6ae6c5ea5f41)

3 months agoMerge pull request #17857 from FRRouting/mergify/bp/stable/10.2/pr-17850
Jafar Al-Gharaibeh [Tue, 14 Jan 2025 20:02:17 +0000 (14:02 -0600)]
Merge pull request #17857 from FRRouting/mergify/bp/stable/10.2/pr-17850

pimd: always write cand-rp group config even when rp is inactive (backport #17850)

3 months agoMerge pull request #17856 from FRRouting/mergify/bp/stable/10.2/pr-17841
Jafar Al-Gharaibeh [Tue, 14 Jan 2025 20:02:05 +0000 (14:02 -0600)]
Merge pull request #17856 from FRRouting/mergify/bp/stable/10.2/pr-17841

pimd: fix BSR RPs timing out (backport #17841)

3 months agopimd: always write cand-rp group config even when rp is inactive 17857/head
Jafar Al-Gharaibeh [Tue, 14 Jan 2025 05:34:08 +0000 (23:34 -0600)]
pimd: always write cand-rp group config even when rp is inactive

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
(cherry picked from commit 8e66f821bf8d53603eb3fa4d30fedf5ad5ae52aa)

3 months agopimd: explicitly ensure the RP src is BSR 17856/head
Jafar Al-Gharaibeh [Sat, 11 Jan 2025 20:40:28 +0000 (14:40 -0600)]
pimd: explicitly ensure the RP src is BSR

With the recent suppoort of multiple sources of RPs, we can assume non static RPs
are BSR RPs. Just make the check explicit for BSR.

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
(cherry picked from commit cda66453c1ffc82731dae24e2ccf7caeb69baa7c)

3 months agopimd: fix BSR RPs timing out
Jafar Al-Gharaibeh [Sat, 11 Jan 2025 20:36:45 +0000 (14:36 -0600)]
pimd: fix BSR RPs timing out

On the BSR node itself, RPs shouldn't timeout, becase we know
the node is the BSR, and it is active!

fixes:#17587

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
(cherry picked from commit c30a3ad8908fe81f825261ef9654cf3dc7d25301)

3 months agoMerge pull request #17853 from FRRouting/mergify/bp/stable/10.2/pr-17800
Russ White [Tue, 14 Jan 2025 16:10:22 +0000 (11:10 -0500)]
Merge pull request #17853 from FRRouting/mergify/bp/stable/10.2/pr-17800

bgpd: Respect allowas-in value from the source VRF's peer (backport #17800)

3 months agotests: Check if allowas-in works when importing between local VRFs 17853/head
Donatas Abraitis [Wed, 8 Jan 2025 17:22:27 +0000 (19:22 +0200)]
tests: Check if allowas-in works when importing between local VRFs

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 929591cdb0463570efe2bea28c8dc1709cd56319)

3 months agobgpd: Respect allowas-in value from the source VRF's peer
Donatas Abraitis [Wed, 8 Jan 2025 17:03:55 +0000 (19:03 +0200)]
bgpd: Respect allowas-in value from the source VRF's peer

If the peer which has allowas-in enabled and then reimports the routes to another
local VRF, respect that value.

This was working with < 10.2 releases.

Fixes: d4426b62d221f4e15810dbe578de05df8991c991 ("bgpd: copy source vrf ASN to leaked route and block loops")
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 0dd15189f9783f7b45327111e4334f2208f584f2)

3 months agoMerge pull request #17832 from opensourcerouting/fix/backport_aggregate_10.2
Russ White [Tue, 14 Jan 2025 15:12:51 +0000 (10:12 -0500)]
Merge pull request #17832 from opensourcerouting/fix/backport_aggregate_10.2

bgpd: Aggregate backports

3 months agoMerge pull request #17833 from FRRouting/mergify/bp/stable/10.2/pr-17813
Donald Sharp [Fri, 10 Jan 2025 18:35:21 +0000 (13:35 -0500)]
Merge pull request #17833 from FRRouting/mergify/bp/stable/10.2/pr-17813

bgpd: use igpmetric in bgp_aigp_metric_total() (backport #17813)

3 months agobgpd: use igpmetric in bgp_aigp_metric_total() 17833/head
Enke Chen [Thu, 9 Jan 2025 20:02:02 +0000 (12:02 -0800)]
bgpd: use igpmetric in bgp_aigp_metric_total()

Use igpmetric from bgp_path_info in bgp_igp_metric_total() to be
consistent with all other cases, e.g., as in bgp_path_info_cmp().

Signed-off-by: Enke Chen <enchen@paloaltonetworks.com>
(cherry picked from commit b89e66a3bcd5644278f34ec5899b071066e102a1)

3 months agobgpd: fix memory leak in bgp_aggregate_install() 17832/head
Enke Chen [Thu, 9 Jan 2025 22:48:35 +0000 (14:48 -0800)]
bgpd: fix memory leak in bgp_aggregate_install()

Potential memory leak with as-set and matching-MED-only config.

Signed-off-by: Enke Chen <enchen@paloaltonetworks.com>
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
3 months agobgpd: apply route-map for aggregate before attribute comparison
Enke Chen [Thu, 9 Jan 2025 01:34:29 +0000 (17:34 -0800)]
bgpd: apply route-map for aggregate before attribute comparison

Currently when re-evaluating an aggregate route, the full attribute of
the aggregate route is not compared with the existing one in the BGP
table. That can result in unnecessary churns (un-install and then
install) of the aggregate route when a more specific route is added or
deleted, or when the route-map for the aggregate changes. The churn
would impact route installation and route advertisement.

The fix is to apply the route-map for the aggregate first and then
compare the attribute.

Here is an example of the churn:

debug bgp aggregate prefix 5.5.5.0/24
!
route-map set-comm permit 10
 set community 65004:200
!
router bgp 65001
 address-family ipv4 unicast
  redistribute static
  aggregate-address 5.5.5.0/24 route-map set-comm
!

Step 1:
  ip route 5.5.5.1/32 Null0

Jan  8 10:28:49 enke-vm1 bgpd[285786]: [J7PXJ-A7YA2] bgp_aggregate_install: aggregate 5.5.5.0/24, count 1
Jan  8 10:28:49 enke-vm1 bgpd[285786]: [Y444T-HEVNG]   aggregate 5.5.5.0/24: installed

Step 2:
  ip route 5.5.5.2/32 Null0

Jan  8 10:29:03 enke-vm1 bgpd[285786]: [J7PXJ-A7YA2] bgp_aggregate_install: aggregate 5.5.5.0/24, count 2
Jan  8 10:29:03 enke-vm1 bgpd[285786]: [S2EH5-EQSX6]   aggregate 5.5.5.0/24: existing, removed
Jan  8 10:29:03 enke-vm1 bgpd[285786]: [Y444T-HEVNG]   aggregate 5.5.5.0/24: installed
---

Signed-off-by: Enke Chen <enchen@paloaltonetworks.com>
3 months agoRevert "bgpd: Reinstall aggregated routes if using route-maps and it was changed"
Enke Chen [Wed, 8 Jan 2025 17:12:56 +0000 (09:12 -0800)]
Revert "bgpd: Reinstall aggregated routes if using route-maps and it was changed"

This reverts commit ee1986f1b5ae6b94b446b12e1b77cc30d8f5f46d.

The fix is incomplete, and is no longer needed with the fix that applies
the route-map for an aggregate and then compares the attribute.

Signed-off-by: Enke Chen <enchen@paloaltonetworks.com>
3 months agoMerge pull request #17828 from FRRouting/mergify/bp/stable/10.2/pr-17805
Jafar Al-Gharaibeh [Fri, 10 Jan 2025 04:00:58 +0000 (22:00 -0600)]
Merge pull request #17828 from FRRouting/mergify/bp/stable/10.2/pr-17805

2 test fixes (backport #17805)

3 months agoMerge pull request #17827 from FRRouting/mergify/bp/stable/10.2/pr-17809
Jafar Al-Gharaibeh [Fri, 10 Jan 2025 04:00:31 +0000 (22:00 -0600)]
Merge pull request #17827 from FRRouting/mergify/bp/stable/10.2/pr-17809

zebra: Fix leaked nhe (backport #17809)

3 months agoMerge pull request #17815 from FRRouting/mergify/bp/stable/10.2/pr-17807
Jafar Al-Gharaibeh [Thu, 9 Jan 2025 23:30:17 +0000 (17:30 -0600)]
Merge pull request #17815 from FRRouting/mergify/bp/stable/10.2/pr-17807

bgpd: fix crash in displaying json orf prefix-list (backport #17807)

3 months agotests: bgp_srv6l3vpn_to_bgp_vrf3 needs more time 17828/head
Donald Sharp [Wed, 8 Jan 2025 14:42:49 +0000 (09:42 -0500)]
tests: bgp_srv6l3vpn_to_bgp_vrf3 needs more time

The test starts with checking for rib insertion
of routes that may take some time after system
startup to come up.  Under heavy load this may
cause this test to just fail.  Give it more time.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 414bc26bc0537945679b499625eb81f173f52395)

3 months agotests: bgp_srv6_sid_reachability should give more time
Donald Sharp [Wed, 8 Jan 2025 14:41:21 +0000 (09:41 -0500)]
tests: bgp_srv6_sid_reachability should give more time

The test starts right in on check_pings with a 10 second
time out.  Any type of delay on startup is going to cause
problems.  Give the first check_ping significant time
for the test to be fully brought up.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit b46d3a1a4224564f05a51a73b5932c33ddec0bad)

3 months agozebra: Fix leaked nhe 17827/head
Donald Sharp [Thu, 9 Jan 2025 17:34:50 +0000 (12:34 -0500)]
zebra: Fix leaked nhe

During route processing in zebra, Zebra will create a nexthop
group that matches the nexthops passed down from the routing
protocol.  Then Zebra will look to see if it can re-use a
nhe from a previous version of the route entry( say a interface
goes down ).  If Zebra decides to re-use an nhe it was just dropping
the route entry created.  Which led to nexthop group's that had
a refcount of 0 and in some cases these nexthop groups were installed
into the kernel.

Add a bit of code to see if the returned entry is not being used
and it has no reference count and if so, properly dispose of it.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 97fa24e70b35bdfb99b9efc163dbcb5c09242527)

3 months agobgpd: fix crash in displaying json orf prefix-list 17815/head
Louis Scalbert [Thu, 9 Jan 2025 17:28:53 +0000 (18:28 +0100)]
bgpd: fix crash in displaying json orf prefix-list

bgpd crashes when there is several entries in the prefix-list. No
backtrace is provided because the issue was catched from a code review.

Fixes: 856ca177c4 ("Added json formating support to show-...-neighbors-... bgp commands.")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
(cherry picked from commit 8ccf60921b85893d301186a0f8156fb702da379f)

3 months agobgpd: fix bgp orf prefix-list json prefix
Louis Scalbert [Thu, 9 Jan 2025 17:24:39 +0000 (18:24 +0100)]
bgpd: fix bgp orf prefix-list json prefix

0x<address>FX was displayed instead of the prefix.

Fixes: b219dda129 ("lib: Convert usage of strings to %pFX and %pRN")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
(cherry picked from commit b7e843d7e8afe57d3815dbb44e30307654e73711)

3 months agoMerge pull request #17788 from FRRouting/mergify/bp/stable/10.2/pr-17725
Donald Sharp [Tue, 7 Jan 2025 18:06:48 +0000 (13:06 -0500)]
Merge pull request #17788 from FRRouting/mergify/bp/stable/10.2/pr-17725

isisd: Allow full `no` form for `domain-password` and `area-password` (backport #17725)

3 months agoisisd: Allow full `no` form for `domain-password` and `area-password` 17788/head
Donatas Abraitis [Thu, 26 Dec 2024 15:33:03 +0000 (17:33 +0200)]
isisd: Allow full `no` form for `domain-password` and `area-password`

Before:

```
LR1.wue3(config)# router isis VyOS
LR1.wue3(config-router)# no  area-password clear
% Unknown command: no  area-password clear
LR1.wue3(config-router)# no  area-password clear foo
% Unknown command: no  area-password clear foo
LR1.wue3(config-router)#
```

Closes https://github.com/FRRouting/frr/issues/17722

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit a696547d6c78d4140649f96d6bef9a335fe5dfa5)

3 months agoMerge pull request #17784 from FRRouting/mergify/bp/stable/10.2/pr-17780
Russ White [Tue, 7 Jan 2025 13:56:11 +0000 (08:56 -0500)]
Merge pull request #17784 from FRRouting/mergify/bp/stable/10.2/pr-17780

bgpd: fix a bug in peer_allowas_in_set() (backport #17780)

3 months agobgpd: fix a bug in peer_allowas_in_set() 17784/head
Enke Chen [Tue, 7 Jan 2025 05:01:14 +0000 (21:01 -0800)]
bgpd: fix a bug in peer_allowas_in_set()

Fix a bug in peer_allowas_in_set() so that the config takes effect
for peer-group members.

Signed-off-by: Enke Chen <enchen@paloaltonetworks.com>
(cherry picked from commit bcd10177940223d86cbcfbe1818b2a0b29e0552b)

3 months agoMerge pull request #17743 from opensourcerouting/fix/backport_5b8b821f2f1b98280af05ad...
Jafar Al-Gharaibeh [Sun, 5 Jan 2025 22:06:33 +0000 (16:06 -0600)]
Merge pull request #17743 from opensourcerouting/fix/backport_5b8b821f2f1b98280af05ade9d2770e5e6b3c042

tools: Add missing formats keyword to segment-routing in frr-reload (backport)

3 months agoMerge pull request #17754 from opensourcerouting/fix/backport_29eafd32c58c3b6e3ecb6f7...
Jafar Al-Gharaibeh [Sun, 5 Jan 2025 22:06:17 +0000 (16:06 -0600)]
Merge pull request #17754 from opensourcerouting/fix/backport_29eafd32c58c3b6e3ecb6f715aef74a17f22382a

bgpd: Do not try to uninstall BFD session if the peer is not established (backport)

3 months agoMerge pull request #17763 from FRRouting/mergify/bp/stable/10.2/pr-17750
Donatas Abraitis [Sun, 5 Jan 2025 12:18:14 +0000 (14:18 +0200)]
Merge pull request #17763 from FRRouting/mergify/bp/stable/10.2/pr-17750

tools: Add missing rpki keyword to vrf in frr-reload (backport #17750)

3 months agotools: Add missing rpki keyword to vrf in frr-reload 17763/head
Jonathan Voss [Fri, 3 Jan 2025 03:19:30 +0000 (03:19 +0000)]
tools: Add missing rpki keyword to vrf in frr-reload

When reloading the following configuration:
```
vrf red
 rpki
  rpki cache tcp 172.65.0.2 8282 preference 1
 exit
exit-vrf
```
frr-reload.py does not properly enter the `rpki` context
within a `vrf`. Because of this, it fails to apply RPKI
configurations.

Signed-off-by: Jonathan Voss <jvoss@onvox.net>
(cherry picked from commit 975ee8ed6eb22f68538f3446b29ca34d65bec72f)

3 months agoMerge pull request #17755 from FRRouting/mergify/bp/stable/10.2/pr-17732
Mark Stapp [Fri, 3 Jan 2025 15:10:35 +0000 (10:10 -0500)]
Merge pull request #17755 from FRRouting/mergify/bp/stable/10.2/pr-17732

isisd: Show correct level information for `show isis interface detail json` (backport #17732)

3 months agoisisd: Show correct level information for `show isis interface detail json` 17755/head
Donatas Abraitis [Mon, 30 Dec 2024 08:31:44 +0000 (10:31 +0200)]
isisd: Show correct level information for `show isis interface detail json`

Having this configuration:

```
!
interface r1-eth0
 ip address 10.0.0.1/30
 ip router isis 1
 isis priority 44 level-1
 isis priority 88 level-2
 isis csnp-interval 90 level-1
 isis csnp-interval 99 level-2
 isis psnp-interval 70 level-1
 isis psnp-interval 50 level-2
 isis hello-interval level-1 120
 isis hello-interval level-2 150

!
interface r1-eth1
 ip address 10.0.0.10/30
 ip router isis 1
!
interface lo
 ip address 192.0.2.1/32
 ip router isis 1
 isis passive
!
router isis 1
net 49.0000.0000.0000.0001.00
 metric-style wide
```

Produces:

```
{
 "areas":[
   {
     "area":"1",
     "circuits":[
       {
         "circuit":2,
         "interface":{
           "name":"r1-eth0",
           "state":"Up",
           "is-passive":"active",
           "circuit-id":"0x2",
           "type":"lan",
           "level":"L1L2",
           "snpa":"6e28.9c92.da5e",
           "levels":[
             {
               "level":"L1",
               "metric":10,
               "active-neighbors":1,
               "hello-interval":120,
               "holddown":{
                 "count":10,
                 "pad":"yes"
               },
               "cnsp-interval":90,
               "psnp-interval":70,
               "lan":{
                 "priority":44,
                 "is-dis":"no"
               }
             },
             {
               "level":"L2",
               "metric":10,
               "active-neighbors":1,
               "hello-interval":120, <<<<<<<<<<<<<<<<<<
               "holddown":{
                 "count":10,
                 "pad":"yes"
               },
               "cnsp-interval":90, <<<<<<<<<<<<<<<<<<
               "psnp-interval":70, <<<<<<<<<<<<<<<<<<
               "lan":{
                 "priority":44, <<<<<<<<<<<<<<<<<<
                 "is-dis":"no"
               }
             }
           ],
...
```

Fixes: 9fee4d4c6038ef6b14e9f509d6b04d189660c4cd ("isisd: Add json to show isis interface command.")
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 360a0d6f4ca68fda0eb5d64a8633018a3b5a4a1d)

3 months agobgpd: Do not try to uninstall BFD session if the peer is not established 17754/head
Donatas Abraitis [Mon, 11 Nov 2024 14:49:22 +0000 (16:49 +0200)]
bgpd: Do not try to uninstall BFD session if the peer is not established

Having something like:

```
 neighbor 192.168.1.222 ebgp-multihop 32
 neighbor 192.168.1.222 update-source 192.168.1.5
 neighbor 192.168.1.222 bfd
```

Won't work and the result is (empty):

```
$ show bfd peers
BFD Peers:
```

bgp_stop() is called in BGP FSM multiple times (even at startup) that
causes intermediate session interruption when update-source/ebgp-multihop
is triggered.

With this fix, the ordering does not matter and the BFD session's parameters
are updated correctly.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
3 months agoMerge pull request #17740 from FRRouting/mergify/bp/stable/10.2/pr-17731
Jafar Al-Gharaibeh [Wed, 1 Jan 2025 19:21:03 +0000 (13:21 -0600)]
Merge pull request #17740 from FRRouting/mergify/bp/stable/10.2/pr-17731

zebra: Fix resetting valid flags for NHG dependents (backport #17731)

3 months agotools: Add missing formats keyword to segment-routing in frr-reload 17743/head
Jonathan Voss [Tue, 24 Dec 2024 16:32:13 +0000 (16:32 +0000)]
tools: Add missing formats keyword to segment-routing in frr-reload

When reloading the following configuration:
```
segment-routing
 srv6
  formats
   format usid-f3216
     wide-local-id-block explicit start 100
   exit
   !
   format uncompressed-f4024
   exit
   !
  exit
  !
 exit
 !
exit
```
frr-reload.py does not properly enter the `formats` context. Because of this,
it fails with an unknown command error when applying new or updating format
configuration.

Signed-off-by: Jonathan Voss <jvoss@onvox.net>
3 months agozebra: Fix resetting valid flags for NHG dependents 17740/head
Donald Sharp [Sun, 29 Dec 2024 06:40:37 +0000 (22:40 -0800)]
zebra: Fix resetting valid flags for NHG dependents

Upon if_down, we don't reset the valid flag for dependents
and unset the INSTALLED flag.

So when its time for the NHG to be deleted (routes dereferenced),
zebra deletes it since refcnt goes to 0, but stale NHG remains in kernel.

Ticket :#4200788

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Signed-off-by: Rajasekar Raja <rajasekarr@nvidia.com>
(cherry picked from commit 54ec9f38884fb63e045732537c4c1f4a94608987)

4 months agoFRR Release 10.2.1 rc/10.2.1 docker/10.2.1 frr-10.2.1
Donatas Abraitis [Mon, 23 Dec 2024 20:33:44 +0000 (22:33 +0200)]
FRR Release 10.2.1

- bfdd
-   retain remote dplane client socket
- bgpd
-   Fix to pop items off zebra_announce FIFO for few EVPN triggers
-   Check if as_type is not specified when peer is a peer-group member
-   Do not reset peers on suppress-fib toggling
-   Fix bgp core with a possible Intf delete
-   Fix `enforce-first-as` per peer-group removal
-   Fix evpn bestpath calculation when path is not established
-   Fix graceful-restart for peer-groups
-   Fix memory leak when creating BMP connection with a source interface
-   Fix memory leak when reconfiguring a route distinguisher
-   Fix unconfigure asdot neighbor
-   Fix use single whitespace when displaying flowspec entries
-   Fix version attribute is an int, not a string
-   Import allowed routes with self AS if desired
-   Initialize as_type for peer-group as AS_UNSPECIFIED
-   Use gracefulRestart JSON field
-   Validate both nexthop information (NEXTHOP and NLRI)
-   Validate only affected RPKI prefixes instead of a full RIB
-   When calling bgp_process, prevent infinite loop
- lib
-   Allow setsockopt functions to return size set
-   Fix session re-establishment
-   Take ge/le into consideration when checking the prefix with the prefix-list
-   Use backoff setsockopt option for freebsd
- ospfd
-   OSPF multi-instance default origination fixes
- pimd
-   Fix access-list memory leak in pimd
-   Free igmp proxy joins on interface deletion
-   igmp proxy joins should not be written as part of config
-   Prevent crash of pim when auto-rp's socket is not initialized

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
4 months agoMerge pull request #17712 from opensourcerouting/fix/backport_b6dcf618777bb7a11176617...
Jafar Al-Gharaibeh [Mon, 23 Dec 2024 04:48:23 +0000 (22:48 -0600)]
Merge pull request #17712 from opensourcerouting/fix/backport_b6dcf618777bb7a11176617d647e16ab64f49b7b_10.2

bgpd: Fix `enforce-first-as` per peer-group removal (backport)

4 months agobgpd: Fix `enforce-first-as` per peer-group removal 17712/head
Donatas Abraitis [Sat, 21 Dec 2024 15:03:14 +0000 (17:03 +0200)]
bgpd: Fix `enforce-first-as` per peer-group removal

If we do `no neighbor PG enforce-first-as`, it wasn't working because the flag
was inherited incorrectly for the members of the peer-group.

Fixes: 322462920e2a2c8b73191c6eb5157d64cf4a593e ("bgpd: Enable enforce-first-as by default")
Closes: https://github.com/FRRouting/frr/issues/17702
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
4 months agoMerge pull request #17696 from FRRouting/mergify/bp/stable/10.2/pr-17586
Donatas Abraitis [Fri, 20 Dec 2024 20:47:26 +0000 (22:47 +0200)]
Merge pull request #17696 from FRRouting/mergify/bp/stable/10.2/pr-17586

bgpd: Validate only affected RPKI prefixes instead of a full RIB (backport #17586)

4 months agoMerge pull request #17689 from FRRouting/mergify/bp/stable/10.2/pr-17669
Jafar Al-Gharaibeh [Fri, 20 Dec 2024 19:57:59 +0000 (13:57 -0600)]
Merge pull request #17689 from FRRouting/mergify/bp/stable/10.2/pr-17669

bgpd: fix memory leak when reconfiguring a route distinguisher (backport #17669)

4 months agobgpd: Validate only affected RPKI prefixes instead of a full RIB 17696/head
Donatas Abraitis [Wed, 4 Dec 2024 21:38:34 +0000 (23:38 +0200)]
bgpd: Validate only affected RPKI prefixes instead of a full RIB

Before this fix, if rpki_sync_socket_rtr socket returns EAGAIN, then ALL routes
in the RIB are revalidated which takes lots of CPU and some unnecessary traffic,
e.g. if using BMP servers. With a full feed it would waste 50-80Mbps.

Instead we should try to drain an existing pipe (another end), and revalidate
only affected prefixes.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit b0800bfdf04b4fcf48504737ebfe4ba7f05268d3)

4 months agobgpd: fix memory leak when reconfiguring a route distinguisher 17689/head
Philippe Guibert [Wed, 18 Dec 2024 15:53:48 +0000 (16:53 +0100)]
bgpd: fix memory leak when reconfiguring a route distinguisher

A memory leak happens when reconfiguring an already configured route
distinguisher on an L3VPN BGP instance. Fix this by freeing the previous
route distinguisher.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
(cherry picked from commit 0dd96287dda22b79ef6d7424f4e1a8dc92959f92)

4 months agoMerge pull request #17678 from FRRouting/mergify/bp/stable/10.2/pr-17675
Donatas Abraitis [Fri, 20 Dec 2024 09:25:26 +0000 (11:25 +0200)]
Merge pull request #17678 from FRRouting/mergify/bp/stable/10.2/pr-17675

bgpd: Fix memory leak when creating BMP connection with a source interface (backport #17675)

4 months agobgpd: Fix memory leak when creating BMP connection with a source interface 17678/head
Donatas Abraitis [Thu, 19 Dec 2024 08:56:52 +0000 (10:56 +0200)]
bgpd: Fix memory leak when creating BMP connection with a source interface

Testing done with:

```
for x in $(seq 1 100000); do vtysh -c 'conf' -c 'router bgp' -c 'bmp targets test' -c 'bmp connect localhost port 123 min-retry 100 max-retry 100 source-interface lo'; done
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 7d19cb59cf5b129f61f3c568899343b3f031f9b4)

4 months agoMerge pull request #17656 from FRRouting/mergify/bp/stable/10.2/pr-17615
Donatas Abraitis [Tue, 17 Dec 2024 20:50:19 +0000 (22:50 +0200)]
Merge pull request #17656 from FRRouting/mergify/bp/stable/10.2/pr-17615

lib: Take ge/le into consideration when checking the prefix with the prefix-list (backport #17615)

4 months agoMerge pull request #17662 from FRRouting/mergify/bp/stable/10.2/pr-17613
Donatas Abraitis [Tue, 17 Dec 2024 20:49:28 +0000 (22:49 +0200)]
Merge pull request #17662 from FRRouting/mergify/bp/stable/10.2/pr-17613

bgpd: Fix evpn bestpath calculation when path is not established (backport #17613)

4 months agobgpd: Fix evpn bestpath calculation when path is not established 17662/head
Donald Sharp [Thu, 5 Dec 2024 18:12:00 +0000 (13:12 -0500)]
bgpd: Fix evpn bestpath calculation when path is not established

If you have a bestpath list that looks something like this:

<local evpn mac route>
<learned from peer out swp60>
<learned from peer out swp57>

And a network event happens that causes the peer out swp60
to not be in an established state, yet we still have the
path_info for the destination for swp60, bestpath
will currently end up with this order:

<learned from peer out swp60>
<local evpn mac route>
<learned from peer out swp57>

This causes the local evpn mac route to be deleted in zebra( Wrong! ).

This is happening because swp60 is skipped in bestpath calculation and
not considered to be a path yet it stays at the front of the list.

Modify bestpath calculation such that when pulling the unsorted_list
together to pull path info's into that list when they are also
not in a established state.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 9f88cb56dc0fe7a4ce864f672c6ca420fcd420c2)

4 months agolib: Take ge/le into consideration when checking the prefix with the prefix-list 17656/head
Donatas Abraitis [Tue, 10 Dec 2024 14:28:26 +0000 (16:28 +0200)]
lib: Take ge/le into consideration when checking the prefix with the prefix-list

Without the fix:

```
show ip prefix-list test_1 10.20.30.96/27 first-match
 <no result>

show ip prefix-list test_2 192.168.1.2/32 first-match
 <no result>
```

With the fix:

```
ip prefix-list test_1 seq 10 permit 10.20.30.64/26 le 27
!
end
donatas# show ip prefix-list test_1 10.20.30.96/27
   seq 10 permit 10.20.30.64/26 le 27 (hit count: 1, refcount: 0)
donatas# show ip prefix-list test_1 10.20.30.64/27
   seq 10 permit 10.20.30.64/26 le 27 (hit count: 2, refcount: 0)
donatas# show ip prefix-list test_1 10.20.30.64/28
donatas# show ip prefix-list test_1 10.20.30.126/26
   seq 10 permit 10.20.30.64/26 le 27 (hit count: 3, refcount: 0)
donatas# show ip prefix-list test_1 10.20.30.126/30
donatas#
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit dd4c2acc2e871283256f6cea16ede6d2d7f72dfe)

4 months agoMerge pull request #17643 from FRRouting/mergify/bp/stable/10.2/pr-17641
Donatas Abraitis [Fri, 13 Dec 2024 07:09:54 +0000 (09:09 +0200)]
Merge pull request #17643 from FRRouting/mergify/bp/stable/10.2/pr-17641

bgpd: When calling bgp_process, prevent infinite loop (backport #17641)

4 months agobgpd: When calling bgp_process, prevent infinite loop 17643/head
Donald Sharp [Thu, 12 Dec 2024 20:08:35 +0000 (15:08 -0500)]
bgpd: When calling bgp_process, prevent infinite loop

If we have this construct:

for (pi = bgp_dest_get_bgp_path_info(dest); pi; pi = pi->next) {
     ...
     bgp_process();
}

This can induce an infinite loop.  This happens because bgp_process
will move the unsorted items to the top of the list for handling,
as such it is necessary to hold the next pointer to the side
to actually look at each possible bgp_path_info.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 40c31bdf4092d45c23fc0e1eed9467015d224d2d)

4 months agoMerge pull request #17621 from opensourcerouting/fix/backport_ed701fe6272d1c5583b75bb...
Donald Sharp [Wed, 11 Dec 2024 12:21:39 +0000 (07:21 -0500)]
Merge pull request #17621 from opensourcerouting/fix/backport_ed701fe6272d1c5583b75bb5a84be2005c1b30af_10.2

bgpd: Import allowed routes with self AS if desired (backport)

4 months agoMerge pull request #17630 from opensourcerouting/fix/backport_9b0b9282d317a9aeab36d9a...
Donald Sharp [Wed, 11 Dec 2024 12:20:59 +0000 (07:20 -0500)]
Merge pull request #17630 from opensourcerouting/fix/backport_9b0b9282d317a9aeab36d9a8b08a35fe9a172c4b_10.2

bgpd: Fix bgp core with a possible Intf delete (backport)

4 months agobgpd: Fix bgp core with a possible Intf delete 17630/head
Rajasekar Raja [Tue, 10 Dec 2024 21:45:02 +0000 (13:45 -0800)]
bgpd: Fix bgp core with a possible Intf delete

Although trigger unknown, based on the backtrace in one of the internal
testing, we do see some delete in the Intf where we can have the peer
ifp pointer null and we try to dereference it while trying to install
the route leading to a crash

Skip updating the ifindex in such cases and since the nexthop is not
properly updated, BGP skips sending it to zebra.

BackTrace:
0  0x00007faef05e7ebc in ?? () from /lib/x86_64-linux-gnu/libc.so.6
1  0x00007faef0598fb2 in raise () from /lib/x86_64-linux-gnu/libc.so.6
2  0x00007faef09900dc in core_handler (signo=11, siginfo=0x7ffdde8cb4b0, context=<optimized out>) at lib/sigevent.c:274
3  <signal handler called>
4  0x00005560aad4b7d8 in update_ipv6nh_for_route_install (api_nh=0x7ffdde8cbe94, is_evpn=false, best_pi=0x5560b21187d0, pi=0x5560b21187d0, ifindex=0, nexthop=0x5560b03cb0dc,
   nh_bgp=0x5560ace04df0, nh_othervrf=0) at bgpd/bgp_zebra.c:1273
5  bgp_zebra_announce_actual (dest=dest@entry=0x5560afcfa950, info=0x5560b21187d0, bgp=0x5560ace04df0) at bgpd/bgp_zebra.c:1521
6  0x00005560aad4bc85 in bgp_handle_route_announcements_to_zebra (e=<optimized out>) at bgpd/bgp_zebra.c:1896
7  0x00007faef09a1c0d in thread_call (thread=thread@entry=0x7ffdde8d7580) at lib/thread.c:2008
8  0x00007faef095a598 in frr_run (master=0x5560ac7e5190) at lib/libfrr.c:1223
9  0x00005560aac65db6 in main (argc=<optimized out>, argv=<optimized out>) at bgpd/bgp_main.c:557

(gdb) f 4
4  0x00005560aad4b7d8 in update_ipv6nh_for_route_install (api_nh=0x7ffdde8cbe94, is_evpn=false, best_pi=0x5560b21187d0, pi=0x5560b21187d0, ifindex=0, nexthop=0x5560b03cb0dc,
    nh_bgp=0x5560ace04df0, nh_othervrf=0) at bgpd/bgp_zebra.c:1273
1273 in bgpd/bgp_zebra.c
(gdb) p pi->peer->ifp
$26 = (struct interface *) 0x0

Ticket :#4203904

Signed-off-by: Rajasekar Raja <rajasekarr@nvidia.com>
4 months agobgpd: Import allowed routes with self AS if desired 17621/head
Donatas Abraitis [Sun, 8 Dec 2024 19:46:59 +0000 (21:46 +0200)]
bgpd: Import allowed routes with self AS if desired

Previously we couldn't install VPN routes with self AS in the path because
we never checked if we have allowas-in enabled, or not.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 222ba5f39048953f384ab3aa207af753dfa92e67)

4 months agoMerge pull request #17604 from FRRouting/mergify/bp/stable/10.2/pr-17603
Jafar Al-Gharaibeh [Fri, 6 Dec 2024 17:45:55 +0000 (11:45 -0600)]
Merge pull request #17604 from FRRouting/mergify/bp/stable/10.2/pr-17603

bgpd: Check if as_type is not specified when peer is a peer-group member (backport #17603)

4 months agobgpd: Check if as_type is not specified when peer is a peer-group member 17604/head
Donatas Abraitis [Fri, 6 Dec 2024 06:25:09 +0000 (08:25 +0200)]
bgpd: Check if as_type is not specified when peer is a peer-group member

Fixes this sequences:

```
neighbor pg4 peer-group
neighbor 127.0.0.4 peer-group pg4
neighbor 127.0.0.4 remote-as 65004

neighbor pg5 peer-group
neighbor 127.0.0.5 peer-group pg5
neighbor 127.0.0.5 remote-as internal
```

Fixes: 0dfe256 ("bgpd: Implement neighbor X remote-as auto")
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 2797506a5ea6d9de8fd7ee217879c15ee9c5acd6)

4 months agoMerge pull request #17601 from FRRouting/mergify/bp/stable/10.2/pr-17570
Jafar Al-Gharaibeh [Thu, 5 Dec 2024 18:26:27 +0000 (12:26 -0600)]
Merge pull request #17601 from FRRouting/mergify/bp/stable/10.2/pr-17570

pimd: free igmp proxy joins on interface deletion (backport #17570)

4 months agoMerge pull request #17590 from FRRouting/mergify/bp/stable/10.2/pr-17582
Jafar Al-Gharaibeh [Thu, 5 Dec 2024 15:25:16 +0000 (09:25 -0600)]
Merge pull request #17590 from FRRouting/mergify/bp/stable/10.2/pr-17582

bgpd: fix unconfigure asdot neighbor (backport #17582)

4 months agopimd: free igmp proxy joins on interface deletion 17601/head
Barry A. Trent [Tue, 3 Dec 2024 22:43:47 +0000 (14:43 -0800)]
pimd: free igmp proxy joins on interface deletion

Signed-off-by: Barry A. Trent <barry.trent@atcorp.com>
(cherry picked from commit 693a37ab04792c74df4481bcf9e7aef55f0bbe06)

4 months agobgpd: fix unconfigure asdot neighbor 17590/head
Philippe Guibert [Wed, 4 Dec 2024 20:25:33 +0000 (21:25 +0100)]
bgpd: fix unconfigure asdot neighbor

The below command is not successfull on an existing as dot peer

> no neighbor 10.0.0.2 remote-as 1.1
> % Create the peer-group or interface first

Handle the case where the remote-as argument can be an ASNUM.

Fixes: 8079a4138d61 ("lib, bgp: add initial support for asdot format")
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
(cherry picked from commit 12a9ca4de6c781b061cccdf3e793346e23558901)

4 months agoMerge pull request #17584 from Jafaral/fix-autorp-crash
Donatas Abraitis [Thu, 5 Dec 2024 07:12:59 +0000 (09:12 +0200)]
Merge pull request #17584 from Jafaral/fix-autorp-crash

pimd: Prevent crash of pim when auto-rp's socket is not initialized (backport #17578)

4 months agopimd: Prevent crash of pim when auto-rp's socket is not initialized 17584/head
Jafar Al-Gharaibeh [Wed, 4 Dec 2024 20:57:13 +0000 (14:57 -0600)]
pimd: Prevent crash of pim when auto-rp's socket is not initialized

If the socket associated with the auto-rp fails to initialize then
the memory for the auto-rp is just dropped on the floor.  Additionally
any type of attempt at using the feature will just cause pimd to crash,
when the pointer is derefed.  Since it is derefed all over the place
without checking.

Clearly if you cannot bind/use the socket let's allow continuation.

Fixes: #17540
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
4 months agoMerge pull request #17576 from FRRouting/mergify/bp/stable/10.2/pr-17571
Donatas Abraitis [Wed, 4 Dec 2024 15:48:15 +0000 (17:48 +0200)]
Merge pull request #17576 from FRRouting/mergify/bp/stable/10.2/pr-17571

Fix bsd sockopt problem (backport #17571)

4 months agoMerge pull request #17577 from FRRouting/mergify/bp/stable/10.2/pr-17569
Jafar Al-Gharaibeh [Wed, 4 Dec 2024 15:32:03 +0000 (09:32 -0600)]
Merge pull request #17577 from FRRouting/mergify/bp/stable/10.2/pr-17569

pimd: igmp proxy joins should not be written as part of config (backport #17569)

4 months agopimd: igmp proxy joins should not be written as part of config 17577/head
Barry A. Trent [Tue, 3 Dec 2024 19:17:33 +0000 (11:17 -0800)]
pimd: igmp proxy joins should not be written as part of config

Signed-off-by: Barry A. Trent <barry.trent@atcorp.com>
(cherry picked from commit d4b8a98019f6a2723089eda88adfa45494a5e8f7)

4 months agolib,vtysh: Use backoff setsockopt option for freebsd 17576/head
Donald Sharp [Tue, 3 Dec 2024 23:49:59 +0000 (18:49 -0500)]
lib,vtysh: Use backoff setsockopt option for freebsd

Commit: 9112fb367b1ae0168b4e7a81f41c2ca621979199

Introduced the idea of setting the socket buffer
send/receive sizes.  BSD's in general have the fun
issue of not allowing nearly as large as a size as
linux.  Since the above commit was developed on linux
and not run on bsd it was never tested.  Modify the
codebase to use the backoff setsockopt that we have
in the code base and use the returned values to allow
us to notice what was set and respond appropriately.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 959dbe27cde21ab212f6566b30865b2da418b4d2)

4 months agolib: Allow setsockopt functions to return size set
Donald Sharp [Tue, 3 Dec 2024 23:38:59 +0000 (18:38 -0500)]
lib: Allow setsockopt functions to return size set

When finding a send/receive buffer size that is usable
let's report how big we were able to set it.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit d5615fd6f84e643f194be8c3e91343b35585eb9c)

4 months agoMerge pull request #17574 from opensourcerouting/fix/backports_fix_branch
Donald Sharp [Wed, 4 Dec 2024 12:37:00 +0000 (07:37 -0500)]
Merge pull request #17574 from opensourcerouting/fix/backports_fix_branch

Stabilize stable/10.2

4 months agobgpd: Initialize as_type for peer-group as AS_UNSPECIFIED 17574/head
Donatas Abraitis [Sun, 1 Dec 2024 12:32:08 +0000 (14:32 +0200)]
bgpd: Initialize as_type for peer-group as AS_UNSPECIFIED

Previously AS_UNSPECIFIED was treated as 0, but with now it's 1 after renumbering
peer_asn_type enum.

Fixes: 0dfe25697f5299326046fcfb66f2c6beca7c423c ("bgpd: Implement neighbor X remote-as auto")
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit e57fb3282a6dce0835bb6d0f2a2f83fa54a35df4)

4 months agopimd: Fix access-list memory leak in pimd
Corey Siltala [Tue, 26 Nov 2024 16:04:14 +0000 (10:04 -0600)]
pimd: Fix access-list memory leak in pimd

Reset access-lists in pimd on terminate

Signed-off-by: Corey Siltala <csiltala@atcorp.com>
(cherry picked from commit d21a993f16dc23df6a1f1a7c81e9f562446437a0)

4 months agolib: Fix session re-establishment
Donald Sharp [Tue, 3 Dec 2024 17:08:12 +0000 (12:08 -0500)]
lib: Fix session re-establishment

Currently if you have this sequence of events:

a) BGP starts
b) BGP reads cli that has bfd configuration
c) BGP attempts to install bfd configuration but fails because
zebra is not connected to yet
d) BGP connects to zebra
e) BGP receives resend bfd code from bfdd
f) BGP was not sending down the unsent data to bfd, never causing
the bfd session to be established.

So effectively bfd was attempting to install but failed
and then when it was asked to replay everything it decided
that the bfd information for a particular peer was actually
installed and does not need to be resent.  Modify the code
such that the bfd code now tracks failed installation and
allows the resend of data to bfdd.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
4 months agoRevert "tests: Add topotest for OSPF multi-instance default origination."
Donatas Abraitis [Wed, 4 Dec 2024 06:54:18 +0000 (08:54 +0200)]
Revert "tests: Add topotest for OSPF multi-instance default origination."

This reverts commit f10d2388693fc6904fb7ad4cf1570dd8eae8c213.

Reverting because it causes failures for stable/10.2 due to multi OSPF instances
support for frr.conf (unified configuration).

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
5 months agoMerge pull request #17522 from FRRouting/mergify/bp/stable/10.2/pr-17510
Donatas Abraitis [Thu, 28 Nov 2024 05:53:22 +0000 (07:53 +0200)]
Merge pull request #17522 from FRRouting/mergify/bp/stable/10.2/pr-17510

bgpd: fix use single whitespace when displaying flowspec entries (backport #17510)