[dpdk-stable] patch 'examples/ipsec-secgw: move global array from header' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/eb0d669844b89a68f81af34c1f04def4f2e210d0

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From eb0d669844b89a68f81af34c1f04def4f2e210d0 Mon Sep 17 00:00:00 2001
From: Radu Nicolau <radu.nicolau at intel.com>
Date: Wed, 3 Nov 2021 11:56:18 +0000
Subject: [PATCH] examples/ipsec-secgw: move global array from header
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 6f1d5c0b8e535822f44175fd548eadb1c08f8fa7 ]

When STATS_INTERVAL is set to a non-zero value the
core_statistics array will be defined in multiple
compilation units and this can trigger a linker error
on particular environments. In order to fix this the
core_statistics definition was moved out of the header file.

Fixes: 1329602b6c8f ("examples/ipsec-secgw: add per-core packet statistics")

Signed-off-by: Radu Nicolau <radu.nicolau at intel.com>
Acked-by: Akhil Goyal <gakhil at marvell.com>
---
 examples/ipsec-secgw/ipsec-secgw.c | 2 ++
 examples/ipsec-secgw/ipsec-secgw.h | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c
index 1efcb5e635..4cd3ecb99d 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -292,6 +292,8 @@ adjust_ipv6_pktlen(struct rte_mbuf *m, const struct rte_ipv6_hdr *iph,
 
 #if (STATS_INTERVAL > 0)
 
+struct ipsec_core_statistics core_statistics[RTE_MAX_LCORE];
+
 /* Print out statistics on packet distribution */
 static void
 print_stats_cb(__rte_unused void *param)
diff --git a/examples/ipsec-secgw/ipsec-secgw.h b/examples/ipsec-secgw/ipsec-secgw.h
index f2281e73cf..7e094ed495 100644
--- a/examples/ipsec-secgw/ipsec-secgw.h
+++ b/examples/ipsec-secgw/ipsec-secgw.h
@@ -90,7 +90,7 @@ struct ipsec_core_statistics {
 	uint64_t burst_rx;
 } __rte_cache_aligned;
 
-struct ipsec_core_statistics core_statistics[RTE_MAX_LCORE];
+extern struct ipsec_core_statistics core_statistics[RTE_MAX_LCORE];
 #endif /* STATS_INTERVAL */
 
 extern struct ethaddr_info ethaddr_tbl[RTE_MAX_ETHPORTS];
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:12.166802192 +0800
+++ 0233-examples-ipsec-secgw-move-global-array-from-header.patch	2021-11-10 14:17:02.064077842 +0800
@@ -1 +1 @@
-From 6f1d5c0b8e535822f44175fd548eadb1c08f8fa7 Mon Sep 17 00:00:00 2001
+From eb0d669844b89a68f81af34c1f04def4f2e210d0 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 6f1d5c0b8e535822f44175fd548eadb1c08f8fa7 ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +25 @@
-index 5fcf424efe..ea8e3bcb87 100644
+index 1efcb5e635..4cd3ecb99d 100644
@@ -26 +28 @@
-@@ -291,6 +291,8 @@ adjust_ipv6_pktlen(struct rte_mbuf *m, const struct rte_ipv6_hdr *iph,
+@@ -292,6 +292,8 @@ adjust_ipv6_pktlen(struct rte_mbuf *m, const struct rte_ipv6_hdr *iph,
@@ -36 +38 @@
-index 96e22de45e..f9be303c28 100644
+index f2281e73cf..7e094ed495 100644
@@ -39 +41 @@
-@@ -93,7 +93,7 @@ struct ipsec_core_statistics {
+@@ -90,7 +90,7 @@ struct ipsec_core_statistics {