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 BCDBF46BAE for ; Fri, 18 Jul 2025 21:33:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B741240611; Fri, 18 Jul 2025 21:33:18 +0200 (CEST) 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 9C91E40E2E for ; Fri, 18 Jul 2025 21:33:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867196; 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=iGPIo4fsNYK4wyKQU61V7w8h+tfHM3Cxe167d3Iivmc=; b=QNfoBsnB6pv0ImNIxuCp5VL+qtA/Ccm6SGuGlnSfB7IxM4LlfhwY7T53CZmLzkvLaftbh2 46l8Fgn3urKeMeSzaP0PYv5IMWc0QyQdNy5RLwF3C62nDVe/s/uAIW24C651/N7yhgIf9U 4CrnzexPU1xovi/prk8W2Io0koR4dKo= Received: from mx-prod-mc-04.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-310-UaxlBBjBN_CAFFIycU88-A-1; Fri, 18 Jul 2025 15:33:09 -0400 X-MC-Unique: UaxlBBjBN_CAFFIycU88-A-1 X-Mimecast-MFC-AGG-ID: UaxlBBjBN_CAFFIycU88-A_1752867188 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 902C819560AD; Fri, 18 Jul 2025 19:33:08 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9E6C918003FC; Fri, 18 Jul 2025 19:33:06 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Konstantin Ananyev , Bruce Richardson , dpdk stable Subject: patch 'acl: fix build with GCC 15 on aarch64' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:29:00 +0100 Message-ID: <20250718193247.1008129-6-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: uGoY1znvmt_wZmjh68_TqejfQjbh3IhQisCYBFi7X8c_1752867188 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 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 24.11.3 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/23/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/29e6a709e2a2a9b7291c51fc44073c80d7389264 Thanks. Kevin --- >From 29e6a709e2a2a9b7291c51fc44073c80d7389264 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 26 Mar 2025 11:29:02 +0100 Subject: [PATCH] acl: fix build with GCC 15 on aarch64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 6cde8a3dda49ad2721ac15faedf1965cdb4980b0 ] Caught in OBS for Fedora Rawhide on aarch64: [ 198s] In file included from ../lib/acl/acl_run_neon.h:7, [ 198s] from ../lib/acl/acl_run_neon.c:5: [ 198s] In function ‘alloc_completion’, [ 198s] inlined from ‘acl_start_next_trie’ at ../lib/acl/acl_run.h:140:24, [ 198s] inlined from ‘search_neon_4.isra’ at ../lib/acl/acl_run_neon.h:239:20: [ 198s] ../lib/acl/acl_run.h:93:25: error: ‘cmplt’ may be used uninitialized [-Werror=maybe-uninitialized] [ 198s] 93 | if (p[n].count == 0) { [ 198s] | ~~~~^~~~~~ [ 198s] ../lib/acl/acl_run_neon.h: In function ‘search_neon_4.isra’: [ 198s] ../lib/acl/acl_run_neon.h:230:27: note: ‘cmplt’ declared here [ 198s] 230 | struct completion cmplt[4]; [ 198s] | ^~~~~ The code was resetting sequentially cmpl[].count at the exact index that later call to alloc_completion uses. While this code seems correct, GCC 15 does not understand this (probably when applying some optimisations). Instead, reset cmpl[].count all at once in acl_set_flow, and cleanup the various vectorized implementations accordingly. Bugzilla ID: 1678 Signed-off-by: David Marchand Acked-by: Konstantin Ananyev Tested-by: Konstantin Ananyev Acked-by: Bruce Richardson --- lib/acl/acl_run.h | 5 +++++ lib/acl/acl_run_altivec.h | 8 ++------ lib/acl/acl_run_avx2.h | 4 +--- lib/acl/acl_run_neon.h | 8 ++------ lib/acl/acl_run_scalar.c | 4 +--- lib/acl/acl_run_sse.h | 8 ++------ 6 files changed, 13 insertions(+), 24 deletions(-) diff --git a/lib/acl/acl_run.h b/lib/acl/acl_run.h index 7f092413cd..9fd3e60021 100644 --- a/lib/acl/acl_run.h +++ b/lib/acl/acl_run.h @@ -177,4 +177,6 @@ acl_set_flow(struct acl_flow_data *flows, struct completion *cmplt, uint32_t data_num, uint32_t categories, const uint64_t *trans) { + unsigned int i; + flows->num_packets = 0; flows->started = 0; @@ -188,4 +190,7 @@ acl_set_flow(struct acl_flow_data *flows, struct completion *cmplt, flows->results = results; flows->trans = trans; + + for (i = 0; i < cmplt_size; i++) + cmplt[i].count = 0; } diff --git a/lib/acl/acl_run_altivec.h b/lib/acl/acl_run_altivec.h index 2d398ffded..d5ccdb94f0 100644 --- a/lib/acl/acl_run_altivec.h +++ b/lib/acl/acl_run_altivec.h @@ -200,8 +200,6 @@ search_altivec_8(const struct rte_acl_ctx *ctx, const uint8_t **data, total_packets, categories, ctx->trans_table); - for (n = 0; n < MAX_SEARCHES_ALTIVEC8; n++) { - cmplt[n].count = 0; + for (n = 0; n < MAX_SEARCHES_ALTIVEC8; n++) index_array[n] = acl_start_next_trie(&flows, parms, n, ctx); - } /* Check for any matches. */ @@ -271,8 +269,6 @@ search_altivec_4(const struct rte_acl_ctx *ctx, const uint8_t **data, total_packets, categories, ctx->trans_table); - for (n = 0; n < MAX_SEARCHES_ALTIVEC4; n++) { - cmplt[n].count = 0; + for (n = 0; n < MAX_SEARCHES_ALTIVEC4; n++) index_array[n] = acl_start_next_trie(&flows, parms, n, ctx); - } /* Check for any matches. */ diff --git a/lib/acl/acl_run_avx2.h b/lib/acl/acl_run_avx2.h index 0b8967f22e..e069fb85b2 100644 --- a/lib/acl/acl_run_avx2.h +++ b/lib/acl/acl_run_avx2.h @@ -172,8 +172,6 @@ search_avx2x16(const struct rte_acl_ctx *ctx, const uint8_t **data, total_packets, categories, ctx->trans_table); - for (n = 0; n < RTE_DIM(cmplt); n++) { - cmplt[n].count = 0; + for (n = 0; n < RTE_DIM(cmplt); n++) index_array[n] = acl_start_next_trie(&flows, parms, n, ctx); - } t0 = _mm256_set_epi64x(index_array[5], index_array[4], diff --git a/lib/acl/acl_run_neon.h b/lib/acl/acl_run_neon.h index 63074f871d..3b9bd0cc39 100644 --- a/lib/acl/acl_run_neon.h +++ b/lib/acl/acl_run_neon.h @@ -173,8 +173,6 @@ search_neon_8(const struct rte_acl_ctx *ctx, const uint8_t **data, total_packets, categories, ctx->trans_table); - for (n = 0; n < 8; n++) { - cmplt[n].count = 0; + for (n = 0; n < 8; n++) index_array[n] = acl_start_next_trie(&flows, parms, n, ctx); - } /* Check for any matches. */ @@ -235,8 +233,6 @@ search_neon_4(const struct rte_acl_ctx *ctx, const uint8_t **data, total_packets, categories, ctx->trans_table); - for (n = 0; n < 4; n++) { - cmplt[n].count = 0; + for (n = 0; n < 4; n++) index_array[n] = acl_start_next_trie(&flows, parms, n, ctx); - } /* Check for any matches. */ diff --git a/lib/acl/acl_run_scalar.c b/lib/acl/acl_run_scalar.c index 3d61e79409..a3661b1b6b 100644 --- a/lib/acl/acl_run_scalar.c +++ b/lib/acl/acl_run_scalar.c @@ -122,8 +122,6 @@ rte_acl_classify_scalar(const struct rte_acl_ctx *ctx, const uint8_t **data, categories, ctx->trans_table); - for (n = 0; n < MAX_SEARCHES_SCALAR; n++) { - cmplt[n].count = 0; + for (n = 0; n < MAX_SEARCHES_SCALAR; n++) index_array[n] = acl_start_next_trie(&flows, parms, n, ctx); - } transition0 = index_array[0]; diff --git a/lib/acl/acl_run_sse.h b/lib/acl/acl_run_sse.h index 93286a2c38..4ec819a215 100644 --- a/lib/acl/acl_run_sse.h +++ b/lib/acl/acl_run_sse.h @@ -206,8 +206,6 @@ search_sse_8(const struct rte_acl_ctx *ctx, const uint8_t **data, total_packets, categories, ctx->trans_table); - for (n = 0; n < MAX_SEARCHES_SSE8; n++) { - cmplt[n].count = 0; + for (n = 0; n < MAX_SEARCHES_SSE8; n++) index_array[n] = acl_start_next_trie(&flows, parms, n, ctx); - } /* @@ -294,8 +292,6 @@ search_sse_4(const struct rte_acl_ctx *ctx, const uint8_t **data, total_packets, categories, ctx->trans_table); - for (n = 0; n < MAX_SEARCHES_SSE4; n++) { - cmplt[n].count = 0; + for (n = 0; n < MAX_SEARCHES_SSE4; n++) index_array[n] = acl_start_next_trie(&flows, parms, n, ctx); - } indices1 = _mm_loadu_si128((xmm_t *) &index_array[0]); -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:11.381313678 +0100 +++ 0006-acl-fix-build-with-GCC-15-on-aarch64.patch 2025-07-18 20:29:10.806906951 +0100 @@ -1 +1 @@ -From 6cde8a3dda49ad2721ac15faedf1965cdb4980b0 Mon Sep 17 00:00:00 2001 +From 29e6a709e2a2a9b7291c51fc44073c80d7389264 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 6cde8a3dda49ad2721ac15faedf1965cdb4980b0 ] + @@ -36 +37,0 @@ -Cc: stable@dpdk.org @@ -133 +134 @@ -index 8ffb40776c..32ebe3119b 100644 +index 3d61e79409..a3661b1b6b 100644 @@ -136 +137 @@ -@@ -125,8 +125,6 @@ rte_acl_classify_scalar(const struct rte_acl_ctx *ctx, const uint8_t **data, +@@ -122,8 +122,6 @@ rte_acl_classify_scalar(const struct rte_acl_ctx *ctx, const uint8_t **data,