]> git.proxmox.com Git - mirror_frr.git/log
mirror_frr.git
3 years agoMerge pull request #7747 from reubendowle/fixes/nhrpd
Donald Sharp [Sun, 10 Jan 2021 23:43:20 +0000 (18:43 -0500)]
Merge pull request #7747 from reubendowle/fixes/nhrpd

nhrpd fixes

3 years agoMerge pull request #7751 from mobash-rasool/igmp-fixes
Donald Sharp [Sat, 9 Jan 2021 22:40:31 +0000 (17:40 -0500)]
Merge pull request #7751 from mobash-rasool/igmp-fixes

pimd: IGMP conformance 5.10 test case is failing

3 years agoMerge pull request #7753 from mobash-rasool/pim-fixes
Donald Sharp [Sat, 9 Jan 2021 22:36:08 +0000 (17:36 -0500)]
Merge pull request #7753 from mobash-rasool/pim-fixes

pimd: when node changes from non-DR to DR S,G entry not created

3 years agoMerge pull request #7756 from pjdruddy/bgplu-fixes
Donald Sharp [Sat, 9 Jan 2021 20:48:22 +0000 (15:48 -0500)]
Merge pull request #7756 from pjdruddy/bgplu-fixes

Bgplu fixes

3 years agoMerge pull request #7787 from deastoe/fpm-work-ready-fixes
Donald Sharp [Sat, 9 Jan 2021 20:38:46 +0000 (15:38 -0500)]
Merge pull request #7787 from deastoe/fpm-work-ready-fixes

dplane_fpm_nl: routes stuck with 'q' flag (revisited)

3 years agoMerge pull request #7785 from volta-networks/fix_show_pce_confidence_for_pr
Donald Sharp [Sat, 9 Jan 2021 20:36:56 +0000 (15:36 -0500)]
Merge pull request #7785 from volta-networks/fix_show_pce_confidence_for_pr

Add level of confidence to show pcep-session

3 years agoMerge pull request #7775 from vishaldhingra/pim
Donald Sharp [Sat, 9 Jan 2021 20:34:18 +0000 (15:34 -0500)]
Merge pull request #7775 from vishaldhingra/pim

pimd : Added the command to clear the pim bsr data.

3 years agoMerge pull request #7839 from ton31337/feature/print_large-community_dump
Donald Sharp [Sat, 9 Jan 2021 12:25:59 +0000 (07:25 -0500)]
Merge pull request #7839 from ton31337/feature/print_large-community_dump

bgpd: Print large-community inside bgp_dump_attr()

3 years agoMerge pull request #7835 from donaldsharp/cleanup_support_bundle
Donatas Abraitis [Sat, 9 Jan 2021 07:14:16 +0000 (09:14 +0200)]
Merge pull request #7835 from donaldsharp/cleanup_support_bundle

Cleanup support bundle

3 years agobgpd: Print large-community inside bgp_dump_attr()
Donatas Abraitis [Fri, 8 Jan 2021 14:09:34 +0000 (16:09 +0200)]
bgpd: Print large-community inside bgp_dump_attr()

Missing large communities.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agoMerge pull request #7842 from donaldsharp/wait_for_convergence
Donatas Abraitis [Sat, 9 Jan 2021 07:09:25 +0000 (09:09 +0200)]
Merge pull request #7842 from donaldsharp/wait_for_convergence

tests: Wait for bgp convergence *after* we re-add the interfaces

3 years agoMerge pull request #7836 from volta-networks/fix_isis_net
Donald Sharp [Sat, 9 Jan 2021 04:01:58 +0000 (23:01 -0500)]
Merge pull request #7836 from volta-networks/fix_isis_net

isisd: When last area address is removed, resign if we were DR

3 years agoMerge pull request #7803 from ton31337/fix/validate_community_list
Donald Sharp [Sat, 9 Jan 2021 02:05:32 +0000 (21:05 -0500)]
Merge pull request #7803 from ton31337/fix/validate_community_list

bgpd: Validate community list if they are not malformed

3 years agotests: Wait for bgp convergence *after* we re-add the interfaces
Donald Sharp [Fri, 8 Jan 2021 21:52:41 +0000 (16:52 -0500)]
tests: Wait for bgp convergence *after* we re-add the interfaces

In test_bgp_mutli_vrf_topo2.py it's clear that we remove then
re-add the vrf interfaces.  Then the test was immediately
checking to ensure that the routes were available.

BGP needs time to reconverge.  Let's ensure that first.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agotools: Cleanup some zebra section of the support bundle
Donald Sharp [Fri, 8 Jan 2021 12:44:42 +0000 (07:44 -0500)]
tools: Cleanup some zebra section of the support bundle

a) Add some useful commands
b) Remove `show error all` this just dumps the error codes.  If
we know the version we don't need this.  Additionally this is
rather large.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agotools: Cleanup bgp commands in the support bundle
Donald Sharp [Fri, 8 Jan 2021 12:42:08 +0000 (07:42 -0500)]
tools: Cleanup bgp commands in the support bundle

Add some missing commands ( I am sure that there are more useful ones to )
Cleanup to use the modern non-deprecated syntax in case anyone runs across
this.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoMerge pull request #7816 from pjdruddy/revert_labelmanager_statics
Renato Westphal [Fri, 8 Jan 2021 23:57:25 +0000 (20:57 -0300)]
Merge pull request #7816 from pjdruddy/revert_labelmanager_statics

Revert labelmanager statics

3 years agoMerge pull request #7838 from ton31337/fix/force_updates_on_reset_out
Donald Sharp [Fri, 8 Jan 2021 22:34:37 +0000 (17:34 -0500)]
Merge pull request #7838 from ton31337/fix/force_updates_on_reset_out

