From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <root@kvmformation3.odiso.net>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id A33266CB2F
for <pve-devel@lists.proxmox.com>; Tue, 10 Aug 2021 09:45:14 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 97C85D4DB
for <pve-devel@lists.proxmox.com>; Tue, 10 Aug 2021 09:45:14 +0200 (CEST)
Received: from kvmformation3.odiso.net (globalOdiso.M6Lille.odiso.net
[89.248.211.242])
by firstgate.proxmox.com (Proxmox) with ESMTP id 4E27DD4CF
for <pve-devel@lists.proxmox.com>; Tue, 10 Aug 2021 09:45:11 +0200 (CEST)
Received: by kvmformation3.odiso.net (Postfix, from userid 0)
id 3CF7D10B7A7; Tue, 10 Aug 2021 09:45:04 +0200 (CEST)
From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 10 Aug 2021 09:45:03 +0200
Message-Id: <20210810074503.392030-1-aderumier@odiso.com>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.652 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
HEADER_FROM_DIFFERENT_DOMAINS 0.248 From and EnvelopeFrom 2nd level mail
domains are different
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery
methods
KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years
KHOP_HELO_FCRDNS 0.398 Relay HELO differs from its IP's reverse DNS
NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_NONE 0.001 SPF: sender does not publish an SPF Record
Subject: [pve-devel] [PATCH frr] fix regression with evpn MH introduce in 7.5
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 10 Aug 2021 07:45:14 -0000
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
Makefile | 2 +-
debian/changelog | 6 ++++
.../pve/0003-bugfix-local_inactive.patch | 33 +++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 41 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/pve/0003-bugfix-local_inactive.patch
diff --git a/Makefile b/Makefile
index 39a5d10..7c875d0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
PACKAGE=frr
VER=7.5.1
-PKGREL=1+pve
+PKGREL=2+pve
SRCDIR=frr
BUILDDIR=${SRCDIR}.tmp
diff --git a/debian/changelog b/debian/changelog
index 244f82b..9b5a912 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+frr (7.5.1-2+pve) bullseye; urgency=medium
+
+ * Fix evpn MH local_inactive bug
+
+ -- Proxmox Support Team <support@proxmox.com> Tue, 10 Aug 2021 09:35:20 +0200
+
frr (7.5.1-1+pve) bullseye; urgency=medium
* update submodule to latest 7.5.1 stable release
diff --git a/debian/patches/pve/0003-bugfix-local_inactive.patch b/debian/patches/pve/0003-bugfix-local_inactive.patch
new file mode 100644
index 0000000..8c0fe63
--- /dev/null
+++ b/debian/patches/pve/0003-bugfix-local_inactive.patch
@@ -0,0 +1,33 @@
+From 1e564145bb43c31dae7106c86a9b52a138fbfa86 Mon Sep 17 00:00:00 2001
+From: Alexandre Derumier <aderumier@odiso.com>
+Date: Tue, 10 Aug 2021 09:00:54 +0200
+Subject: [PATCH 2/2] bugfix: fix evpn MH local_inactive
+
+frr 7.5 is missing this patch
+https://github.com/FRRouting/frr/commit/c7bfd085680bf94ea5dbdccc875f7e0257a9a9c8.patch
+
+it's difficult to backport, but we don't use evpn MH, so until it's fixed,
+we can disable local_inactive for now
+
+https://github.com/FRRouting/frr/issues/9347
+
+---
+ zebra/rt_netlink.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
+index 770feb52b..a7c9412a3 100644
+--- a/zebra/rt_netlink.c
++++ b/zebra/rt_netlink.c
+@@ -3370,7 +3370,7 @@ static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
+ * in re-adding the neighbor if it is a valid "remote" neighbor.
+ */
+ if (ndm->ndm_state & NUD_VALID) {
+- local_inactive = !(ndm->ndm_state & NUD_LOCAL_ACTIVE);
++ local_inactive = false;
+
+ /* XXX - populate dp-static based on the sync flags
+ * in the kernel
+--
+2.30.2
+
diff --git a/debian/patches/series b/debian/patches/series
index 50b22cc..64c0303 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
pve/0001-enable-bgp-daemon.patch
pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
+pve/0003-bugfix-local_inactive.patch
\ No newline at end of file
--
2.30.2