Move location of __rte_aligned(a) to new conventional location. The new
placement between {struct,union} and the tag allows the desired
alignment to be imparted on the type regardless of the toolchain being
used for both C and C++. Additionally, it avoids confusion by Doxygen
when generating documentation.
Signed-off-by: Tyler Retzlaff <roret...@linux.microsoft.com>
---
drivers/crypto/qat/qat_asym.h | 15 +++++++--------
drivers/crypto/qat/qat_sym.h | 8 ++++----
drivers/crypto/qat/qat_sym_session.h | 10 +++++-----
3 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/drivers/crypto/qat/qat_asym.h b/drivers/crypto/qat/qat_asym.h
index 6628656..00275fa 100644
--- a/drivers/crypto/qat/qat_asym.h
+++ b/drivers/crypto/qat/qat_asym.h
@@ -18,7 +18,6 @@
typedef uint64_t large_int_ptr;
#define MAX_PKE_PARAMS 8
#define QAT_PKE_MAX_LN_SIZE 512
-#define _PKE_ALIGN_ __rte_aligned(8)
#define QAT_ASYM_MAX_PARAMS 8
#define QAT_ASYM_MODINV_NUM_IN_PARAMS 2
@@ -57,20 +56,20 @@
} \
}
-struct qat_asym_op_cookie {
+struct __rte_aligned(8) qat_asym_op_cookie {
uint64_t error;
uint32_t alg_bytesize; /*< Bytesize of algorithm */
uint32_t qat_func_alignsize; /*< Aligned bytesize of qat function */
rte_iova_t input_addr;
rte_iova_t output_addr;
- large_int_ptr input_params_ptrs[MAX_PKE_PARAMS] _PKE_ALIGN_;
- large_int_ptr output_params_ptrs[MAX_PKE_PARAMS] _PKE_ALIGN_;
- union {
+ alignas(8) large_int_ptr input_params_ptrs[MAX_PKE_PARAMS];
+ alignas(8) large_int_ptr output_params_ptrs[MAX_PKE_PARAMS];
+ union __rte_aligned(8) {
uint8_t input_array[MAX_PKE_PARAMS][QAT_PKE_MAX_LN_SIZE];
uint8_t input_buffer[MAX_PKE_PARAMS * QAT_PKE_MAX_LN_SIZE];
- } _PKE_ALIGN_;
- uint8_t output_array[MAX_PKE_PARAMS][QAT_PKE_MAX_LN_SIZE] _PKE_ALIGN_;
-} _PKE_ALIGN_;
+ };
+ alignas(8) uint8_t output_array[MAX_PKE_PARAMS][QAT_PKE_MAX_LN_SIZE];
+};
struct qat_asym_session {
struct icp_qat_fw_pke_request req_tmpl;
diff --git a/drivers/crypto/qat/qat_sym.h b/drivers/crypto/qat/qat_sym.h
index 6616064..eedf5de 100644
--- a/drivers/crypto/qat/qat_sym.h
+++ b/drivers/crypto/qat/qat_sym.h
@@ -103,10 +103,10 @@
struct qat_sym_session;
-struct qat_sym_sgl {
+struct __rte_cache_aligned qat_sym_sgl {
qat_sgl_hdr;
struct qat_flat_buf buffers[QAT_SYM_SGL_MAX_NUMBER];
-} __rte_packed __rte_cache_aligned;
+} __rte_packed;
struct qat_sym_op_cookie {
struct qat_sym_sgl qat_sgl_src;
@@ -116,8 +116,8 @@ struct qat_sym_op_cookie {
union {
/* Used for Single-Pass AES-GMAC only */
struct {
- struct icp_qat_hw_cipher_algo_blk cd_cipher
- __rte_packed __rte_cache_aligned;
+ alignas(RTE_CACHE_LINE_SIZE) struct
icp_qat_hw_cipher_algo_blk cd_cipher
+ __rte_packed;
phys_addr_t cd_phys_addr;
} spc_gmac;
} opt;
diff --git a/drivers/crypto/qat/qat_sym_session.h
b/drivers/crypto/qat/qat_sym_session.h
index c41f8cc..f263477 100644
--- a/drivers/crypto/qat/qat_sym_session.h
+++ b/drivers/crypto/qat/qat_sym_session.h
@@ -92,7 +92,7 @@ typedef int (*qat_sym_build_request_t)(void *in_op, struct
qat_sym_session *ctx,
uint8_t *out_msg, void *op_cookie);
/* Common content descriptor */
-struct qat_sym_cd {
+struct __rte_cache_aligned qat_sym_cd {
struct icp_qat_hw_cipher_algo_blk cipher;
union {
struct icp_qat_hw_auth_algo_blk hash;
@@ -100,7 +100,7 @@ struct qat_sym_cd {
struct icp_qat_hw_gen3_crc_cd crc_gen3;
struct icp_qat_hw_gen4_crc_cd crc_gen4;
};
-} __rte_packed __rte_cache_aligned;
+} __rte_packed;
struct qat_sym_session {
enum icp_qat_fw_la_cmd_id qat_cmd;
@@ -115,7 +115,7 @@ struct qat_sym_session {
struct qat_sym_cd cd;
uint8_t key_array[32];
};
- uint8_t prefix_state[QAT_PREFIX_TBL_SIZE] __rte_cache_aligned;
+ alignas(RTE_CACHE_LINE_SIZE) uint8_t prefix_state[QAT_PREFIX_TBL_SIZE];
uint8_t *cd_cur_ptr;
union {
phys_addr_t cd_paddr;
@@ -153,8 +153,8 @@ struct qat_sym_session {
qat_sym_build_request_t build_request[2];
#ifndef RTE_QAT_OPENSSL
IMB_MGR *mb_mgr;
- uint64_t expkey[4*15] __rte_aligned(16);
- uint32_t dust[4*15] __rte_aligned(16);
+ alignas(16) uint64_t expkey[4 * 15];
+ alignas(16) uint32_t dust[4 * 15];
uint8_t docsis_key_len;
#endif
};
--
1.8.3.1