bgpd: Force BGP updates when triggering reset out

3 years agobgpd: Force BGP updates when triggering reset out
Donatas Abraitis [Fri, 8 Jan 2021 15:03:39 +0000 (17:03 +0200)]
bgpd: Force BGP updates when triggering reset out

When adding/removing some peer's flag we need to make sure we FORCE updates
to avoid suppressing critical updates.

Like entering `no neighbor x.x.x.x send-community large` would suppress
updates by default and another side will have stale large communities.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agoisisd: When last area address is removed, resign if we were DR
Karen Schoener [Tue, 5 Jan 2021 21:27:32 +0000 (16:27 -0500)]
isisd: When last area address is removed, resign if we were DR

When last area address is removed, resign if we were DR.

This fixes an issue where: when the ISIS area address is changed, ISIS fails
to elect a new DR.

Signed-off-by: Karen Schoener <karen@voltanet.io>
3 years agoMerge pull request #7833 from donaldsharp/gr_tests
Donatas Abraitis [Fri, 8 Jan 2021 13:01:45 +0000 (15:01 +0200)]
Merge pull request #7833 from donaldsharp/gr_tests

tests: Fix gr_tests

3 years agopimd : Added the command to clear the pim bsr data.
vdhingra [Mon, 21 Dec 2020 10:24:11 +0000 (02:24 -0800)]
pimd : Added the command to clear the pim bsr data.

This command has been added in the context of
PIM BSM functionality. This command will clear the
data structs having bsr information.

Co-authored-by: Sarita Patra <saritap@vmware.com>
Signed-off-by: vishaldhingra <vdhingra@vmware.com>
3 years agoMerge pull request #7834 from donaldsharp/bgp_announce
Donatas Abraitis [Fri, 8 Jan 2021 12:08:22 +0000 (14:08 +0200)]
Merge pull request #7834 from donaldsharp/bgp_announce

Bgp announce

3 years agobgpd: Move afi indepedent code outside of checks for it
Donald Sharp [Fri, 8 Jan 2021 00:24:13 +0000 (19:24 -0500)]
bgpd: Move afi indepedent code outside of checks for it

In bgp_zebra_announce we do work to apply the table map.
This is the same for both v4 and v6 but we have the code
duplicated in both v4 and v6 if statements.  Move outside
to reduce the duplications.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agobgpd: Combine two subsuquent if (debug..) statements
Donald Sharp [Fri, 8 Jan 2021 00:03:54 +0000 (19:03 -0500)]
bgpd: Combine two subsuquent if (debug..) statements

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agobgpd: Remove redundant checks in bgp_zebra_announce()
Donald Sharp [Thu, 7 Jan 2021 23:54:34 +0000 (18:54 -0500)]
bgpd: Remove redundant checks in bgp_zebra_announce()

BGP has created some redundant checks in bgp_zebra_announce()
Reduce the multiple if statements and consolidate a bit.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agotests: Fix gr_tests
Donald Sharp [Thu, 7 Jan 2021 22:30:04 +0000 (17:30 -0500)]
tests: Fix gr_tests

The bgp_gr_functionality_topo1 test was shutting down an
interface on r2 and then trying to bring it up on r1.
Hijinx ensued.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agoMerge pull request #7749 from wesleycoakley/bgpd-large-community-format-fix
Donatas Abraitis [Thu, 7 Jan 2021 08:33:59 +0000 (10:33 +0200)]
Merge pull request #7749 from wesleycoakley/bgpd-large-community-format-fix

bgpd: reject malformed large-communities

3 years agoMerge pull request #7824 from opensourcerouting/snap-libyang1-fix
Donatas Abraitis [Thu, 7 Jan 2021 08:28:19 +0000 (10:28 +0200)]
Merge pull request #7824 from opensourcerouting/snap-libyang1-fix

Snapcraft Fixes

3 years agoMerge pull request #7817 from donaldsharp/random
Donatas Abraitis [Thu, 7 Jan 2021 08:24:11 +0000 (10:24 +0200)]
Merge pull request #7817 from donaldsharp/random

Random cleanup/fixes

3 years agosnapcraft: Update rtrlib to 0.7.0
Martin Winter [Thu, 7 Jan 2021 01:16:19 +0000 (02:16 +0100)]
snapcraft: Update rtrlib to 0.7.0

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
3 years agosnapcraft: Fix passthrough path for Libyang 1.x
Martin Winter [Thu, 7 Jan 2021 01:14:52 +0000 (02:14 +0100)]
snapcraft: Fix passthrough path for Libyang 1.x

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
3 years agoMerge pull request #7820 from kuldeepkash/topojson_framework
Donald Sharp [Wed, 6 Jan 2021 13:59:34 +0000 (08:59 -0500)]
Merge pull request #7820 from kuldeepkash/topojson_framework

tests: [topojson]Add/Enhance framework to support PIM automation

3 years agobgpd: separate lcommunity validation from tokenizer
Wesley Coakley [Tue, 5 Jan 2021 09:22:57 +0000 (04:22 -0500)]
bgpd: separate lcommunity validation from tokenizer

`lcommunity_gettoken` expects a space-delimeted list of 0 or more large
communities. `lcommunity_list_valid` can perform this check.
`lcommunity_list_valid` now validates large community lists more
accurately based on the following condition: Each quantity in a standard bgp
large community must:

1. Contain at least one digit
2. Fit within 4 octets
3. Contain only digits unless the lcommunity is "expanded"
4. Contain a valid regex if the lcommunity is "expanded"

Moreover we validate that each large community list contains exactly 3
such values separated by a single colon each.

One quirk of our validation which is worth documenting is:

```
bgp large-community-list standard test2 permit 1:c:3
bgp large-community-list expanded test1 permit 1:c:3
```

