[dpdk-stable] patch 'net/ice/base: fix build with GCC 11' has been queued to stable release 19.11.9

[Christian Ehrhardt <christian.ehrhardt@canonical.com>]

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 <christian.ehrhardt@canonical.com>

---
From cabcb9e71d494409a09e50b2fedef10741c94c3c Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
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 <ferruh.yigit@intel.com>
Acked-by: Haiyue Wang <haiyue.wang@intel.com>
---
 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