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 91C19431A0 for ; Thu, 19 Oct 2023 02:01:33 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8C907411F3; Thu, 19 Oct 2023 02:01:33 +0200 (CEST) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id 73F1741157 for ; Thu, 19 Oct 2023 02:01:31 +0200 (CEST) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-40806e40fccso17058685e9.2 for ; Wed, 18 Oct 2023 17:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697673691; x=1698278491; darn=dpdk.org; 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=c9D+NtbeX59OwhrvCT92FUqhkQL/UFmKkBLp1jF+6Uc=; b=lKak6KWLYfla3AOdwyJ1CJ2wSdrnDu6oxDB1TTeEs2kBqQrEf7bkWqGAZhWoaiNxjZ ILObh/2r/CU4F2GFGnsBAllovO46KXLD+l7uzWvFiEptnFl8P3J2FAUzjQ2qMAFtMhzJ yseVVKRueHuudevJYSSI/BOPdbX26+Sb7j9pOjs0F2VQYkv+1/NjQcdCNAc7F/5+LtFU 2iS3dN7ld4v8c0IuLxa3TttVJ7Y23K5HzqACVsEBogzxhMhcg3hNf8sPsACQF/ra3aGR c1DPOubzDDeDrLyCiLU8qEH+lVVZqx2Do1kVWxxOsh9qBjuw5iyR2wOnOBBjz+kz3M1t cBOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697673691; x=1698278491; 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=c9D+NtbeX59OwhrvCT92FUqhkQL/UFmKkBLp1jF+6Uc=; b=U13Ro8P4qEAbzhuewx0Y1fcDxNVe0Qm+va5lH1uAPxdo480sgJdL5blm1/s2cNZ7GM LRiRJ5xvK5L5BH9Im1Pqb53RrzaJ0Ac/erp2iSnkTPG4x1TwBMAfEUnV3eKc6Fq/MkPb rAkqQq2fLrPB/ce8BwuJqWP7M5bmh99BBMqacg/qunsWxptYEmqePfg+DSH9KZG7xl8m sVcErJppLKQghDQ0ulbfABnS36LfjqQOVKaC8tttljwolAPBp3qKTNNTvhXqX6qT1XzH GAqdnhaA+UEXthQd5jIytIlZRH8cxBWfF/WEKPv53NGm7tPpeXl4BcrZR/bNrccJcsGg dK9Q== X-Gm-Message-State: AOJu0YxenIZdhh0edc2CHWTMjvDbDtN83NebalDBZS3GiEj83k6TNpNy peAi5ex2l57xojz05qcpbqk= X-Google-Smtp-Source: AGHT+IFiuSNJJmR4NtS/ilXXZ6GOVvDr189YgdiUTp7fvY1Cu2dNoUl86pdE0s76W7fgc8otRWfu0w== X-Received: by 2002:a05:600c:4fd5:b0:408:434c:dae7 with SMTP id o21-20020a05600c4fd500b00408434cdae7mr648650wmq.2.1697673691108; Wed, 18 Oct 2023 17:01:31 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id v12-20020a05600c470c00b004054dcbf92asm2957917wmo.20.2023.10.18.17.01.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 17:01:30 -0700 (PDT) From: luca.boccassi@gmail.com To: Vladimir Medvedkin Cc: dpdk stable Subject: patch 'fib6: fix adding default route as first route' has been queued to stable release 20.11.10 Date: Thu, 19 Oct 2023 00:59:28 +0100 Message-Id: <20231018235930.3144-39-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231018235930.3144-1-luca.boccassi@gmail.com> References: <20231018235930.3144-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.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/21/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/b4b6c8753a5e72025441650b15e79e431916bae3 Thanks. Luca Boccassi --- >From b4b6c8753a5e72025441650b15e79e431916bae3 Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Mon, 2 Oct 2023 15:12:01 +0000 Subject: [PATCH] fib6: fix adding default route as first route [ upstream commit fd66617c5774a2869cbb69f86494d1b4803890fc ] Currently when adding default route as first route it is not added and no error is reported. When we enter the loop over an address range in the general case we will eventually reach the check for when the range has ended, and exit the loop. However when adding default route as first route, since address range covered begins and ends at zero this also triggers loop exit without writing to the table. Fixed by adding check for default route, i.e. both ledge and redge are equal to 0::0. Bugzilla ID: 1272 Fixes: c3e12e0f0354 ("fib: add dataplane algorithm for IPv6") Signed-off-by: Vladimir Medvedkin --- lib/librte_fib/trie.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/librte_fib/trie.c b/lib/librte_fib/trie.c index 044095bf03..b096743086 100644 --- a/lib/librte_fib/trie.c +++ b/lib/librte_fib/trie.c @@ -456,6 +456,14 @@ get_nxt_net(uint8_t *ip, uint8_t depth) } } +static int +v6_addr_is_zero(const uint8_t ip[RTE_FIB6_IPV6_ADDR_SIZE]) +{ + uint8_t ip_addr[RTE_FIB6_IPV6_ADDR_SIZE] = {0}; + + return rte_rib6_is_equal(ip, ip_addr); +} + static int modify_dp(struct rte_trie_tbl *dp, struct rte_rib6 *rib, const uint8_t ip[RTE_FIB6_IPV6_ADDR_SIZE], @@ -489,11 +497,19 @@ modify_dp(struct rte_trie_tbl *dp, struct rte_rib6 *rib, return ret; get_nxt_net(redge, tmp_depth); rte_rib6_copy_addr(ledge, redge); + /* + * we got to the end of address space + * and wrapped around + */ + if (v6_addr_is_zero(ledge)) + break; } else { rte_rib6_copy_addr(redge, ip); get_nxt_net(redge, depth); - if (rte_rib6_is_equal(ledge, redge)) + if (rte_rib6_is_equal(ledge, redge) && + !v6_addr_is_zero(ledge)) break; + ret = install_to_dp(dp, ledge, redge, next_hop); if (ret != 0) -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-19 00:28:58.200145676 +0100 +++ 0039-fib6-fix-adding-default-route-as-first-route.patch 2023-10-19 00:28:56.309806953 +0100 @@ -1 +1 @@ -From fd66617c5774a2869cbb69f86494d1b4803890fc Mon Sep 17 00:00:00 2001 +From b4b6c8753a5e72025441650b15e79e431916bae3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fd66617c5774a2869cbb69f86494d1b4803890fc ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ - lib/fib/trie.c | 18 +++++++++++++++++- + lib/librte_fib/trie.c | 18 +++++++++++++++++- @@ -27,5 +28,5 @@ -diff --git a/lib/fib/trie.c b/lib/fib/trie.c -index 3e780afdaf..09470e7287 100644 ---- a/lib/fib/trie.c -+++ b/lib/fib/trie.c -@@ -451,6 +451,14 @@ get_nxt_net(uint8_t *ip, uint8_t depth) +diff --git a/lib/librte_fib/trie.c b/lib/librte_fib/trie.c +index 044095bf03..b096743086 100644 +--- a/lib/librte_fib/trie.c ++++ b/lib/librte_fib/trie.c +@@ -456,6 +456,14 @@ get_nxt_net(uint8_t *ip, uint8_t depth) @@ -46 +47 @@ -@@ -484,11 +492,19 @@ modify_dp(struct rte_trie_tbl *dp, struct rte_rib6 *rib, +@@ -489,11 +497,19 @@ modify_dp(struct rte_trie_tbl *dp, struct rte_rib6 *rib,