The first line will throw an error complaining about a "malformed community-list
value". The second line will be accepted because the each value is each treated as
a regex when matching large communities, it simply will never match anything so
it's rather useless.

Signed-off-by: Wesley Coakley <wcoakley@nvidia.com>
3 years agoMerge pull request #7815 from ckishimo/pytests
Donatas Abraitis [Wed, 6 Jan 2021 07:08:35 +0000 (09:08 +0200)]
Merge pull request #7815 from ckishimo/pytests

tests: fix typos and remove duplicate output

3 years agotests: [topojson]Enhance lib/topojson.py to support PIM automation
kuldeepkash [Wed, 6 Jan 2021 05:13:05 +0000 (05:13 +0000)]
tests: [topojson]Enhance lib/topojson.py to support PIM automation

1. Enhanced lib/topojson.py for creating topologies with switches and routers
2. Ran it through (black) for expected formatting

Signed-off-by: kuldeepkash <kashyapk@vmware.com>
3 years agotests: [topojson]Enhance lib/common_config.py to support PIM automation
kuldeepkash [Wed, 6 Jan 2021 05:08:31 +0000 (05:08 +0000)]
tests: [topojson]Enhance lib/common_config.py to support PIM automation

1. Enhanced lib/common_config.py for common configuration/verification needed
   for PIM automation
2. Ran it through (black) for expected formatting

Signed-off-by: kuldeepkash <kashyapk@vmware.com>
3 years agotests: [topojson]Add lib/pim.py to support PIM automation
kuldeepkash [Wed, 6 Jan 2021 05:05:30 +0000 (05:05 +0000)]
tests: [topojson]Add lib/pim.py to support PIM automation

1. Added lib/pim.py for PIM configuration/verification
2. Ran it through (black) for expected formatting

Signed-off-by: kuldeepkash <kashyapk@vmware.com>
3 years agobgpd: Cleanup debugs for bgp_zebra_route_notify_owner
Donald Sharp [Tue, 5 Jan 2021 20:22:57 +0000 (15:22 -0500)]
bgpd: Cleanup debugs for bgp_zebra_route_notify_owner

User %pRN as well as add some more debugs for other
interesting cases.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agobgpd: Allow more detailed knowledge of bgp's internal state
Donald Sharp [Tue, 5 Jan 2021 20:03:02 +0000 (15:03 -0500)]
bgpd: Allow more detailed knowledge of bgp's internal state

When bgp is using wait for install semantics it would be nice
to be able to debug it when it is running.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agopathd: Convert to use our internal frr_weak_random
Donald Sharp [Tue, 5 Jan 2021 16:10:19 +0000 (11:10 -0500)]
pathd: Convert to use our internal frr_weak_random

rand() should not be used, we should be using the frr_weak_random()
call instead.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agotests: fix typos
ckishimo [Tue, 5 Jan 2021 15:55:59 +0000 (16:55 +0100)]
tests: fix typos

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
3 years agoMerge pull request #7762 from sworleys/PBR-Ipv4/Ipv6-Match-Fixes
Mark Stapp [Tue, 5 Jan 2021 18:54:06 +0000 (13:54 -0500)]
Merge pull request #7762 from sworleys/PBR-Ipv4/Ipv6-Match-Fixes

pbrd: pbr ipv4/ipv6 match fixes

3 years agotests: add test for labelmanager plugin
Pat Ruddy [Tue, 5 Jan 2021 17:18:39 +0000 (17:18 +0000)]
tests: add test for labelmanager plugin

An external label manager plugin may want to use the following
functions:
    - create_label_chunk
    - assign_label_chunk
    - delete_label_chunk
    - release_label_chunk
This test ensures that they are externally visible.

Signed-off-by: Pat Ruddy <pat@voltanet.io>
3 years agozebra: expose label-manager util-funcs
Pat Ruddy [Tue, 5 Jan 2021 12:32:26 +0000 (12:32 +0000)]
zebra: expose label-manager util-funcs

Revert "zebra: unexpose label-manager util-funcs as static"
This reverts commit d3d9639d9a2251aa519b5399706ce816982001a1.

Signed-off-by: Pat Ruddy <pat@voltanet.io>
3 years agoMerge pull request #7772 from LabNConsulting/ziemba/tests-lutil-timestamp
Mark Stapp [Tue, 5 Jan 2021 16:29:49 +0000 (11:29 -0500)]
Merge pull request #7772 from LabNConsulting/ziemba/tests-lutil-timestamp

tests: topotests/lib/lutil.py: add timestamp to log of test start

3 years agotests: remove duplicate output
ckishimo [Tue, 5 Jan 2021 15:57:42 +0000 (16:57 +0100)]
tests: remove duplicate output

Signed-off-by: ckishimo <carles.kishimoto@gmail.com>
3 years agoMerge pull request #7807 from logbob0401/vrrpd_yang_bug_fix
Russ White [Tue, 5 Jan 2021 15:30:55 +0000 (10:30 -0500)]
Merge pull request #7807 from logbob0401/vrrpd_yang_bug_fix

Fix augment path problem in frr-vrrpd.yang to comply with rfc 7950

3 years agoMerge pull request #7507 from ton31337/fix/bgpd_do_not_send_update_if_path_really_did...
Russ White [Tue, 5 Jan 2021 15:26:18 +0000 (10:26 -0500)]
Merge pull request #7507 from ton31337/fix/bgpd_do_not_send_update_if_path_really_did_not_change

bgpd: Do not send BGP UPDATE if the route actually not changed

3 years agoMerge pull request #6810 from Orange-OpenSource/link_state
Russ White [Tue, 5 Jan 2021 15:25:38 +0000 (10:25 -0500)]
Merge pull request #6810 from Orange-OpenSource/link_state

