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 109E8A0C45 for ; Thu, 10 Jun 2021 14:07:46 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0B74E4067C; Thu, 10 Jun 2021 14:07:46 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id E27DE4003C for ; Thu, 10 Jun 2021 14:07:44 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lrJTM-00008r-N7; Thu, 10 Jun 2021 12:07:44 +0000 From: Christian Ehrhardt To: Ferruh Yigit Cc: Haiyue Wang , dpdk stable Date: Thu, 10 Jun 2021 14:06:14 +0200 Message-Id: <20210610120641.885862-26-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210610120641.885862-1-christian.ehrhardt@canonical.com> References: <20210610120641.885862-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice/base: fix build with GCC 11' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 06/12/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/cabcb9e71d494409a09e50b2fedef10741c94c3c Thanks. Christian Ehrhardt --- >From cabcb9e71d494409a09e50b2fedef10741c94c3c Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Tue, 11 May 2021 14:14:34 +0100 Subject: [PATCH] net/ice/base: fix build with GCC 11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 97de3819ed93f4b3a71e429147a7e6a435789ab2 ] Reproduced with '--buildtype=debugoptimized' config, compiler version: gcc (GCC) 12.0.0 20210509 (experimental) There are multiple build errors, like: ../drivers/net/ice/base/ice_switch.c: In function ‘ice_add_marker_act’: ../drivers/net/ice/base/ice_switch.c:3727:15: warning: array subscript ‘struct ice_aqc_sw_rules_elem[0]’ is partly outside array bounds of ‘unsigned char[52]’ [-Warray-bounds] 3727 | lg_act->type = CPU_TO_LE16(ICE_AQC_SW_RULES_T_LG_ACT); | ^~ In file included from ../drivers/net/ice/base/ice_type.h:52, from ../drivers/net/ice/base/ice_common.h:8, from ../drivers/net/ice/base/ice_switch.h:8, from ../drivers/net/ice/base/ice_switch.c:5: ../drivers/net/ice/base/ice_osdep.h:209:29: note: referencing an object of size 52 allocated by ‘rte_zmalloc’ 209 | #define ice_malloc(h, s) rte_zmalloc(NULL, s, 0) | ^~~~~~~~~~~~~~~~~~~~~~~ ../drivers/net/ice/base/ice_switch.c:3720:50: note: in expansion of macro ‘ice_malloc’ lg_act = (struct ice_aqc_sw_rules_elem *)ice_malloc(hw, rules_size); These errors are mainly because allocated memory is cast to "struct ice_aqc_sw_rules_elem *" but allocated size is less than the size of "struct ice_aqc_sw_rules_elem". "struct ice_aqc_sw_rules_elem" has multiple other structs has unions, based on which one is used allocated memory being less than the size of "struct ice_aqc_sw_rules_elem" is logically correct but compiler is complaining about it. Since the allocation is done explicitly and both producer and consumer are internal, safe to ignore the warnings. Also to prevent any side affect disabling the compiler warning for now, until proper fix done. Reducing the warning disable to gcc >= 11 version. Bugzilla ID: 678 Fixes: c7dd15931183 ("net/ice/base: add virtual switch code") Fixes: 02acdce2f553 ("net/ice/base: add MAC filter with marker and counter") Fixes: f89aa3affa9e ("net/ice/base: support removing advanced rule") Signed-off-by: Ferruh Yigit Acked-by: Haiyue Wang --- drivers/net/ice/base/meson.build | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ice/base/meson.build b/drivers/net/ice/base/meson.build index 46c4ffb500..26c0f2ef62 100644 --- a/drivers/net/ice/base/meson.build +++ b/drivers/net/ice/base/meson.build @@ -18,6 +18,12 @@ error_cflags = ['-Wno-unused-value', '-Wno-unused-variable', '-Wno-unused-parameter', ] + +# Bugzilla ID: 678 +if (toolchain == 'gcc' and cc.version().version_compare('>=11.0.0')) + error_cflags += ['-Wno-array-bounds'] +endif + c_args = cflags foreach flag: error_cflags -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-10 14:04:59.312627544 +0200 +++ 0026-net-ice-base-fix-build-with-GCC-11.patch 2021-06-10 14:04:58.054024554 +0200 @@ -1 +1 @@ -From 97de3819ed93f4b3a71e429147a7e6a435789ab2 Mon Sep 17 00:00:00 2001 +From cabcb9e71d494409a09e50b2fedef10741c94c3c Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 97de3819ed93f4b3a71e429147a7e6a435789ab2 ] + @@ -51 +52,0 @@ -Cc: stable@dpdk.org @@ -56,2 +57,2 @@ - drivers/net/ice/base/meson.build | 5 +++++ - 1 file changed, 5 insertions(+) + drivers/net/ice/base/meson.build | 6 ++++++ + 1 file changed, 6 insertions(+) @@ -60 +61 @@ -index 6c548a9977..3305e5dd18 100644 +index 46c4ffb500..26c0f2ef62 100644 @@ -63,2 +64,3 @@ -@@ -23,6 +23,11 @@ error_cflags = [ - '-Wno-unused-parameter', +@@ -18,6 +18,12 @@ error_cflags = ['-Wno-unused-value', + '-Wno-unused-variable', + '-Wno-unused-parameter', @@ -66 +68 @@ - ++ @@ -72,3 +74,3 @@ - if is_windows and cc.get_id() != 'clang' - cflags += ['-fno-asynchronous-unwind-tables'] - endif + c_args = cflags + + foreach flag: error_cflags