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 831F042DA6 for ; Sat, 15 Jul 2023 00:35:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7C0C8410FA; Sat, 15 Jul 2023 00:35:00 +0200 (CEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 7636C40DFB for ; Sat, 15 Jul 2023 00:34:58 +0200 (CEST) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-31427ddd3fbso2517908f8f.0 for ; Fri, 14 Jul 2023 15:34:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689374098; x=1691966098; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DNgFtUWbyb7ZmGX2d43WhCe5AuXVHq7RyFWnQdGk5Y0=; b=P0t/3EUqHKiTnHULsEMxR3sTFhlAjkUVS1gKlWR1KD3B6kIq6kN2i02M71SAuFXfMV 39AhJn88b1LPgKfINDfi6hC++Uwm3wnAMijDd9fOD1a7SSERodcqj32uZiVmM9eoj9DV 27bwo/fGMlojIIj36FW62BW+TAmfvdGBRxIVmNcAOLscBRK6tzgVdyf1dei4t6YbHD8r uK6uwUJ47e3rAc38QIUOIPC9UDr8XxFJherKUyjVHL17k6rcVU0bhs8lSwfeUAegZxQf /2usv8nqmXrmd2MljJMRr/8Nm/NoKGnNUnm65+RmZsv3TfjZs8oJ6fRQ24kTHAeYFQ2H vTlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689374098; x=1691966098; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DNgFtUWbyb7ZmGX2d43WhCe5AuXVHq7RyFWnQdGk5Y0=; b=LUu3XUF+VQ6WzFkMmnkytObNfBFj9QPmQ2GVJthdVPAqt/f9M9gUiabBLeQWhgiljN X22RT1LqlZT+WMzUj2hM3yealOL8mKol4Pj6YzRMYD8lAvRqXi+e3I0X1AIoDhDf2irT 850BuTxgxr0vxLvxNpMflb2AuUR34VX3AlRjn3xXgIVR4HEJGKauMDrFoOTKNEtVUFN+ q3/npOzVA7RYoteSaugv5ICJSV1kpplc1HFHgZ/NSWvcB/KkcZRghKDgMDBEBqu7VrJY PQtJ0lJQ41/BG1bNA4JTrtKa2owDXtQ4jBWvyopjMnAQxEdxNlpAe2zI7t1Vre4PUCH7 cg3w== X-Gm-Message-State: ABy/qLZvXjAHdOjw9fGUdaUjnNKG2XhPGKp0+gIxCV5If0pSawAejzuo HqyHH4ZfdFDiGsRWA/hrlMzz30kjeO76tvQo X-Google-Smtp-Source: APBJJlGxJpaQRx/xulTduPrGY3/B9pp7r6mvgozLlfPIrWNk7lJL9FH8TPEwJt6bEhWqv7buCG67AQ== X-Received: by 2002:adf:f988:0:b0:313:f580:68d with SMTP id f8-20020adff988000000b00313f580068dmr4929445wrr.48.1689374098129; Fri, 14 Jul 2023 15:34:58 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id c3-20020adffb03000000b0031432f1528csm11945814wrr.45.2023.07.14.15.34.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 15:34:57 -0700 (PDT) From: luca.boccassi@gmail.com To: Vladimir Medvedkin Cc: dpdk stable Subject: patch 'fib: fix adding default route' has been queued to stable release 20.11.9 Date: Fri, 14 Jul 2023 23:34:31 +0100 Message-Id: <20230714223447.1092828-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230714223447.1092828-1-luca.boccassi@gmail.com> References: <20230628141046.2145871-22-luca.boccassi@gmail.com> <20230714223447.1092828-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.9 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/16/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/d5778159b6ba6d855deace58f2ce1e542eec9d9d Thanks. Luca Boccassi --- >From d5778159b6ba6d855deace58f2ce1e542eec9d9d 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/librte_fib/dir24_8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_fib/dir24_8.c b/lib/librte_fib/dir24_8.c index bb3bc9753b..181ed03dee 100644 --- a/lib/librte_fib/dir24_8.c +++ b/lib/librte_fib/dir24_8.c @@ -394,7 +394,7 @@ modify_fib(struct dir24_8_tbl *dp, struct rte_rib *rib, uint32_t ip, (uint32_t)(1ULL << (32 - tmp_depth)); } else { redge = ip + (uint32_t)(1ULL << (32 - depth)); - if (ledge == redge) + if (ledge == redge && ledge != 0) break; ret = install_to_fib(dp, ledge, redge, next_hop); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-14 23:33:08.586517497 +0100 +++ 0002-fib-fix-adding-default-route.patch 2023-07-14 23:33:08.479304963 +0100 @@ -1 +1 @@ -From 880bc2b5f3bdbde0eee4d880afaaf91b4babbdfc Mon Sep 17 00:00:00 2001 +From d5778159b6ba6d855deace58f2ce1e542eec9d9d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 880bc2b5f3bdbde0eee4d880afaaf91b4babbdfc ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - lib/fib/dir24_8.c | 2 +- + lib/librte_fib/dir24_8.c | 2 +- @@ -18,5 +19,5 @@ -diff --git a/lib/fib/dir24_8.c b/lib/fib/dir24_8.c -index a8ba4f64ca..3efdcb533c 100644 ---- a/lib/fib/dir24_8.c -+++ b/lib/fib/dir24_8.c -@@ -390,7 +390,7 @@ modify_fib(struct dir24_8_tbl *dp, struct rte_rib *rib, uint32_t ip, +diff --git a/lib/librte_fib/dir24_8.c b/lib/librte_fib/dir24_8.c +index bb3bc9753b..181ed03dee 100644 +--- a/lib/librte_fib/dir24_8.c ++++ b/lib/librte_fib/dir24_8.c +@@ -394,7 +394,7 @@ modify_fib(struct dir24_8_tbl *dp, struct rte_rib *rib, uint32_t ip,