Lib: Add Link State Database

3 years agoMerge pull request #7722 from AnuradhaKaruppiah/mh-fixes
Patrick Ruddy [Tue, 5 Jan 2021 09:26:17 +0000 (09:26 +0000)]
Merge pull request #7722 from AnuradhaKaruppiah/mh-fixes

bgpd, zebra: evpn mh fixes

3 years agobgpd: Validate community list if they are not malformed
Donatas Abraitis [Wed, 30 Dec 2020 21:02:03 +0000 (23:02 +0200)]
bgpd: Validate community list if they are not malformed

Before fix:
```
root@exit1-debian-9:~/frr# /usr/local/bin/vtysh  -c 'c' -c 'route-map test permit 10' -c 'set community 65535:429496723296'
root@exit1-debian-9:~/frr#

root@exit1-debian-9:~/frr# vtysh -c 'c' -c 'bgp community-list standard test permit 65535:4294967296'
root@exit1-debian-9:~/frr#

root@exit1-debian-9:~/frr# /usr/local/bin/vtysh  -c 'c' -c 'route-map test permit 10' -c 'set community 65535'
root@exit1-debian-9:~/frr# /usr/local/bin/vtysh  -c 'c' -c 'route-map test permit 10' -c 'set community 65535:'
% Malformed communities attribute
```

After fix:
```
root@exit1-debian-9:~/frr# /usr/local/bin/vtysh  -c 'c' -c 'route-map test permit 10' -c 'set community 65535:4294967296'
% Malformed communities attribute

root@exit1-debian-9:~/frr# vtysh -c 'c' -c 'bgp community-list standard test permit 65535:4294967299'
% Malformed community-list value

root@exit1-debian-9:~/frr# /usr/local/bin/vtysh  -c 'c' -c 'route-map test permit 10' -c 'set community 65535:'
% Malformed communities attribute
root@exit1-debian-9:~/frr# /usr/local/bin/vtysh  -c 'c' -c 'route-map test permit 10' -c 'set community 65535'
% Malformed communities attribute
```

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
3 years agoMerge pull request #7809 from donaldsharp/m_coverity
Jafar Al-Gharaibeh [Mon, 4 Jan 2021 22:13:21 +0000 (16:13 -0600)]
Merge pull request #7809 from donaldsharp/m_coverity

some coverity fixes

3 years agolib: Add Link State Database
Olivier Dugeon [Tue, 26 May 2020 12:51:02 +0000 (14:51 +0200)]
lib: Add Link State Database

Define new models for Link State Database a.k.a TED
and functions to manipulate the new database as well as exchange Link State
information through ZAPI Opaque message.

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
3 years agotests: add BGPLU label sanity test
Pat Ruddy [Wed, 16 Dec 2020 17:02:53 +0000 (17:02 +0000)]
tests: add BGPLU label sanity test

This test checks the interactions between the BGP label requesting
code and the labelpool code to ensure the correct number of labels
and label chunks are requested and those labels are freed back into
the pool when the corresponding prefix is removed.

Signed-off-by: Pat Ruddy <pat@voltanet.io>
3 years agobgpd: fix zclient return code damage in labelpool
Pat Ruddy [Wed, 16 Dec 2020 15:06:30 +0000 (15:06 +0000)]
bgpd: fix zclient return code damage in labelpool

The check for the return code for zclient_send_get_label_chunk is
reversed and therefore the pending count does not get incremented
for each successful label chunk request.
This has the effect of requesting a 50 label chunk per label request
from BGP i.e we request 50 times the labels we require.

Signed-off-by: Pat Ruddy <pat@voltanet.io>
3 years agobgpd: release label to labelpool on dereg
Pat Ruddy [Thu, 17 Dec 2020 10:49:30 +0000 (10:49 +0000)]
bgpd: release label to labelpool on dereg

when we de-register for a label associated with a prefix then release
it back to the labelpool to clean up the stale reference held in the
ledger and inuse lists.

Signed-off-by: Pat Ruddy <pat@voltanet.io>
3 years agobgpd: refactor label allocation code
Pat Ruddy [Thu, 17 Dec 2020 10:41:07 +0000 (10:41 +0000)]
bgpd: refactor label allocation code

To prepare for fixing an issue where labels do not get released back
to the labelpool when the route is deleted some refactoring is
necessary. There are 2 parts to this.
1. restructure the code to remove the circular nature of label
allocations via the labelpool and decouple the label type decision
from the notification fo the FEC.
The code to notify the FEC association to zebra has been split out
into a separate function so that it can be called from the synchronous
path (for registration of index-based labels and de-registration of all
labels), and from the asynchronous path where we need to wait for a
callback from the labelpool code with a label allocation.
The decision about whether we are using an index-based label or an
allocated label is reflected in the state of the BGP_NODE_LABEL_REQUESTED
flag so the checks on the path_info in the labelpool callback code are
no longer required.
2. change the owned of a labelpool allocated label from the path info
structure to the bgp_dest structure. This allows labels to be released
(in a subsequent commit) when the owner (bgp_dest) goes away.

Signed-off-by: Pat Ruddy <pat@voltanet.io>
3 years agozebra: labelmanager could return reserved labels
Pat Ruddy [Wed, 9 Dec 2020 10:25:38 +0000 (10:25 +0000)]
zebra: labelmanager could return reserved labels

when checking if there is a "hole" behind the current reservation
marker the calculation of whether the hole is big enough to satisfy
the requested chunk is out by 1. This could result in returning a label
which has already been allocated.

Signed-off-by: Pat Ruddy <pat@voltanet.io>
3 years agozebra: label manager should never return a reserved block
Pat Ruddy [Wed, 9 Dec 2020 10:23:44 +0000 (10:23 +0000)]
zebra: label manager should never return a reserved block

