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 416504326F for ; Thu, 2 Nov 2023 14:14:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3C24242E0E; Thu, 2 Nov 2023 14:14:43 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id F16B042E1E for ; Thu, 2 Nov 2023 14:14:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930880; 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=We+I+aDpnwlMfs9dYpdbcQbMsq0LEGNFjhRlqWdB00E=; b=dU8ghvnHm2NpGA991sI8J2ulYCsFDk5hI+reOGy6YRRfzeIre1+zYrScZIKLzLxYPDoDwX J5p7XigvPxp0jW3kMs6WxfHqHSsAqKbtBLDY6BktEuFNGnv/BxsmUO7Gb7FFceUkyvabCL By+yRvkH+A2/RBH1JiLCGOfuFb1BSsE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-38-cip9g3v7PYudVWRwBnUFcg-1; Thu, 02 Nov 2023 09:14:39 -0400 X-MC-Unique: cip9g3v7PYudVWRwBnUFcg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id D5947185A781; Thu, 2 Nov 2023 13:14:38 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BE99474FA1; Thu, 2 Nov 2023 13:14:38 +0000 (UTC) From: Kevin Traynor To: Vladimir Medvedkin Cc: dpdk stable Subject: patch 'fib: fix adding default route overwriting entire table' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:15 +0000 Message-ID: <20231102131254.315947-69-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/08/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/e9cd35de3caa2e80f7f297cd3481ff016bc272d7 Thanks. Kevin --- >From e9cd35de3caa2e80f7f297cd3481ff016bc272d7 Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Mon, 2 Oct 2023 15:11:48 +0000 Subject: [PATCH] fib: fix adding default route overwriting entire table [ upstream commit ab1b927cd73e96643cfe93dc2493d03c737b59ae ] When FIB contains any route covering last IP address (255.255.255.255), upon adding a new default route the entire FIB table will be overwritten with corresponding default route next hop. Previous fix added check for ledge against 0 for case if default route is added as a first route, however this check was also erroneously triggered in case when ledge was wrapped around the address space (this would happen if FIB contains any route covering last possible address - 255.255.255.255). This fix prevents wrap around from happening. Fixes: 880bc2b5f3bd ("fib: fix adding default route") Signed-off-by: Vladimir Medvedkin --- lib/fib/dir24_8.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/fib/dir24_8.c b/lib/fib/dir24_8.c index 181ed03dee..49407ba638 100644 --- a/lib/fib/dir24_8.c +++ b/lib/fib/dir24_8.c @@ -393,4 +393,10 @@ modify_fib(struct dir24_8_tbl *dp, struct rte_rib *rib, uint32_t ip, ledge = redge + (uint32_t)(1ULL << (32 - tmp_depth)); + /* + * we got to the end of address space + * and wrapped around + */ + if (ledge == 0) + break; } else { redge = ip + (uint32_t)(1ULL << (32 - depth)); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:42.495396876 +0000 +++ 0069-fib-fix-adding-default-route-overwriting-entire-tabl.patch 2023-11-02 13:09:40.882163557 +0000 @@ -1 +1 @@ -From ab1b927cd73e96643cfe93dc2493d03c737b59ae Mon Sep 17 00:00:00 2001 +From e9cd35de3caa2e80f7f297cd3481ff016bc272d7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ab1b927cd73e96643cfe93dc2493d03c737b59ae ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index a61897667b..c739e92304 100644 +index 181ed03dee..49407ba638 100644 @@ -32 +33 @@ -@@ -389,4 +389,10 @@ modify_fib(struct dir24_8_tbl *dp, struct rte_rib *rib, uint32_t ip, +@@ -393,4 +393,10 @@ modify_fib(struct dir24_8_tbl *dp, struct rte_rib *rib, uint32_t ip,