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 47680489EF for ; Mon, 27 Oct 2025 17:22:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 422C940677; Mon, 27 Oct 2025 17:22:25 +0100 (CET) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id 27EB140677 for ; Mon, 27 Oct 2025 17:22:24 +0100 (CET) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-47103b6058fso35914865e9.1 for ; Mon, 27 Oct 2025 09:22:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761582144; x=1762186944; 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=LieKrbmuxU5N0Wy0NGBKR2F7cVrVf0KKlm8RfN+6WX8=; b=bK/k2dV+gqb/U6bF5YVpmWgY3WBo5LeIy2wv2hkGWVZnHTI/Y+2sv4vGAFe3hoeQOP jj+dxlbhcMcHUsr5UvLg1+F2gTq5gtMaKdoGili6f/eZ7Vxsv+qHa+72uIWkycZMOrXI +WU4VdWoJ8BrTCg82A9d/kIe6Do008TJNZIqfYcpovgJqrIDLwmcoN4IRqYfryJZqEkf ITKDEE0PbUeOCxIUPpn3jGVpHS/yDrIxrAVgF+aE66JeZUEFP/TsJ7BPOiH43P7d6a+Q 5XXVAEfZ0yDSIjBBln/cmkVaRbxMfcU5RvgGPUPcBGbC2yIiIybJGrqvR4Jaj3+wAxJE AuHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761582144; x=1762186944; 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=LieKrbmuxU5N0Wy0NGBKR2F7cVrVf0KKlm8RfN+6WX8=; b=YMwMJ89KXKpyW2vDd7yaKg4tUjHcL18hhv3lm8DPmnU4BIRv10kGSwDBuxdoIbwkCL XSlkp4qjMcf8k1z7jHN4m7C3jhta6YcXaNFBc5WAF6FC1ZWYOYSCzySvrnv1seZD5aIK T6BQ+aw8+ImjBTTX+bBvsOlOxUdrBXiUGIVsl5dGQ1OrlBjV6T0GDdWadFW7dIRQoXYG 399KkD3F2TqyiNrnSYViqkIspoMlTqRglxpTIP9dloW0ZEutErC2ZtxOVuj+tPgxGq7c 68pESQ3LE23+Y6A9+Eaq1Ks6z/LWdLIFyQNqzg3sPDALYDeyUUetv/Nd8TZfu3mPZHsf yBBw== X-Forwarded-Encrypted: i=1; AJvYcCUAUe9NtQHKUJ4dzYismqpycAAkhyTKBkKo177FudKdYS9u4SvfDr9iO/PZ3nqDYXa6icfbNKE=@dpdk.org X-Gm-Message-State: AOJu0YzbgOpXzHkmMDfC/CpNfvAJO09wmKPKic+L3ahvuvZYdh3OsuTs eXuGngOjSzPe+xo0rWccLYQCQTUgnl74CGpQmIIrAtnI754s15QRf+5RXGOJ3g== X-Gm-Gg: ASbGncvVM+Vi6idilck8UwGlzs0SgT0Apeqs27926mt8gK3CB2R/uR5eX4utqtZWDdm 4AKtZjZcDoiH8TWVTCQfJ/ZYjLIpWidj9u7opxE3PacA/XDRISSTWDJLMui/2wXhboF5nGYR4Kk Cm2mLNT+aNPy6J9NG8OGSFPQxzNZYK/airmq7tr2tmx1RUE5wQdDhZe7U57AzLti2eb/SVYyZ7e HHKbnXj+MQZ7JmrMnL6hKBufkN0KwvZrpRsOqA2PqwCr5vTx+ZiV8xFX00INMJ+NnS2UWiySClf P6t+G63WhEv4se2br3MRZyQo9aIvYDMDTj1QrA88sKsZvlEhWWkEEGgD+1RcAc4a0J6+CsjIOmK YMCxpZT1PE1wc7iCoYQTDxDa8I02A7EVCevI6Soif58Cp3jCzRDctA47rsX89bsbSV3lpyofFYP 5yD4ZJvQ== X-Google-Smtp-Source: AGHT+IHiJDJxSWRz70zSkXljSWyJiib8PJGFDYzMbxsUfc+bc1rYq55mL88OwCRnnx2/bdK9fGtofA== X-Received: by 2002:a05:600c:c10f:b0:475:d7fd:5c59 with SMTP id 5b1f17b1804b1-4771819772amr256025e9.16.1761582143659; Mon, 27 Oct 2025 09:22:23 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:6fc5:c3bc:147e:832c]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-429952df3c7sm14893623f8f.40.2025.10.27.09.22.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Oct 2025 09:22:23 -0700 (PDT) From: luca.boccassi@gmail.com To: Vladimir Medvedkin Cc: Robin Jarry , dpdk stable Subject: patch 'fib6: fix tbl8 allocation check logic' has been queued to stable release 22.11.11 Date: Mon, 27 Oct 2025 16:19:21 +0000 Message-ID: <20251027162001.3710450-43-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251027162001.3710450-1-luca.boccassi@gmail.com> References: <20251027162001.3710450-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 22.11.11 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/29/25. 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/3c7542d852139c75aa9a1432229cdc6217673fff Thanks. Luca Boccassi --- >From 3c7542d852139c75aa9a1432229cdc6217673fff Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Tue, 14 Oct 2025 18:17:55 +0000 Subject: [PATCH] fib6: fix tbl8 allocation check logic [ upstream commit f0db0f659a1f4192a4aca7ce2a298f272aa3af8f ] Currently if there were 'n' preallocated tbl8 entries only 'n - 1' were able to be used. Fix the logic allowing to use all preallocated tbl8 entries. Fixes: c3e12e0f0354 ("fib: add dataplane algorithm for IPv6") Signed-off-by: Vladimir Medvedkin Tested-by: Robin Jarry --- lib/fib/trie.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/fib/trie.c b/lib/fib/trie.c index ca1c2fe3bc..8937ab46dc 100644 --- a/lib/fib/trie.c +++ b/lib/fib/trie.c @@ -570,8 +570,7 @@ trie_modify(struct rte_fib6 *fib, const uint8_t ip[RTE_FIB6_IPV6_ADDR_SIZE], return 0; } - if ((depth > 24) && (dp->rsvd_tbl8s >= - dp->number_tbl8s - depth_diff)) + if ((depth > 24) && (dp->rsvd_tbl8s + depth_diff > dp->number_tbl8s)) return -ENOSPC; node = rte_rib6_insert(rib, ip_masked, depth); -- 2.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-27 15:54:36.409653540 +0000 +++ 0043-fib6-fix-tbl8-allocation-check-logic.patch 2025-10-27 15:54:34.811949950 +0000 @@ -1 +1 @@ -From f0db0f659a1f4192a4aca7ce2a298f272aa3af8f Mon Sep 17 00:00:00 2001 +From 3c7542d852139c75aa9a1432229cdc6217673fff Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f0db0f659a1f4192a4aca7ce2a298f272aa3af8f ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 5a9978b4ca..6427920c58 100644 +index ca1c2fe3bc..8937ab46dc 100644 @@ -23 +24 @@ -@@ -576,8 +576,7 @@ trie_modify(struct rte_fib6 *fib, const struct rte_ipv6_addr *ip, +@@ -570,8 +570,7 @@ trie_modify(struct rte_fib6 *fib, const uint8_t ip[RTE_FIB6_IPV6_ADDR_SIZE], @@ -32 +33 @@ - node = rte_rib6_insert(rib, &ip_masked, depth); + node = rte_rib6_insert(rib, ip_masked, depth);