if the requested chunk size was less than 16 then a chunk
within the reserved block would be returned. Make sure that
we never return labels that are below MPLS_LABEL_UNRESERVED_MIN

Signed-off-by: Pat Ruddy <pat@voltanet.io>
3 years agobgpd: add missing unlock of path_info
Pat Ruddy [Fri, 4 Dec 2020 12:16:32 +0000 (12:16 +0000)]
bgpd: add missing unlock of path_info

when the path info information is queued on the work queue it
is protected by a lock to avoid the rug being pulled whilst it
resides on the queue add an unlock in the error case where we do
no queue the reference to the workqueue.

Signed-off-by: Pat Ruddy <pat@voltanet.io>
3 years agobgpd: add show commands for bgp labelpool
Pat Ruddy [Fri, 4 Dec 2020 12:14:26 +0000 (12:14 +0000)]
bgpd: add show commands for bgp labelpool

These commands allow the bgp labelpool lists and counts to be
viewed for debug purposes.

Signed-off-by: Pat Ruddy <pat@voltanet.io>
3 years agobgpd: Prevent null deref
Donald Sharp [Mon, 4 Jan 2021 12:56:47 +0000 (07:56 -0500)]
bgpd: Prevent null deref

There exists a path where we could possibly have a NULL deref
of a pointer.  Prevent this from happening.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agopathd: Fix unlock of non-locked mutex
Donald Sharp [Mon, 4 Jan 2021 12:54:06 +0000 (07:54 -0500)]
pathd: Fix unlock of non-locked mutex

We have several instances of a non-locked mutex being unlocked
in path_zebra_router_id_update.  Clean this up.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
3 years agovrrpd.yang bug fix: modify augment path to comply with rfc 7950
Bo Zhang [Sun, 3 Jan 2021 01:31:16 +0000 (17:31 -0800)]
vrrpd.yang bug fix: modify augment path to comply with rfc 7950

Signed-off-by: Bo Zhang <logbob0401@gmail.com>
3 years agoMerge pull request #7791 from mjstapp/fix_pbr_nht_goto
Quentin Young [Tue, 29 Dec 2020 20:54:46 +0000 (15:54 -0500)]
Merge pull request #7791 from mjstapp/fix_pbr_nht_goto

pbrd: clean up possible checkpatch issue

3 years agoMerge pull request #7795 from louis-oui/show-database-vrf
Quentin Young [Tue, 29 Dec 2020 20:53:28 +0000 (15:53 -0500)]
Merge pull request #7795 from louis-oui/show-database-vrf

ospfd: fix no show database output when selecting vrf

3 years agoMerge pull request #7777 from volta-networks/fix_zebra_rib_c++
Quentin Young [Tue, 29 Dec 2020 16:07:12 +0000 (11:07 -0500)]
Merge pull request #7777 from volta-networks/fix_zebra_rib_c++

zebra: avoid c++ reserved keyword

