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 730B945DB9 for ; Wed, 27 Nov 2024 18:20:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 61DC4402E1; Wed, 27 Nov 2024 18:20:30 +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 C6E60402DE for ; Wed, 27 Nov 2024 18:20:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728028; 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=li/fRUaftUtr56Mj0uW/h7sSdZCxscCRZ5q5zZvh+mc=; b=Ejx3IQBTG9Ju4xi5DSn2b5rJa8KQqPeryYzxNWDu27oCV0OIkFuJQ57kjPsJ/f9mxGPUiV AC96ieZVyLeFZo5WcN92D8M7dpWGJ8TvZ4iaGGOn1h9pMtrMGpfEJaWcw88fqVHuHnjMxa PUGAJ7H9BsCAaQeUa1ME84fw9k6VEMU= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-244-PpVUZDTgPcaHmpz35AUaTw-1; Wed, 27 Nov 2024 12:20:26 -0500 X-MC-Unique: PpVUZDTgPcaHmpz35AUaTw-1 X-Mimecast-MFC-AGG-ID: PpVUZDTgPcaHmpz35AUaTw Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CAE1419540EF; Wed, 27 Nov 2024 17:20:25 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BEEFB300019E; Wed, 27 Nov 2024 17:20:24 +0000 (UTC) From: Kevin Traynor To: Vladimir Medvedkin Cc: dpdk stable Subject: patch 'fib: fix AVX512 lookup' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:17:33 +0000 Message-ID: <20241127171916.690404-26-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: n2HAKmuY1Wt8B2vixTx6ZFnuc-ap8pfW2Nzwa9OuupI_1732728025 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.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 12/02/24. 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/e364af95ac7aec6843623702a6c2c4dd46c756cf Thanks. Kevin --- >From e364af95ac7aec6843623702a6c2c4dd46c756cf Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Fri, 6 Sep 2024 17:04:36 +0000 Subject: [PATCH] fib: fix AVX512 lookup [ upstream commit 66ed1786ad067198814e9b2ab54f0cad68a58f1e ] Vector lookup uses gather instructions which loads data in 4byte chunks. This could lead to out of bounds access at the end of the tbl24 in case of 1 or 2 byte entries if e.g. lookup is attempted for 255.255.255.255 in IPv4 case. This patch fixes potential out of bound access by gather instruction allocating an extra 4 byte in the end of the tbl24. Fixes: b3509fa3653e ("fib: add AVX512 lookup") Fixes: 1e5630e40d95 ("fib6: add AVX512 lookup") Signed-off-by: Vladimir Medvedkin --- lib/fib/dir24_8.c | 4 ++-- lib/fib/trie.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/fib/dir24_8.c b/lib/fib/dir24_8.c index 49407ba638..ecd24dc258 100644 --- a/lib/fib/dir24_8.c +++ b/lib/fib/dir24_8.c @@ -531,6 +531,6 @@ dir24_8_create(const char *name, int socket_id, struct rte_fib_conf *fib_conf) snprintf(mem_name, sizeof(mem_name), "DP_%s", name); dp = rte_zmalloc_socket(name, sizeof(struct dir24_8_tbl) + - DIR24_8_TBL24_NUM_ENT * (1 << nh_sz), RTE_CACHE_LINE_SIZE, - socket_id); + DIR24_8_TBL24_NUM_ENT * (1 << nh_sz) + sizeof(uint32_t), + RTE_CACHE_LINE_SIZE, socket_id); if (dp == NULL) { rte_errno = ENOMEM; diff --git a/lib/fib/trie.c b/lib/fib/trie.c index e7ea4f2be2..f9f2dda517 100644 --- a/lib/fib/trie.c +++ b/lib/fib/trie.c @@ -653,6 +653,6 @@ trie_create(const char *name, int socket_id, snprintf(mem_name, sizeof(mem_name), "DP_%s", name); dp = rte_zmalloc_socket(name, sizeof(struct rte_trie_tbl) + - TRIE_TBL24_NUM_ENT * (1 << nh_sz), RTE_CACHE_LINE_SIZE, - socket_id); + TRIE_TBL24_NUM_ENT * (1 << nh_sz) + sizeof(uint32_t), + RTE_CACHE_LINE_SIZE, socket_id); if (dp == NULL) { rte_errno = ENOMEM; -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:39.122651295 +0000 +++ 0026-fib-fix-AVX512-lookup.patch 2024-11-27 17:17:38.181269145 +0000 @@ -1 +1 @@ -From 66ed1786ad067198814e9b2ab54f0cad68a58f1e Mon Sep 17 00:00:00 2001 +From e364af95ac7aec6843623702a6c2c4dd46c756cf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 66ed1786ad067198814e9b2ab54f0cad68a58f1e ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index c739e92304..07c324743b 100644 +index 49407ba638..ecd24dc258 100644 @@ -27 +28 @@ -@@ -527,6 +527,6 @@ dir24_8_create(const char *name, int socket_id, struct rte_fib_conf *fib_conf) +@@ -531,6 +531,6 @@ dir24_8_create(const char *name, int socket_id, struct rte_fib_conf *fib_conf) @@ -37 +38 @@ -index 7b33cdaa7b..ca1c2fe3bc 100644 +index e7ea4f2be2..f9f2dda517 100644 @@ -40 +41 @@ -@@ -648,6 +648,6 @@ trie_create(const char *name, int socket_id, +@@ -653,6 +653,6 @@ trie_create(const char *name, int socket_id,