patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] patch 'mem: mark pages as not accessed when freeing memory' has been queued to LTS release 18.11.9
@ 2020-06-16 13:33 Kevin Traynor
  2020-06-16 13:33 ` [dpdk-stable] patch 'mlx5: fix build with -fno-common' " Kevin Traynor
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Kevin Traynor @ 2020-06-16 13:33 UTC (permalink / raw)
  To: Li Feng; +Cc: Anatoly Burakov, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.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/19/20. 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-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/b3e4d3e81a691271cecf503bef93425c56cd2962

Thanks.

Kevin.

---
From b3e4d3e81a691271cecf503bef93425c56cd2962 Mon Sep 17 00:00:00 2001
From: Li Feng <fengli@smartx.com>
Date: Fri, 24 Apr 2020 18:42:05 +0800
Subject: [PATCH] mem: mark pages as not accessed when freeing memory

[ upstream commit 76e91e3f14fc13f31608167d698682790be45cba ]

Commit 8a4baf06c17a ("mem: mark pages as not accessed when reserving VA")
has mapped the initialized memory with PROT_NONE, and when it's unmapped,
eal_memalloc.c should remmap the anonymous memory with PROT_NONE too.

Fixes: 8a4baf06c17a ("mem: mark pages as not accessed when reserving VA")

Signed-off-by: Li Feng <fengli@smartx.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/linuxapp/eal/eal_memalloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_memalloc.c b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
index bff7dcd58e..518314d89c 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memalloc.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
@@ -807,5 +807,5 @@ free_seg(struct rte_memseg *ms, struct hugepage_info *hi,
 	memset(ms->addr, 0, ms->len);
 
-	if (mmap(ms->addr, ms->len, PROT_READ,
+	if (mmap(ms->addr, ms->len, PROT_NONE,
 			MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0) ==
 				MAP_FAILED) {
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-16 14:31:15.958687275 +0100
+++ 0001-mem-mark-pages-as-not-accessed-when-freeing-memory.patch	2020-06-16 14:31:15.911226718 +0100
@@ -1 +1 @@
-From 76e91e3f14fc13f31608167d698682790be45cba Mon Sep 17 00:00:00 2001
+From b3e4d3e81a691271cecf503bef93425c56cd2962 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 76e91e3f14fc13f31608167d698682790be45cba ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
- lib/librte_eal/linux/eal_memalloc.c | 2 +-
+ lib/librte_eal/linuxapp/eal/eal_memalloc.c | 2 +-
@@ -19,5 +20,5 @@
-diff --git a/lib/librte_eal/linux/eal_memalloc.c b/lib/librte_eal/linux/eal_memalloc.c
-index af6d0d023a..678094acf9 100644
---- a/lib/librte_eal/linux/eal_memalloc.c
-+++ b/lib/librte_eal/linux/eal_memalloc.c
-@@ -681,5 +681,5 @@ free_seg(struct rte_memseg *ms, struct hugepage_info *hi,
+diff --git a/lib/librte_eal/linuxapp/eal/eal_memalloc.c b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
+index bff7dcd58e..518314d89c 100644
+--- a/lib/librte_eal/linuxapp/eal/eal_memalloc.c
++++ b/lib/librte_eal/linuxapp/eal/eal_memalloc.c
+@@ -807,5 +807,5 @@ free_seg(struct rte_memseg *ms, struct hugepage_info *hi,


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [dpdk-stable] patch 'mlx5: fix build with -fno-common' has been queued to LTS release 18.11.9
  2020-06-16 13:33 [dpdk-stable] patch 'mem: mark pages as not accessed when freeing memory' has been queued to LTS release 18.11.9 Kevin Traynor
@ 2020-06-16 13:33 ` Kevin Traynor
  2020-06-16 13:33 ` [dpdk-stable] patch 'crypto/octeontx: fix build with gcc 10' " Kevin Traynor
  2020-06-16 13:33 ` [dpdk-stable] patch 'drivers/crypto: disable gcc 10 fno-common errors' " Kevin Traynor
  2 siblings, 0 replies; 4+ messages in thread
From: Kevin Traynor @ 2020-06-16 13:33 UTC (permalink / raw)
  To: Thomas Monjalon; +Cc: Matan Azrad, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.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/19/20. 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-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/53a68781004e60d73a56856e5b8334b68769c9d8

Thanks.

Kevin.

---
From 53a68781004e60d73a56856e5b8334b68769c9d8 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas@monjalon.net>
Date: Mon, 15 Jun 2020 20:36:15 +0100
Subject: [PATCH] mlx5: fix build with -fno-common

[ upstream commit 2889d38256906a5cbff717e7e524ec645c89c794 ]

The variable storages of the same name are merged together
if compiled with -fcommon. This is the default.
This default behaviour allows to declare a variable in a header file and
share the variable in every .o binaries thanks to merge at link-time.

In the case of dlopen linking of the glue library, the pointer mlx5_glue
is referencing the glue functions struct and is set after calling
dlopen.

If compiling with -fno-common (default in GCC 10), the variable must be
declared as extern to avoid multiple re-definitions.
In case the glue layer is split in glue library, the variable mlx5_glue
needs to have its own storage for the rest of the PMD.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Matan Azrad <matan@mellanox.com>
---
 drivers/net/mlx5/mlx5.c      | 4 ++++
 drivers/net/mlx5/mlx5_glue.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 29370f58f0..649faad319 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -132,4 +132,8 @@ static rte_spinlock_t mlx5_shared_data_lock = RTE_SPINLOCK_INITIALIZER;
 int mlx5_logtype;
 
+#ifdef MLX5_GLUE
+const struct mlx5_glue *mlx5_glue;
+#endif
+
 /**
  * Prepare shared data between primary and secondary process.
diff --git a/drivers/net/mlx5/mlx5_glue.h b/drivers/net/mlx5/mlx5_glue.h
index 2d92ba8bcf..0ed754a070 100644
--- a/drivers/net/mlx5/mlx5_glue.h
+++ b/drivers/net/mlx5/mlx5_glue.h
@@ -167,5 +167,5 @@ struct mlx5_glue {
 };
 
-const struct mlx5_glue *mlx5_glue;
+extern const struct mlx5_glue *mlx5_glue;
 
 #endif /* MLX5_GLUE_H_ */
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-16 14:31:16.011171920 +0100
+++ 0002-mlx5-fix-build-with-fno-common.patch	2020-06-16 14:31:15.914226651 +0100
@@ -1 +1 @@
-From 2889d38256906a5cbff717e7e524ec645c89c794 Mon Sep 17 00:00:00 2001
+From 53a68781004e60d73a56856e5b8334b68769c9d8 Mon Sep 17 00:00:00 2001
@@ -3,2 +3,4 @@
-Date: Wed, 8 Apr 2020 02:08:59 +0200
-Subject: [PATCH] common/mlx5: fix build with -fno-common
+Date: Mon, 15 Jun 2020 20:36:15 +0100
+Subject: [PATCH] mlx5: fix build with -fno-common
+
+[ upstream commit 2889d38256906a5cbff717e7e524ec645c89c794 ]
@@ -20,2 +21,0 @@
-Cc: stable@dpdk.org
-
@@ -25,10 +25,10 @@
- drivers/common/mlx5/mlx5_common.c | 3 +++
- drivers/common/mlx5/mlx5_glue.h   | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c
-index d8c01a5d14..42610459f7 100644
---- a/drivers/common/mlx5/mlx5_common.c
-+++ b/drivers/common/mlx5/mlx5_common.c
-@@ -19,4 +19,7 @@
- int mlx5_common_logtype;
+ drivers/net/mlx5/mlx5.c      | 4 ++++
+ drivers/net/mlx5/mlx5_glue.h | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
+index 29370f58f0..649faad319 100644
+--- a/drivers/net/mlx5/mlx5.c
++++ b/drivers/net/mlx5/mlx5.c
+@@ -132,4 +132,8 @@ static rte_spinlock_t mlx5_shared_data_lock = RTE_SPINLOCK_INITIALIZER;
+ int mlx5_logtype;
@@ -39 +39 @@
- 
++
@@ -41,5 +41,6 @@
-diff --git a/drivers/common/mlx5/mlx5_glue.h b/drivers/common/mlx5/mlx5_glue.h
-index cd1136f382..184c41071e 100644
---- a/drivers/common/mlx5/mlx5_glue.h
-+++ b/drivers/common/mlx5/mlx5_glue.h
-@@ -305,5 +305,5 @@ struct mlx5_glue {
+  * Prepare shared data between primary and secondary process.
+diff --git a/drivers/net/mlx5/mlx5_glue.h b/drivers/net/mlx5/mlx5_glue.h
+index 2d92ba8bcf..0ed754a070 100644
+--- a/drivers/net/mlx5/mlx5_glue.h
++++ b/drivers/net/mlx5/mlx5_glue.h
+@@ -167,5 +167,5 @@ struct mlx5_glue {


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [dpdk-stable] patch 'crypto/octeontx: fix build with gcc 10' has been queued to LTS release 18.11.9
  2020-06-16 13:33 [dpdk-stable] patch 'mem: mark pages as not accessed when freeing memory' has been queued to LTS release 18.11.9 Kevin Traynor
  2020-06-16 13:33 ` [dpdk-stable] patch 'mlx5: fix build with -fno-common' " Kevin Traynor
@ 2020-06-16 13:33 ` Kevin Traynor
  2020-06-16 13:33 ` [dpdk-stable] patch 'drivers/crypto: disable gcc 10 fno-common errors' " Kevin Traynor
  2 siblings, 0 replies; 4+ messages in thread
From: Kevin Traynor @ 2020-06-16 13:33 UTC (permalink / raw)
  To: Timothy Redaelli; +Cc: Anoob Joseph, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.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/19/20. 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-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/bb5bca6083c1f6fe7f2797e5e54dc67c7d2ca61d

Thanks.

Kevin.

---
From bb5bca6083c1f6fe7f2797e5e54dc67c7d2ca61d Mon Sep 17 00:00:00 2001
From: Timothy Redaelli <tredaelli@redhat.com>
Date: Tue, 16 Jun 2020 11:18:40 +0100
Subject: [PATCH] crypto/octeontx: fix build with gcc 10

[ upstream commit 983ab2b5d05c40a7b1a4da2200fd028e99796ee7 ]

GCC 10 defaults to -fno-common, this means a linker error will now be
reported if the same global variable is defined in more than one
compilation unit.

Fixes: 2f8a1b963eb7 ("crypto/octeontx2: add PMD skeleton")

Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
Acked-by: Anoob Joseph <anoobj@marvell.com>
---
 drivers/crypto/octeontx/otx_cryptodev.c | 2 ++
 drivers/crypto/octeontx/otx_cryptodev.h | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/octeontx/otx_cryptodev.c b/drivers/crypto/octeontx/otx_cryptodev.c
index c3076487f7..d48fd1971c 100644
--- a/drivers/crypto/octeontx/otx_cryptodev.c
+++ b/drivers/crypto/octeontx/otx_cryptodev.c
@@ -18,4 +18,6 @@
 static int otx_cryptodev_logtype;
 
+uint8_t otx_cryptodev_driver_id;
+
 static struct rte_pci_id pci_id_cpt_table[] = {
 	{
diff --git a/drivers/crypto/octeontx/otx_cryptodev.h b/drivers/crypto/octeontx/otx_cryptodev.h
index 6c2871d712..0b204320a2 100644
--- a/drivers/crypto/octeontx/otx_cryptodev.h
+++ b/drivers/crypto/octeontx/otx_cryptodev.h
@@ -16,5 +16,5 @@
  * Crypto device driver ID
  */
-uint8_t otx_cryptodev_driver_id;
+extern uint8_t otx_cryptodev_driver_id;
 
 #endif /* _OTX_CRYPTODEV_H_ */
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-16 14:31:16.073361563 +0100
+++ 0003-crypto-octeontx-fix-build-with-gcc-10.patch	2020-06-16 14:31:15.915226629 +0100
@@ -1 +1 @@
-From 983ab2b5d05c40a7b1a4da2200fd028e99796ee7 Mon Sep 17 00:00:00 2001
+From bb5bca6083c1f6fe7f2797e5e54dc67c7d2ca61d Mon Sep 17 00:00:00 2001
@@ -3,2 +3,4 @@
-Date: Wed, 5 Feb 2020 13:50:41 +0100
-Subject: [PATCH] crypto/octeontx2: fix build with gcc 10
+Date: Tue, 16 Jun 2020 11:18:40 +0100
+Subject: [PATCH] crypto/octeontx: fix build with gcc 10
+
+[ upstream commit 983ab2b5d05c40a7b1a4da2200fd028e99796ee7 ]
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -16,4 +17,3 @@
- drivers/crypto/octeontx2/otx2_cryptodev.c     | 2 ++
- drivers/crypto/octeontx2/otx2_cryptodev.h     | 2 +-
- drivers/crypto/octeontx2/otx2_cryptodev_ops.h | 2 +-
- 3 files changed, 4 insertions(+), 2 deletions(-)
+ drivers/crypto/octeontx/otx_cryptodev.c | 2 ++
+ drivers/crypto/octeontx/otx_cryptodev.h | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
@@ -21,6 +21,6 @@
-diff --git a/drivers/crypto/octeontx2/otx2_cryptodev.c b/drivers/crypto/octeontx2/otx2_cryptodev.c
-index 7b8add1bfc..417eda6de6 100644
---- a/drivers/crypto/octeontx2/otx2_cryptodev.c
-+++ b/drivers/crypto/octeontx2/otx2_cryptodev.c
-@@ -25,4 +25,6 @@
- int otx2_cpt_logtype;
+diff --git a/drivers/crypto/octeontx/otx_cryptodev.c b/drivers/crypto/octeontx/otx_cryptodev.c
+index c3076487f7..d48fd1971c 100644
+--- a/drivers/crypto/octeontx/otx_cryptodev.c
++++ b/drivers/crypto/octeontx/otx_cryptodev.c
+@@ -18,4 +18,6 @@
+ static int otx_cryptodev_logtype;
@@ -28 +28 @@
-+uint8_t otx2_cryptodev_driver_id;
++uint8_t otx_cryptodev_driver_id;
@@ -32,5 +32,5 @@
-diff --git a/drivers/crypto/octeontx2/otx2_cryptodev.h b/drivers/crypto/octeontx2/otx2_cryptodev.h
-index 8e0ebc292a..c0aa661b3b 100644
---- a/drivers/crypto/octeontx2/otx2_cryptodev.h
-+++ b/drivers/crypto/octeontx2/otx2_cryptodev.h
-@@ -39,5 +39,5 @@ extern int otx2_cpt_logtype;
+diff --git a/drivers/crypto/octeontx/otx_cryptodev.h b/drivers/crypto/octeontx/otx_cryptodev.h
+index 6c2871d712..0b204320a2 100644
+--- a/drivers/crypto/octeontx/otx_cryptodev.h
++++ b/drivers/crypto/octeontx/otx_cryptodev.h
+@@ -16,5 +16,5 @@
@@ -39,13 +39,2 @@
--uint8_t otx2_cryptodev_driver_id;
-+extern uint8_t otx2_cryptodev_driver_id;
- 
- #endif /* _OTX2_CRYPTODEV_H_ */
-diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.h b/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
-index a2724f7227..f83e36b486 100644
---- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
-+++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
-@@ -17,5 +17,5 @@ enum otx2_cpt_egrp {
- };
- 
--struct rte_cryptodev_ops otx2_cpt_ops;
-+extern struct rte_cryptodev_ops otx2_cpt_ops;
+-uint8_t otx_cryptodev_driver_id;
++extern uint8_t otx_cryptodev_driver_id;
@@ -53 +42 @@
- #endif /* _OTX2_CRYPTODEV_OPS_H_ */
+ #endif /* _OTX_CRYPTODEV_H_ */


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [dpdk-stable] patch 'drivers/crypto: disable gcc 10 fno-common errors' has been queued to LTS release 18.11.9
  2020-06-16 13:33 [dpdk-stable] patch 'mem: mark pages as not accessed when freeing memory' has been queued to LTS release 18.11.9 Kevin Traynor
  2020-06-16 13:33 ` [dpdk-stable] patch 'mlx5: fix build with -fno-common' " Kevin Traynor
  2020-06-16 13:33 ` [dpdk-stable] patch 'crypto/octeontx: fix build with gcc 10' " Kevin Traynor
@ 2020-06-16 13:33 ` Kevin Traynor
  2 siblings, 0 replies; 4+ messages in thread
From: Kevin Traynor @ 2020-06-16 13:33 UTC (permalink / raw)
  To: Kevin Traynor; +Cc: Akhil Goyal, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.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/19/20. 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-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/500e41cae5ce1e7c456101aa5848c769450e6d09

Thanks.

Kevin.

---
From 500e41cae5ce1e7c456101aa5848c769450e6d09 Mon Sep 17 00:00:00 2001
From: Kevin Traynor <ktraynor@redhat.com>
Date: Fri, 8 May 2020 17:27:55 +0100
Subject: [PATCH] drivers/crypto: disable gcc 10 fno-common errors

[ upstream commit 50b03f3b8eaf725c9e9b35f614c4a33f9623e29a ]

gcc 10 defaults to -fno-common and as a result when linking
with crypto drivers:

drivers/librte_pmd_dpaa_sec.a(crypto_dpaa_sec_dpaa_sec.c.o):
(.bss+0x4): multiple definition of `rta_sec_era';
drivers/librte_pmd_caam_jr.a(crypto_caam_jr_caam_jr.c.o):
(.bss+0x0): first defined here

drivers/librte_pmd_dpaa2_sec.a(crypto_dpaa2_sec_dpaa2_sec_dpseci.c.o):
(.data+0x0): multiple definition of `rta_sec_era';
drivers/librte_pmd_caam_jr.a(crypto_caam_jr_caam_jr.c.o):
(.bss+0x0): first defined here

This is a blunt fix for the issue by enabling fcommon for
dpaa_sec/dpaa2_sec/caam_jr.

Bugzilla ID: 469

Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 drivers/crypto/caam_jr/Makefile      | 7 +++++++
 drivers/crypto/caam_jr/meson.build   | 5 +++++
 drivers/crypto/dpaa2_sec/Makefile    | 7 +++++++
 drivers/crypto/dpaa2_sec/meson.build | 5 +++++
 drivers/crypto/dpaa_sec/Makefile     | 7 +++++++
 drivers/crypto/dpaa_sec/meson.build  | 5 +++++
 6 files changed, 36 insertions(+)

diff --git a/drivers/crypto/caam_jr/Makefile b/drivers/crypto/caam_jr/Makefile
index 88cdf74108..c78901f5bb 100644
--- a/drivers/crypto/caam_jr/Makefile
+++ b/drivers/crypto/caam_jr/Makefile
@@ -17,4 +17,11 @@ CFLAGS += -O3
 CFLAGS += $(WERROR_FLAGS)
 
+# FIXME: temporary solution for Bugzilla 469
+ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
+ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1)
+CFLAGS += -fcommon
+endif
+endif
+
 CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include
 CFLAGS += -I$(RTE_SDK)/drivers/crypto/caam_jr
diff --git a/drivers/crypto/caam_jr/meson.build b/drivers/crypto/caam_jr/meson.build
index 99b71aef15..ead7f42ff3 100644
--- a/drivers/crypto/caam_jr/meson.build
+++ b/drivers/crypto/caam_jr/meson.build
@@ -12,4 +12,9 @@ sources = files('caam_jr_capabilities.c',
 		'caam_jr.c')
 
+# FIXME: temporary solution for Bugzilla 469
+if (toolchain == 'gcc' and cc.version().version_compare('>=10.0.0'))
+	cflags += '-fcommon'
+endif
+
 allow_experimental_apis = true
 
diff --git a/drivers/crypto/dpaa2_sec/Makefile b/drivers/crypto/dpaa2_sec/Makefile
index f537f76a6f..0da83bfc16 100644
--- a/drivers/crypto/dpaa2_sec/Makefile
+++ b/drivers/crypto/dpaa2_sec/Makefile
@@ -21,4 +21,11 @@ endif
 endif
 
+# FIXME: temporary solution for Bugzilla 469
+ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
+ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1)
+CFLAGS += -fcommon
+endif
+endif
+
 CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/
 CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/mc
diff --git a/drivers/crypto/dpaa2_sec/meson.build b/drivers/crypto/dpaa2_sec/meson.build
index 8fa4827edb..b999bbe433 100644
--- a/drivers/crypto/dpaa2_sec/meson.build
+++ b/drivers/crypto/dpaa2_sec/meson.build
@@ -12,4 +12,9 @@ sources = files('dpaa2_sec_dpseci.c',
 		'mc/dpseci.c')
 
+# FIXME: temporary solution for Bugzilla 469
+if (toolchain == 'gcc' and cc.version().version_compare('>=10.0.0'))
+	cflags += '-fcommon'
+endif
+
 allow_experimental_apis = true
 
diff --git a/drivers/crypto/dpaa_sec/Makefile b/drivers/crypto/dpaa_sec/Makefile
index 5ce95c23fd..ed47f92b2b 100644
--- a/drivers/crypto/dpaa_sec/Makefile
+++ b/drivers/crypto/dpaa_sec/Makefile
@@ -15,4 +15,11 @@ CFLAGS += -O3
 CFLAGS += $(WERROR_FLAGS)
 
+# FIXME: temporary solution for Bugzilla 469
+ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
+ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1)
+CFLAGS += -fcommon
+endif
+endif
+
 CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa
 CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include
diff --git a/drivers/crypto/dpaa_sec/meson.build b/drivers/crypto/dpaa_sec/meson.build
index 8a5709846e..e3daddbfd7 100644
--- a/drivers/crypto/dpaa_sec/meson.build
+++ b/drivers/crypto/dpaa_sec/meson.build
@@ -9,4 +9,9 @@ deps += ['bus_dpaa', 'security']
 sources = files('dpaa_sec.c')
 
+# FIXME: temporary solution for Bugzilla 469
+if (toolchain == 'gcc' and cc.version().version_compare('>=10.0.0'))
+	cflags += '-fcommon'
+endif
+
 allow_experimental_apis = true
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-16 14:31:16.124961836 +0100
+++ 0004-drivers-crypto-disable-gcc-10-fno-common-errors.patch	2020-06-16 14:31:15.916226607 +0100
@@ -1 +1 @@
-From 50b03f3b8eaf725c9e9b35f614c4a33f9623e29a Mon Sep 17 00:00:00 2001
+From 500e41cae5ce1e7c456101aa5848c769450e6d09 Mon Sep 17 00:00:00 2001
@@ -4 +4,3 @@
-Subject: [PATCH] drivers/crypto: disable gcc 10 no-common errors
+Subject: [PATCH] drivers/crypto: disable gcc 10 fno-common errors
+
+[ upstream commit 50b03f3b8eaf725c9e9b35f614c4a33f9623e29a ]
@@ -23 +24,0 @@
-Cc: stable@dpdk.org
@@ -37 +38 @@
-index 89d3238172..10848884cb 100644
+index 88cdf74108..c78901f5bb 100644
@@ -40 +41 @@
-@@ -15,4 +15,11 @@ CFLAGS += -O3
+@@ -17,4 +17,11 @@ CFLAGS += -O3
@@ -51 +52 @@
- CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
+ CFLAGS += -I$(RTE_SDK)/drivers/crypto/caam_jr
@@ -53 +54 @@
-index f8b5250a93..551b136322 100644
+index 99b71aef15..ead7f42ff3 100644
@@ -56 +57 @@
-@@ -13,4 +13,9 @@ sources = files('caam_jr_capabilities.c',
+@@ -12,4 +12,9 @@ sources = files('caam_jr_capabilities.c',
@@ -64,2 +65,2 @@
- includes += include_directories('../../bus/dpaa/include/')
- includes += include_directories('../../common/dpaax/')
+ allow_experimental_apis = true
+ 
@@ -67 +68 @@
-index a0a2795575..8ce637db60 100644
+index f537f76a6f..0da83bfc16 100644
@@ -70 +71 @@
-@@ -20,4 +20,11 @@ endif
+@@ -21,4 +21,11 @@ endif
@@ -80,2 +81,2 @@
- CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
- CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib
+ CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/
+ CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/mc
@@ -83 +84 @@
-index cb1c2d0492..505ad94146 100644
+index 8fa4827edb..b999bbe433 100644
@@ -86 +87 @@
-@@ -11,3 +11,8 @@ sources = files('dpaa2_sec_dpseci.c',
+@@ -12,4 +12,9 @@ sources = files('dpaa2_sec_dpseci.c',
@@ -94 +95,2 @@
- includes += include_directories('mc', '../../common/dpaax', '../../common/dpaax/caamflib')
+ allow_experimental_apis = true
+ 
@@ -96 +98 @@
-index ea266962a3..6cf392cb37 100644
+index 5ce95c23fd..ed47f92b2b 100644
@@ -99 +101 @@
-@@ -14,4 +14,11 @@ CFLAGS += -O3
+@@ -15,4 +15,11 @@ CFLAGS += -O3
@@ -112 +114 @@
-index 7d422d8d55..f5e6604575 100644
+index 8a5709846e..e3daddbfd7 100644
@@ -115 +117 @@
-@@ -10,4 +10,9 @@ deps += ['bus_dpaa', 'mempool_dpaa', 'security']
+@@ -9,4 +9,9 @@ deps += ['bus_dpaa', 'security']
@@ -123,2 +125,2 @@
- includes += include_directories('../../bus/dpaa/include')
- includes += include_directories('../../common/dpaax')
+ allow_experimental_apis = true
+ 


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-06-16 13:33 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-16 13:33 [dpdk-stable] patch 'mem: mark pages as not accessed when freeing memory' has been queued to LTS release 18.11.9 Kevin Traynor
2020-06-16 13:33 ` [dpdk-stable] patch 'mlx5: fix build with -fno-common' " Kevin Traynor
2020-06-16 13:33 ` [dpdk-stable] patch 'crypto/octeontx: fix build with gcc 10' " Kevin Traynor
2020-06-16 13:33 ` [dpdk-stable] patch 'drivers/crypto: disable gcc 10 fno-common errors' " Kevin Traynor

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git