3 years agotests: topotests/lib/lutil.py: add timestamp to log of test start
G. Paul Ziemba [Sat, 19 Dec 2020 19:41:05 +0000 (11:41 -0800)]
tests: topotests/lib/lutil.py: add timestamp to log of test start

    Timestamps in test logs are needed for correlation with messages in
    routing protocol log files. Vox populi indicates preference for
    timestamp at beginning of line.

    OLD:
    (#55) scripts/rip-show.py:61 COMMAND:r1:vtysh -c "show ip rip status": 00:0.* 00:0:wait:RIP Peers:

    NEW:
    Sat Dec 19 08:26:45 2020 (#55) scripts/rip-show.py:61 COMMAND:r1:vtysh -c "show ip rip status": 00:0.* 00:0:wait:RIP Peers:

Signed-off-by: G. Paul Ziemba <paulz@labn.net>
3 years agoMerge pull request #7788 from deastoe/zebra2proto-kernel-connect
Stephen Worley [Mon, 28 Dec 2020 19:57:41 +0000 (14:57 -0500)]
Merge pull request #7788 from deastoe/zebra2proto-kernel-connect

zebra: zebra2proto() handle kernel/connect type

3 years agoMerge pull request #7761 from bisdhdh/local_1
Donatas Abraitis [Mon, 28 Dec 2020 15:09:36 +0000 (17:09 +0200)]
Merge pull request #7761 from bisdhdh/local_1

doc: Add BGP GR command for preserving forwarding state.

3 years agoMerge pull request #7776 from mjstapp/fix_pathd_build
Olivier Dugeon [Mon, 28 Dec 2020 09:45:38 +0000 (10:45 +0100)]
Merge pull request #7776 from mjstapp/fix_pathd_build

pathd: fix compile warning in path_cli

3 years agoospfd: fix no show database output when selecting vrf
Louis Scalbert [Thu, 24 Dec 2020 13:41:31 +0000 (14:41 +0100)]
ospfd: fix no show database output when selecting vrf

No output when selecting a vrf
frr# show ip ospf vrf default database router adv-router 10.125.0.1
VRF Name: default

       OSPF Router with ID (10.125.0.1)

In comparison with:
frr# show ip ospf database router adv-router 10.125.0.1

       OSPF Router with ID (10.125.0.1)

                Router Link States (Area 0.0.0.0)

  LS age: 155
  Options: 0x2  : *|-|-|-|-|-|E|-
(...)

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
3 years agopimd: IGMP conformance 5.10 test case is failing
Mobashshera Rasool [Thu, 17 Dec 2020 11:40:13 +0000 (11:40 +0000)]
pimd: IGMP conformance 5.10 test case is failing

Test case 5.10 sends leave message to unicast address, the leave
packet is accepted and a query message is sent in response to this.
No validation for address is present in the function

Add check for addresses as per RFC. Leave messages are allowed only
sent to either ALL-ROUTERS (224.0.0.2) or group address.

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
3 years agopbrd: clean up possible checkpatch issue
Mark Stapp [Wed, 23 Dec 2020 19:03:06 +0000 (14:03 -0500)]
pbrd: clean up possible checkpatch issue

PR 7724 triggered a minor style warning (at least in the CI
context). Clean that up.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
3 years agoMerge pull request #7724 from donaldsharp/pbr_zebra_was_wrong
Mark Stapp [Wed, 23 Dec 2020 18:34:18 +0000 (13:34 -0500)]
Merge pull request #7724 from donaldsharp/pbr_zebra_was_wrong

Pbr zebra was wrong

3 years agoMerge pull request #7759 from qlyoung/reformat-tests-again
Mark Stapp [Wed, 23 Dec 2020 13:11:00 +0000 (08:11 -0500)]
Merge pull request #7759 from qlyoung/reformat-tests-again

Reformat tests again

3 years agodoc: Add BGP GR command for preserving forwarding state.
bisdhdh [Thu, 17 Dec 2020 21:57:45 +0000 (03:27 +0530)]
doc: Add BGP GR command for preserving forwarding state.

BGP GR command for preserving forwarding state command is
Added to the docs.

Signed-off-by: Biswajit Sadhu <biswajit.sadhu@gmail.com>
3 years agoMerge pull request #6212 from gpnaveen/static_routes
Martin Winter [Tue, 22 Dec 2020 22:11:37 +0000 (14:11 -0800)]
Merge pull request #6212 from gpnaveen/static_routes

tests: Adding static routing topojson automation suites.

3 years agozebra: zebra2proto() handle kernel/connect type
Duncan Eastoe [Tue, 22 Dec 2020 21:23:43 +0000 (21:23 +0000)]
zebra: zebra2proto() handle kernel/connect type

When dplane_fpm_nl is used the "Please add this protocol(n) to proper
rt_netlink.c handling" debug message is emitted for any route of type
kernel or connected.

This severely reduces performance of dplane_fpm_nl when large numbers
of these routes are present in the RIB.

The messages are not observed when using the original fpm module since
this uses a custom function, netlink_proto_from_route_type().

zebra2proto() now returns RTPROT_KERNEL for ZEBRA_ROUTE_CONNECT and
ZEBRA_ROUTE_KERNEL. This should only impact dplane_fpm_nl's use of
the common netlink routines since these routes generally ignored via
checking of RSYSTEM_ROUTE().

Signed-off-by: Duncan Eastoe <duncan.eastoe@att.com>
3 years agozebra: fpm_nl_process() reschedule dp thread
Duncan Eastoe [Tue, 22 Dec 2020 19:47:17 +0000 (19:47 +0000)]
zebra: fpm_nl_process() reschedule dp thread

fpm_nl_process() now ensures that the dataplane thread is rescheduled
if it hits the work limit while processing its incoming work queue.

This would probably already occur due to some other event, such as
fpm_process_queue() enqueuing completed work to the output queue,
however it does no harm to add this explicit reschedule.

Signed-off-by: Duncan Eastoe <duncan.eastoe@att.com>
3 years agozebra: resched dp thread if output queue limit hit
Duncan Eastoe [Tue, 22 Dec 2020 18:35:40 +0000 (18:35 +0000)]
zebra: resched dp thread if output queue limit hit

If the dataplane thread hits the work limit while processing the
output queue for any given provider, we now explicitly reschedule
the thread.

Otherwise, if the number of items in the output queue is greater than
the work limit, draining of that output queue is dependent on new
dataplane work.

Routes which are not drained from the output queue are stuck with
the 'q' flag, so this is a similar issue to that observed in
164d8e86081fdf33992b6c45af446bac6103e20c.

Signed-off-by: Duncan Eastoe <duncan.eastoe@att.com>
3 years agoMerge pull request #7767 from mjstapp/fix_dplane_extra_info
Rafael Zalamena [Tue, 22 Dec 2020 18:08:35 +0000 (15:08 -0300)]
Merge pull request #7767 from mjstapp/fix_dplane_extra_info

zebra: fix loop logic in dplane for extra intf info

3 years agoMerge pull request #7472 from opensourcerouting/fpm-fixes
Mark Stapp [Tue, 22 Dec 2020 16:37:58 +0000 (11:37 -0500)]
Merge pull request #7472 from opensourcerouting/fpm-fixes

fpm: frr-reload, IPv6 and an improvement

3 years agoMerge pull request #7758 from donaldsharp/tests_dict_values
Mark Stapp [Tue, 22 Dec 2020 15:48:29 +0000 (10:48 -0500)]
Merge pull request #7758 from donaldsharp/tests_dict_values

tests: dict_values are not lists in version 3

3 years agopathd: Add level of confidence to show pcep-session
Javier Garcia [Tue, 22 Dec 2020 07:51:26 +0000 (08:51 +0100)]
pathd: Add level of confidence to show pcep-session

Show 'low' if a pce has disconnect or 'normal' . It's only a boolean so
it's like a token that mark the pce that has recenty disconnect.

Signed-off-by: Javier Garcia <javier.garcia@voltanet.io>
3 years agoMerge pull request #7779 from pjdruddy/pr-bgp-doc-warn
Donatas Abraitis [Tue, 22 Dec 2020 07:27:59 +0000 (09:27 +0200)]
Merge pull request #7779 from pjdruddy/pr-bgp-doc-warn

doc: fix warning in bgp.rst

3 years agodoc: fix warning in bgp.rst
Pat Ruddy [Mon, 21 Dec 2020 17:35:39 +0000 (17:35 +0000)]
doc: fix warning in bgp.rst

remove indent to fix
make[1]: Entering directory '/home/pat/git/frr'
  SPHINX   doc/user/_build/.doctrees/environment.pickle
/home/pat/git/frr/doc/user/bgp.rst:3477: WARNING: Explicit markup ends
without a blank line; unexpected unindent.

Signed-off-by: Pat Ruddy <pat@voltanet.io>
3 years agozebra: skip EVI setup if an ES is applied to a pseudo interface
Anuradha Karuppiah [Wed, 7 Oct 2020 18:33:13 +0000 (11:33 -0700)]
zebra: skip EVI setup if an ES is applied to a pseudo interface

zebra maintains pseudo interface for hanging off user config after
the interface is deleted in the kernel. If an user tried to config
an ES against such an interface zebra would crash with the following
call stack -
    at zebra/zebra_evpn_mh.c:2095
    sysmac=sysmac@entry=0x55cfbadd3160) at zebra/zebra_evpn_mh.c:2258
    at zebra/zebra_evpn_mh.c:3222
    argv=<optimized out>, es_lid_str=<optimized out>, es_lid=1, no=0x0, vty=0x55cfbaf4c7b0)
    at zebra/zebra_evpn_mh.c:3222
    argv=<optimized out>) at ./zebra/zebra_evpn_mh_clippy.c:202
    vty=vty@entry=0x55cfbaf4c7b0, cmd=cmd@entry=0x0, filter=FILTER_RELAXED)
    at lib/command.c:1073

Ticket: CM-31702

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
3 years agozebra: accept bgp remote mac-ip update if the higher-seq-local mac is not bgp-ready
Anuradha Karuppiah [Thu, 1 Oct 2020 21:19:52 +0000 (14:19 -0700)]
zebra: accept bgp remote mac-ip update if the higher-seq-local mac is not bgp-ready

If a local-MAC or local-neigh is not active locally it is not sent to BGP.
At this point if BGP rxes a remote route it accepts it and installs in
zebra. Zebra was rejecting BGP's update if it had a higher seq local (inactive)
entry. This would result in bgp and zebra falling out of sync.

In some cases zebra would delete the local-inactive entries in sometime (as
a part of the dplane/kernel garbage collection). This would leave zebra
with missing remote entries (which were still present in bgpd).

This change allows lower-seq BGP updates to overwrite zebra's local entry if
that entry happens to be local-inactive.

Note: This logic was already in use for sync-mac-ip updates. Extended the
same logic to remote-mac-ip updates.

Ticket: CM-31626

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
3 years agobgpd: add missing type-1 and type-4 route descriptions to the legend
Anuradha Karuppiah [Thu, 3 Sep 2020 20:35:19 +0000 (13:35 -0700)]
bgpd: add missing type-1 and type-4 route descriptions to the legend

Sample output -
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
root@torm-11:mgmt:~# net show bgp l2vpn evpn route rd 27.0.0.16:3
EVPN type-1 prefix: [1]:[ESI]:[EthTag]:[IPlen]:[VTEP-IP]
EVPN type-2 prefix: [2]:[EthTag]:[MAClen]:[MAC]
EVPN type-3 prefix: [3]:[EthTag]:[IPlen]:[OrigIP]
EVPN type-4 prefix: [4]:[ESI]:[IPlen]:[OrigIP]
EVPN type-5 prefix: [5]:[EthTag]:[IPlen]:[IP]

