[pve-devel] [PATCH frr 0/4] revert frr to 7.4

[pve-devel] [PATCH frr 0/4] revert frr to 7.4

[Alexandre Derumier]

frr 7.5.1 seem to be really buggy with evpn,
because of new the evpn multi-homing implementation.

I have already found 2 bugs, 1 is already fixed in frr 8.0,
but the other seem be racy and difficult to reproduce (was able to reproduce 3 times), 
and not yet fixed in frr 8.0.

So until it's fixed, this patch series is reverting to 7.4,
with "7.5.1-99+pve~really7.4" version to be sure to have the priority over
debian package.


Alexandre Derumier (4):
  Revert "update submodule to frr-7.5.1"
  Revert "update patches"
  fix python3.9
  bump to 7.5.1-99+pve~really7.4

 Makefile                                      |  2 +-
 debian/changelog                              |  7 ++++++
 ...e-ax_python.m4-to-hardcode-python3.9.patch | 25 +++++++++++++++++++
 .../patches/pve/0001-enable-bgp-daemon.patch  | 10 ++++----
 ...on-for-RT-auto-derivation-to-force-A.patch | 24 +++++++++---------
 debian/patches/series                         |  1 +
 frr                                           |  2 +-
 7 files changed, 52 insertions(+), 19 deletions(-)
 create mode 100644 debian/patches/0001-Adjust-the-ax_python.m4-to-hardcode-python3.9.patch

-- 
2.30.2

[pve-devel] [PATCH frr 1/4] Revert "update submodule to frr-7.5.1"

[Alexandre Derumier]

This reverts commit 077f1f03aea2dae44c160a97af04a30d41760ee4.
---
 frr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frr b/frr
index df7ab48..507bf79 160000
--- a/frr
+++ b/frr
@@ -1 +1 @@
-Subproject commit df7ab485bde1a511f131f7ad6b70cb43c48c8e6d
+Subproject commit 507bf79cd68e9b15ea964b439ba891f2854a5167
-- 
2.30.2

[pve-devel] [PATCH frr 2/4] Revert "update patches"

[Alexandre Derumier]

This reverts commit 18819c80b1bb9f3181e5fca6a9bca431ecc03200.
---
 .../patches/pve/0001-enable-bgp-daemon.patch  | 10 ++++----
 ...on-for-RT-auto-derivation-to-force-A.patch | 24 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/debian/patches/pve/0001-enable-bgp-daemon.patch b/debian/patches/pve/0001-enable-bgp-daemon.patch
index 42417b3..a9818c9 100644
--- a/debian/patches/pve/0001-enable-bgp-daemon.patch
+++ b/debian/patches/pve/0001-enable-bgp-daemon.patch
@@ -1,7 +1,7 @@
-From 249e602260f1c5bacffb7bc5bd0f5e8db635050d Mon Sep 17 00:00:00 2001
+From f098e90f4d690e771f63f48e0540a470faa91892 Mon Sep 17 00:00:00 2001
 From: Alexandre Derumier <aderumier@odiso.com>
 Date: Wed, 25 Nov 2020 12:41:32 +0100
-Subject: [PATCH 1/2] enable bgp && bfd daemons
+Subject: [PATCH] enable bgp && bfd daemons
 
 Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
 ---
@@ -9,12 +9,12 @@ Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons
-index f6d512be7..4cddea326 100644
+index 8bec3c5bb..7cdfa840c 100644
 --- a/tools/etc/frr/daemons
 +++ b/tools/etc/frr/daemons
 @@ -14,7 +14,7 @@
  #
- # The watchfrr, zebra and staticd daemons are always started.
+ # The watchfrr and zebra daemons are always started.
  #
 -bgpd=no
 +bgpd=yes
@@ -31,5 +31,5 @@ index f6d512be7..4cddea326 100644
  vrrpd=no
  
 -- 
-2.30.2
+2.20.1
 
diff --git a/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch b/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
index 20c2d3e..3306fbc 100644
--- a/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
+++ b/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
@@ -1,7 +1,7 @@
-From 159e7b812c722f663de48049d2070401dcb246b5 Mon Sep 17 00:00:00 2001
+From c3e66b067564281a58fcf3b99559d289a75090e9 Mon Sep 17 00:00:00 2001
 From: Alexandre Derumier <aderumier@odiso.com>
 Date: Tue, 17 Nov 2020 06:01:26 +0100
-Subject: [PATCH 2/2] bgpd : add an option for RT auto-derivation to force AS
+Subject: [PATCH 1/3] bgpd : add an option for RT auto-derivation to force AS
 
 Allow to define a custom AS for autort AS:VNI
 
@@ -16,10 +16,10 @@ Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
  3 files changed, 47 insertions(+), 17 deletions(-)
 
 diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
-index fa4145cf7..9ab60abe5 100644
+index 84e8960ee..73acc5d7b 100644
 --- a/bgpd/bgp_evpn.c
 +++ b/bgpd/bgp_evpn.c
-@@ -509,7 +509,11 @@ static void form_auto_rt(struct bgp *bgp, vni_t vni, struct list *rtl)
+@@ -512,7 +512,11 @@ static void form_auto_rt(struct bgp *bgp, vni_t vni, struct list *rtl)
  
  	if (bgp->advertise_autort_rfc8365)
  		vni |= EVPN_AUTORT_VXLAN;
@@ -32,7 +32,7 @@ index fa4145cf7..9ab60abe5 100644
  
  	ecomadd = ecommunity_new();
  	ecommunity_add_val(ecomadd, &eval, false, false);
-@@ -4253,7 +4257,11 @@ void evpn_rt_delete_auto(struct bgp *bgp, vni_t vni, struct list *rtl)
+@@ -4238,7 +4242,11 @@ void evpn_rt_delete_auto(struct bgp *bgp, vni_t vni, struct list *rtl)
  
  	if (bgp->advertise_autort_rfc8365)
  		vni |= EVPN_AUTORT_VXLAN;
@@ -46,10 +46,10 @@ index fa4145cf7..9ab60abe5 100644
  	ecom_auto = ecommunity_new();
  	ecommunity_add_val(ecom_auto, &eval, false, false);
 diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
-index 2f207f8ab..fac80c0d7 100644
+index e9e2aafeb..6cc6bba33 100644
 --- a/bgpd/bgp_evpn_vty.c
 +++ b/bgpd/bgp_evpn_vty.c
-@@ -3213,32 +3213,48 @@ DEFUN (no_bgp_evpn_advertise_all_vni,
+@@ -3226,32 +3226,48 @@ DEFUN (no_bgp_evpn_advertise_all_vni,
  	return CMD_SUCCESS;
  }
  
@@ -111,7 +111,7 @@ index 2f207f8ab..fac80c0d7 100644
  	return CMD_SUCCESS;
  }
  
-@@ -5599,6 +5615,9 @@ void bgp_config_write_evpn_info(struct vty *vty, struct bgp *bgp, afi_t afi,
+@@ -5596,6 +5612,9 @@ void bgp_config_write_evpn_info(struct vty *vty, struct bgp *bgp, afi_t afi,
  	if (bgp->advertise_autort_rfc8365)
  		vty_out(vty, "  autort rfc8365-compatible\n");
  
@@ -121,7 +121,7 @@ index 2f207f8ab..fac80c0d7 100644
  	if (bgp->advertise_gw_macip)
  		vty_out(vty, "  advertise-default-gw\n");
  
-@@ -5735,8 +5754,8 @@ void bgp_ethernetvpn_init(void)
+@@ -5732,8 +5751,8 @@ void bgp_ethernetvpn_init(void)
  	install_element(BGP_EVPN_NODE, &evpnrt5_network_cmd);
  	install_element(BGP_EVPN_NODE, &bgp_evpn_advertise_all_vni_cmd);
  	install_element(BGP_EVPN_NODE, &no_bgp_evpn_advertise_all_vni_cmd);
@@ -133,10 +133,10 @@ index 2f207f8ab..fac80c0d7 100644
  	install_element(BGP_EVPN_NODE, &no_bgp_evpn_advertise_default_gw_cmd);
  	install_element(BGP_EVPN_NODE, &bgp_evpn_advertise_svi_ip_cmd);
 diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
-index 19aa1ce5f..2ace67112 100644
+index d22fd008d..941066e2e 100644
 --- a/bgpd/bgpd.h
 +++ b/bgpd/bgpd.h
-@@ -616,6 +616,9 @@ struct bgp {
+@@ -614,6 +614,9 @@ struct bgp {
  	/* EVPN - use RFC 8365 to auto-derive RT */
  	int advertise_autort_rfc8365;
  
@@ -147,5 +147,5 @@ index 19aa1ce5f..2ace67112 100644
  	 * Flooding mechanism for BUM packets for VxLAN-EVPN.
  	 */
 -- 
-2.30.2
+2.20.1
 
-- 
2.30.2

[pve-devel] [PATCH frr 3/4] fix python3.9

[Alexandre Derumier]

---
 ...e-ax_python.m4-to-hardcode-python3.9.patch | 25 +++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 debian/patches/0001-Adjust-the-ax_python.m4-to-hardcode-python3.9.patch

diff --git a/debian/patches/0001-Adjust-the-ax_python.m4-to-hardcode-python3.9.patch b/debian/patches/0001-Adjust-the-ax_python.m4-to-hardcode-python3.9.patch
new file mode 100644
index 0000000..50073d9
--- /dev/null
+++ b/debian/patches/0001-Adjust-the-ax_python.m4-to-hardcode-python3.9.patch
@@ -0,0 +1,25 @@
+From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= <ondrej@sury.org>
+Date: Sun, 7 Feb 2021 13:14:17 +0100
+Subject: Adjust the ax_python.m4 to hardcode python3.9
+
+---
+ m4/ax_python.m4 | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/m4/ax_python.m4 b/m4/ax_python.m4
+index 9f43ea0..815bf47 100644
+--- a/m4/ax_python.m4
++++ b/m4/ax_python.m4
+@@ -186,11 +186,7 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+       AC_MSG_RESULT([yes])
+ 
+       PYTHON_CFLAGS="`\"$pycfg\" --includes`"
+-      if test x"${py_ver}" = x"3.8" || test x"{py_ver}" = x"3.9"; then
+-        PYTHON_LIBS="`\"$pycfg\" --ldflags --embed`"
+-      else
+-        PYTHON_LIBS="`\"$pycfg\" --ldflags`"
+-      fi
++      PYTHON_LIBS="`\"$pycfg\" --ldflags --embed`"
+ 
+       AC_MSG_CHECKING([whether ${pycfg} provides a working build environment])
+       _FRR_PYTHON_DEVENV([$py_hex], [
diff --git a/debian/patches/series b/debian/patches/series
index 50b22cc..41c48c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+0001-Adjust-the-ax_python.m4-to-hardcode-python3.9.patch
 pve/0001-enable-bgp-daemon.patch
 pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
-- 
2.30.2

[pve-devel] [PATCH frr 4/4] bump to 7.5.1-99+pve~really7.4

[Alexandre Derumier]

---
 Makefile         | 2 +-
 debian/changelog | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 39a5d10..dcd7d74 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PACKAGE=frr
 VER=7.5.1
-PKGREL=1+pve
+PKGREL=99+pve~really7.4
 
 SRCDIR=frr
 BUILDDIR=${SRCDIR}.tmp
diff --git a/debian/changelog b/debian/changelog
index 244f82b..660f8db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+
+frr (7.5.1-99+pve~really7.4) bullseye; urgency=medium
+
+  * Revert to 7.4
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 22 Aug 2021 11:03:00 +0200
+
 frr (7.5.1-1+pve) bullseye; urgency=medium
 
   * update submodule to latest 7.5.1 stable release
-- 
2.30.2

[pve-devel] applied-series: Re: [PATCH frr 0/4] revert frr to 7.4

[Thomas Lamprecht]

On 22/08/2021 12:07, Alexandre Derumier wrote:
> frr 7.5.1 seem to be really buggy with evpn,
> because of new the evpn multi-homing implementation.
> 
> I have already found 2 bugs, 1 is already fixed in frr 8.0,
> but the other seem be racy and difficult to reproduce (was able to reproduce 3 times), 
> and not yet fixed in frr 8.0.
> 
> So until it's fixed, this patch series is reverting to 7.4,
> with "7.5.1-99+pve~really7.4" version to be sure to have the priority over
> debian package.
> 
> 
> Alexandre Derumier (4):
>   Revert "update submodule to frr-7.5.1"
>   Revert "update patches"
>   fix python3.9
>   bump to 7.5.1-99+pve~really7.4
> 
>  Makefile                                      |  2 +-
>  debian/changelog                              |  7 ++++++
>  ...e-ax_python.m4-to-hardcode-python3.9.patch | 25 +++++++++++++++++++
>  .../patches/pve/0001-enable-bgp-daemon.patch  | 10 ++++----
>  ...on-for-RT-auto-derivation-to-force-A.patch | 24 +++++++++---------
>  debian/patches/series                         |  1 +
>  frr                                           |  2 +-
>  7 files changed, 52 insertions(+), 19 deletions(-)
>  create mode 100644 debian/patches/0001-Adjust-the-ax_python.m4-to-hardcode-python3.9.patch
> 


applied, thanks!

FYI: had to fixup the last patch with the bump, adding an empty line at the top-level
of the debian/changelog file is not supported. While at it I also added a bit more info
for the revert reason in the changelog entry.