From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F055A42ECF for ; Thu, 20 Jul 2023 17:34:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EC6B040685; Thu, 20 Jul 2023 17:34:13 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 9A0D7400D6 for ; Thu, 20 Jul 2023 17:34:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689867252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LH9WIaGI/OnBsZGZt6FrVXnF8AdJO56xQz7eM0JQDEg=; b=dkQn7p1yOYhvhNAbXozSRiqZ3/NBOGF1xSlM9GdTd7bsERxtdDWuqsueB2Ec5feW6M/DBK zFFxAUcYoiKe0AxIKdoCop6w84aoaexygZ4jD36pRlPdfGP3+G2lvKv+9hVShm7/bx7Cn9 V1GOfIi+vbdmT4Nmpfbl699U/ML+RzI= Received: from mimecast-mx02.redhat.com (66.187.233.88 [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-524-5gARxVLSPFux6aU_WZAoDA-1; Thu, 20 Jul 2023 11:23:07 -0400 X-MC-Unique: 5gARxVLSPFux6aU_WZAoDA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 159C6803FDC; Thu, 20 Jul 2023 15:22:49 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3E0D24A9005; Thu, 20 Jul 2023 15:22:48 +0000 (UTC) From: Kevin Traynor To: Vladimir Medvedkin Cc: dpdk stable Subject: patch 'fib: fix adding default route' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:19:03 +0100 Message-ID: <20230720151942.262154-112-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/5634ca2e970ba1bf865222dbbf46a3f0e88a7915 Thanks. Kevin --- >From 5634ca2e970ba1bf865222dbbf46a3f0e88a7915 Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Mon, 3 Jul 2023 15:43:35 +0000 Subject: [PATCH] fib: fix adding default route [ upstream commit 880bc2b5f3bdbde0eee4d880afaaf91b4babbdfc ] Fixed an issue that occurs when adding a default route as the first route. Bugzilla ID: 1160 Fixes: 7dc7868b200d ("fib: add DIR24-8 dataplane algorithm") Signed-off-by: Vladimir Medvedkin --- lib/fib/dir24_8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fib/dir24_8.c b/lib/fib/dir24_8.c index bb3bc9753b..181ed03dee 100644 --- a/lib/fib/dir24_8.c +++ b/lib/fib/dir24_8.c @@ -395,5 +395,5 @@ modify_fib(struct dir24_8_tbl *dp, struct rte_rib *rib, uint32_t ip, } else { redge = ip + (uint32_t)(1ULL << (32 - depth)); - if (ledge == redge) + if (ledge == redge && ledge != 0) break; ret = install_to_fib(dp, ledge, redge, -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:08.688793590 +0100 +++ 0112-fib-fix-adding-default-route.patch 2023-07-20 16:17:55.099752297 +0100 @@ -1 +1 @@ -From 880bc2b5f3bdbde0eee4d880afaaf91b4babbdfc Mon Sep 17 00:00:00 2001 +From 5634ca2e970ba1bf865222dbbf46a3f0e88a7915 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 880bc2b5f3bdbde0eee4d880afaaf91b4babbdfc ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index a8ba4f64ca..3efdcb533c 100644 +index bb3bc9753b..181ed03dee 100644 @@ -22 +23 @@ -@@ -391,5 +391,5 @@ modify_fib(struct dir24_8_tbl *dp, struct rte_rib *rib, uint32_t ip, +@@ -395,5 +395,5 @@ modify_fib(struct dir24_8_tbl *dp, struct rte_rib *rib, uint32_t ip,