BGP routing table entry for 27.0.0.16:3:[1]:[0]:[03:44:38:39:ff:ff:01:00:00:01]:[32]:[0.0.0.0]
Paths: (4 available, best #2)
  Advertised to non peer-group peers:
  spine-1(swp1) spine-1(swp2) spine-2(swp3) spine-2(swp4)
  4435 5551
    27.0.0.16 from spine-1(swp2) (27.0.0.13)
      Origin IGP, valid, external
      Extended Community: RT:5551:1009 ET:8
      Last update: Thu Sep  3 21:01:53 2020
  4435 5551
    27.0.0.16 from spine-1(swp1) (27.0.0.13)
      Origin IGP, valid, external, bestpath-from-AS 4435, best (Router ID)
      Extended Community: RT:5551:1009 ET:8
      Last update: Thu Sep  3 21:01:53 2020
  4435 5551
    27.0.0.16 from spine-2(swp3) (27.0.0.14)
      Origin IGP, valid, external
      Extended Community: RT:5551:1009 ET:8
      Last update: Thu Sep  3 21:01:53 2020
  4435 5551
    27.0.0.16 from spine-2(swp4) (27.0.0.14)
      Origin IGP, valid, external
      Extended Community: RT:5551:1009 ET:8
      Last update: Thu Sep  3 21:01:53 2020

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

3 years agozebra: clean zevpn references in the access bd database when the VNI is deleted
Anuradha Karuppiah [Thu, 3 Sep 2020 13:50:26 +0000 (06:50 -0700)]
zebra: clean zevpn references in the access bd database when the VNI is deleted

When an VNI was deleted as a part of FRR/zebra shutdown the zevpn entry
was being freed without removing its reference in the access vlan
entry (i.e. without clearing the VLAN->VNI mapping) used by MH.

Ticket: CM-31197

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
3 years agozebra: reinstall missing peer-sync flag
Anuradha Karuppiah [Sat, 8 Aug 2020 01:32:52 +0000 (18:32 -0700)]
zebra: reinstall missing peer-sync flag

If a netlink/dp notification is rxed for a neigh without the peer-sync
flag FRR re-installs the entry with the right flags. This change is
needed to handle cases where the dataplane and FRR may fall out of
sync because of neigh learning on the network ports (i.e. via
the VxLAN).

Ticket: CM-30693
The problem was found during VM mobility "torture" tests where 100s
of extended VM moves were done.

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
3 years agobgpd: fix typo "show bgp l2vpn evpn es-evi [vni] <> json" display
Anuradha Karuppiah [Fri, 7 Aug 2020 19:41:10 +0000 (12:41 -0700)]
bgpd: fix typo "show bgp l2vpn evpn es-evi [vni] <> json" display

The ead-per-evi flag was being displayed as ed-per-evi.

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
3 years agozebra: changes to log ext_flags in neigh nl add
Anuradha Karuppiah [Thu, 30 Jul 2020 12:59:35 +0000 (05:59 -0700)]
zebra: changes to log ext_flags in neigh nl add

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
3 years agozebra: fix a problem with local MAC pointing to a remote ES
Anuradha Karuppiah [Wed, 29 Jul 2020 18:55:19 +0000 (11:55 -0700)]
zebra: fix a problem with local MAC pointing to a remote ES

If a remote MAC update is rxed from BGP with a lower sequence number than
the local one zebra ignores the MAC update. This typically happens if
there is a race condition (where updates are in flight from zebra to BGP).

There was a bug in zebra because of which the dest ES was being updated
before this check. This left the local MAC pointing to a remote ES.

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Relevant Dumps:
===============
root@leaf21:mgmt:~# net show evpn mac vni 101101 mac 00:93:00:00:00:01
MAC: 00:93:00:00:00:01
 ESI: 03:00:00:00:77:01:03:00:00:0d
 Intf: - VLAN: 101
 Sync-info: neigh#: 1 peer-proxy
 Local Seq: 3 Remote Seq: 0
 Neighbors:
    21.1.13.1 Active
root@leaf21:mgmt:~# net sho evpn es
Type: L local, R remote, N non-DF
ESI                            Type ES-IF                 VTEPs
03:00:00:00:77:01:02:00:00:0c  R    -                     6.0.0.10,6.0.0.11
03:00:00:00:77:01:03:00:00:0d  R    -                     6.0.0.10,6.0.0.11,6.0.0.12
03:00:00:00:77:01:04:00:00:0e  R    -                     6.0.0.10,6.0.0.11,6.0.0.12,6.0.0.13
03:00:00:00:77:02:02:00:00:16  LR   bondP2-H2             6.0.0.15
03:00:00:00:77:02:03:00:00:17  LR   bondP2-H3             6.0.0.15,6.0.0.16
03:00:00:00:77:02:04:00:00:18  LR   bondP2-H4             6.0.0.15,6.0.0.16,6.0.0.17
root@leaf21:mgmt:~#

Relevant logs:
===============
2020/07/29 15:41:27.110846 ZEBRA: Recv MACIP ADD VNI 101101 MAC 00:93:00:00:00:01 IP 21.1.13.1 flags 0x0 seq 2 VTEP 0.0.0.0 ESI 03:00:00:00:77:01:03:00:00:0d from bgp
2020/07/29 15:41:27.110867 ZEBRA: Ignore remote MACIP ADD VNI 101101 MAC 00:93:00:00:00:01 IP 21.1.13.1 as existing MAC has higher seq 3 flags 0x401
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

Ticket: CM-30273

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
3 years agozebra: advertise stale neighs if EVPN-MH is not enabled
Anuradha Karuppiah [Tue, 7 Jul 2020 01:01:41 +0000 (18:01 -0700)]
zebra: advertise stale neighs if EVPN-MH is not enabled

With EVPN-MH, Type-2 routes are also used for MAC-IP syncing between
ES peers so a change was done to only treat REACHABLE local neigh
entries as local-active and advertise them as Type-2 routes i.e. STALE
neigh entries are no longer advertised as Type-2s.

This however exposed some unexpected problems with MLAG where a
secondary reboot followed by a primary reboot left a lot of neighs
in STALE state (on the primary) resulting in them not being
advertised. And remote routed traffic to those hosts being
blackholed in a sym-IRB setup.

This commit is a workaround to fix the regression (it doesn't fix
the underlying problems with entries not becoming REACHABLE; which
maybe a day-1 problem). The workaround is to continue advertising
STALE neighbors if EVPN-MH is not enabled.

Ticket: CM-30303

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
3 years agozebra: handle "show evpn es-evi" a non-existent VNI
Anuradha Karuppiah [Tue, 23 Jun 2020 00:01:06 +0000 (17:01 -0700)]
zebra: handle "show evpn es-evi" a non-existent VNI

zebra was crashing when the command was run on a non-existent VNI.

>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
root@torm-12:mgmt:~# net show evpn es-evi vni 16777215
VNI 16777215 doesn't exist
root@torm-12:mgmt:~# net show evpn es-evi vni 16777215 detail
VNI 16777215 doesn't exist
root@torm-12:mgmt:~# net show evpn es-evi vni 16777215 json
[
]
root@torm-12:mgmt:~# net show evpn es-evi vni 16777215 detail json
[
]
root@torm-12:mgmt:~#
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

Ticket: CM-30232

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
3 years agobgpd: rename some MH functions and take care of deffered logs etc.
Anuradha Karuppiah [Thu, 28 May 2020 18:55:55 +0000 (11:55 -0700)]
bgpd: rename some MH functions and take care of deffered logs etc.

Rename VTEP change functions for better readability, improve comments
and add missing logs.

No functional change.

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
3 years agozebra: avoid c++ reserved keyword
Emanuele Di Pascale [Mon, 21 Dec 2020 12:17:09 +0000 (13:17 +0100)]
zebra: avoid c++ reserved keyword

in rib_handle_nhg_replace, do not use new as a parameter name to
allow compilation of c++ code including zebra headers.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>