Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zebra: trigger remove all access vlans info for access port #9091

Merged
merged 1 commit into from
Jul 22, 2021

Conversation

gord1306
Copy link
Contributor

When port was removed from last access vlan, the linux kernel won't send any vlan info in the netlink message, it might affect that the evpn mh not withdraw EAD-EVI routes.

Copy link

@polychaeta polychaeta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contribution to FRR!

  • One of your commits has a missing or badly formatted Signed-off-by line; we can't accept your contribution until all of your commits have one
Click for style suggestions

To apply these suggestions:

curl -s https://gist.githubusercontent.com/polychaeta/4b9d02d2d9233a1b29e575101c2d6190/raw/be1596d14d388f8f15d9f63bf80931a07e91ea61/cr_9091_1626773421.diff | git apply

diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 08ebe14e8..a51e0b82c 100644
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -747,7 +747,7 @@ static void netlink_bridge_vlan_update(struct interface *ifp,
 
 	if (af_spec) {
 		for (i = RTA_DATA(af_spec), rem = RTA_PAYLOAD(af_spec);
-				RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
+		     RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
 
 			if (i->rta_type != IFLA_BRIDGE_VLAN_INFO)
 				continue;
@@ -762,7 +762,8 @@ static void netlink_bridge_vlan_update(struct interface *ifp,
 			if (!(vinfo->flags & BRIDGE_VLAN_INFO_RANGE_END))
 				vid_range_start = vinfo->vid;
 
-			zebra_vlan_bitmap_compute(ifp, vid_range_start, vinfo->vid);
+			zebra_vlan_bitmap_compute(ifp, vid_range_start,
+						  vinfo->vid);
 		}
 	}
 

If you are a new contributor to FRR, please see our contributing guidelines.

After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.

@polychaeta polychaeta dismissed their stale review July 20, 2021 09:34

blocking comments addressed

Copy link

@polychaeta polychaeta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contribution to FRR!

Click for style suggestions

To apply these suggestions:

curl -s https://gist.githubusercontent.com/polychaeta/b79e3b7541b3da59d6859a5f578bcdf1/raw/be1596d14d388f8f15d9f63bf80931a07e91ea61/cr_9091_1626773691.diff | git apply

diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 08ebe14e8..a51e0b82c 100644
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -747,7 +747,7 @@ static void netlink_bridge_vlan_update(struct interface *ifp,
 
 	if (af_spec) {
 		for (i = RTA_DATA(af_spec), rem = RTA_PAYLOAD(af_spec);
-				RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
+		     RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
 
 			if (i->rta_type != IFLA_BRIDGE_VLAN_INFO)
 				continue;
@@ -762,7 +762,8 @@ static void netlink_bridge_vlan_update(struct interface *ifp,
 			if (!(vinfo->flags & BRIDGE_VLAN_INFO_RANGE_END))
 				vid_range_start = vinfo->vid;
 
-			zebra_vlan_bitmap_compute(ifp, vid_range_start, vinfo->vid);
+			zebra_vlan_bitmap_compute(ifp, vid_range_start,
+						  vinfo->vid);
 		}
 	}
 

If you are a new contributor to FRR, please see our contributing guidelines.

After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.

When port was removed from last access vlan, the linux kernel
won't send any vlan info in the netlink message, it might affact
the evpn mh not withdraw EAD-EVI routes.

Signed-off-by: Gord Chen <[email protected]>
@LabN-CI
Copy link
Collaborator

LabN-CI commented Jul 20, 2021

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

Results table
_ _
Result SUCCESS git merge/9091 ec89775
Date 07/20/2021
Start 06:17:03
Finish 06:42:37
Run-Time 25:34
Total 1813
Pass 1813
Fail 0
Valgrind-Errors
Valgrind-Loss
Details vncregress-2021-07-20-06:17:03.txt
Log autoscript-2021-07-20-06:18:19.log.bz2
Memory 476 497 424

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Jul 20, 2021

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20376/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Checkout code: Successful with additional warnings
Report for if_netlink.c | 2 issues
===============================================
< WARNING: line over 80 characters
< #765: FILE: /tmp/f1-8339/if_netlink.c:765:

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Jul 20, 2021

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20375/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Checkout code: Successful with additional warnings
Report for if_netlink.c | 2 issues
===============================================
< WARNING: line over 80 characters
< #765: FILE: /tmp/f1-1480/if_netlink.c:765:

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Jul 20, 2021

Continuous Integration Result: FAILED

Continuous Integration Result: FAILED

See below for issues.
CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20377/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Get source / Pull Request: Successful

Building Stage: Successful

Basic Tests: Failed

Topotests Ubuntu 18.04 arm8 part 8: Failed (click for details) Topotests Ubuntu 18.04 arm8 part 8: No useful log found
Successful on other platforms/tests
  • Static analyzer (clang)
  • Addresssanitizer topotests part 5
  • Topotests Ubuntu 18.04 amd64 part 7
  • Topotests Ubuntu 18.04 i386 part 9
  • Topotests Ubuntu 18.04 amd64 part 0
  • Topotests Ubuntu 18.04 i386 part 4
  • Topotests Ubuntu 18.04 arm8 part 5
  • Topotests Ubuntu 18.04 arm8 part 0
  • Addresssanitizer topotests part 0
  • IPv4 ldp protocol on Ubuntu 18.04
  • Topotests Ubuntu 18.04 arm8 part 9
  • Topotests Ubuntu 18.04 i386 part 0
  • Topotests debian 10 amd64 part 9
  • Topotests Ubuntu 18.04 i386 part 5
  • Topotests debian 10 amd64 part 4
  • Topotests Ubuntu 18.04 arm8 part 4
  • Topotests debian 10 amd64 part 8
  • Topotests Ubuntu 18.04 amd64 part 9
  • IPv6 protocols on Ubuntu 18.04
  • Fedora 29 rpm pkg check
  • Topotests Ubuntu 18.04 arm8 part 3
  • Topotests Ubuntu 18.04 amd64 part 3
  • Topotests Ubuntu 18.04 amd64 part 5
  • Addresssanitizer topotests part 1
  • Topotests debian 10 amd64 part 5
  • Topotests Ubuntu 18.04 i386 part 7
  • Topotests debian 10 amd64 part 6
  • Addresssanitizer topotests part 4
  • Topotests Ubuntu 18.04 amd64 part 4
  • Topotests Ubuntu 18.04 arm8 part 6
  • Topotests debian 10 amd64 part 7
  • IPv4 protocols on Ubuntu 18.04
  • Addresssanitizer topotests part 8
  • Topotests Ubuntu 18.04 arm8 part 1
  • Topotests Ubuntu 18.04 i386 part 2
  • Topotests Ubuntu 18.04 arm8 part 2
  • Topotests Ubuntu 18.04 amd64 part 2
  • Topotests Ubuntu 18.04 arm8 part 7
  • Topotests debian 10 amd64 part 2
  • Ubuntu 16.04 deb pkg check
  • Addresssanitizer topotests part 6
  • Topotests Ubuntu 18.04 amd64 part 6
  • Topotests Ubuntu 18.04 i386 part 6
  • Addresssanitizer topotests part 2
  • Ubuntu 18.04 deb pkg check
  • Topotests Ubuntu 18.04 amd64 part 1
  • Ubuntu 20.04 deb pkg check
  • Debian 9 deb pkg check
  • Debian 10 deb pkg check
  • CentOS 7 rpm pkg check
  • Topotests Ubuntu 18.04 amd64 part 8
  • Topotests debian 10 amd64 part 3
  • Addresssanitizer topotests part 9
  • Topotests Ubuntu 18.04 i386 part 3
  • Topotests Ubuntu 18.04 i386 part 1
  • Topotests debian 10 amd64 part 1
  • Addresssanitizer topotests part 7
  • Topotests debian 10 amd64 part 0
  • Topotests Ubuntu 18.04 i386 part 8
  • Addresssanitizer topotests part 3

@mjstapp
Copy link
Contributor

mjstapp commented Jul 20, 2021

CI:rerun

@mjstapp
Copy link
Contributor

mjstapp commented Jul 20, 2021

looks like an arm problem - rerunning

@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20392/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Copy link
Contributor

@AnuradhaKaruppiah AnuradhaKaruppiah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thx for the fix.

@donaldsharp donaldsharp merged commit 9fbbcbe into FRRouting:master Jul 22, 2021
@idryzhov
Copy link
Contributor

@Mergifyio backport stable/8.0

@mergify
Copy link

mergify bot commented Jul 23, 2021

Command backport stable/8.0: success

Backports have been created

mwinter-osr added a commit that referenced this pull request Jul 24, 2021
zebra: trigger remove all access vlans info for access port (backport #9091)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants