[dpdk-stable] patch 'crypto/ccp: fix queue alignment' has been queued to stable release 19.11.1

luca.boccassi at gmail.com luca.boccassi at gmail.com
Mon Feb 17 18:45:07 CET 2020


Hi,

FYI, your patch has been queued to stable release 19.11.1

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

Thanks.

Luca Boccassi

---
>From b61416ddb28ac9cf91a251b75657e106fedf4cbc Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Fri, 7 Feb 2020 15:06:00 +0100
Subject: [PATCH] crypto/ccp: fix queue alignment

[ upstream commit b3bf2367d0edc11cae26572a7b13133840bf2184 ]

Caught by compiling with -fno-common.
A ____cacheline_aligned symbol can be found in the crypto/ccp driver
object files.

Looking at this driver source, the ____cacheline_aligned (kernel?)
alignment macro is undefined.
The compiler treats this as a symbol definition and generates a global
symbol.

Fixes: ef4b04f87fa6 ("crypto/ccp: support device init")

Signed-off-by: David Marchand <david.marchand at redhat.com>
---
 drivers/crypto/ccp/ccp_dev.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/ccp/ccp_dev.h b/drivers/crypto/ccp/ccp_dev.h
index f4ad9eafd5..37e04218ce 100644
--- a/drivers/crypto/ccp/ccp_dev.h
+++ b/drivers/crypto/ccp/ccp_dev.h
@@ -220,7 +220,7 @@ struct ccp_queue {
 	/**< lsb assigned for sha ctx */
 	uint32_t sb_hmac;
 	/**< lsb assigned for hmac ctx */
-} ____cacheline_aligned;
+} __rte_cache_aligned;
 
 /**
  * A structure describing a CCP device.
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-17 17:00:15.750834790 +0000
+++ 0015-crypto-ccp-fix-queue-alignment.patch	2020-02-17 17:00:15.283950115 +0000
@@ -1,8 +1,10 @@
-From b3bf2367d0edc11cae26572a7b13133840bf2184 Mon Sep 17 00:00:00 2001
+From b61416ddb28ac9cf91a251b75657e106fedf4cbc Mon Sep 17 00:00:00 2001
 From: David Marchand <david.marchand at redhat.com>
 Date: Fri, 7 Feb 2020 15:06:00 +0100
 Subject: [PATCH] crypto/ccp: fix queue alignment
 
+[ upstream commit b3bf2367d0edc11cae26572a7b13133840bf2184 ]
+
 Caught by compiling with -fno-common.
 A ____cacheline_aligned symbol can be found in the crypto/ccp driver
 object files.
@@ -13,7 +15,6 @@
 symbol.
 
 Fixes: ef4b04f87fa6 ("crypto/ccp: support device init")
-Cc: stable at dpdk.org
 
 Signed-off-by: David Marchand <david.marchand at redhat.com>
 ---


More information about the stable mailing list