From patchwork Mon Apr 15 20:04:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 139335 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 89D6343E7E; Mon, 15 Apr 2024 22:09:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 606A442D7D; Mon, 15 Apr 2024 22:05:44 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 52C0A40A6E for ; Mon, 15 Apr 2024 22:04:58 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 591C020FD4B8; Mon, 15 Apr 2024 13:04:47 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 591C020FD4B8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1713211489; bh=3ubQql/A8/cYVJtLt6yPQhLcyPhi+5BR//Eh8XYCQ+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oLREP0+FUkRb5GTj/byuji45p+Y3a9TWpDKDfJwm3SK9zpZpKyQXv25MEg9lG/oqd mL8hJZW3ItSx9GrYHDf3rzRaKIubGjVDbGxuY+o6dNF/cxxjNZYo7LQZcYi8S98OHe k1uh64heizqjk9UKfoHnebViTe/MloUX31PxEq6A= From: Tyler Retzlaff To: dev@dpdk.org Cc: =?utf-8?q?Mattias_R=C3=B6nnblom?= , "Min Hu (Connor)" , =?utf-8?q?Morten_Br=C3=B8rup?= , Abdullah Sevincer , Ajit Khaparde , Akhil Goyal , Alok Prasad , Amit Bernstein , Anatoly Burakov , Andrew Boyer , Andrew Rybchenko , Ankur Dwivedi , Anoob Joseph , Ashish Gupta , Ashwin Sekhar T K , Bruce Richardson , Byron Marohn , Chaoyong He , Chas Williams , Chenbo Xia , Chengwen Feng , Conor Walsh , Cristian Dumitrescu , Dariusz Sosnowski , David Hunt , Devendra Singh Rawat , Ed Czeck , Evgeny Schemeilin , Fan Zhang , Gagandeep Singh , Guoyang Zhou , Harman Kalra , Harry van Haaren , Hemant Agrawal , Honnappa Nagarahalli , Hyong Youb Kim , Jakub Grajciar , Jerin Jacob , Jian Wang , Jiawen Wu , Jie Hai , Jingjing Wu , John Daley , John Miller , Joyce Kong , Kai Ji , Kevin Laatz , Kiran Kumar K , Konstantin Ananyev , Lee Daly , Liang Ma , Liron Himi , Long Li , Maciej Czekaj , Matan Azrad , Matt Peters , Maxime Coquelin , Michael Shamis , Nagadheeraj Rottela , Nicolas Chautru , Nithin Dabilpuram , Ori Kam , Pablo de Lara , Pavan Nikhilesh , Peter Mccarthy , Radu Nicolau , Rahul Lakkireddy , Rakesh Kudurumalla , Raveendra Padasalagi , Reshma Pattan , Ron Beider , Ruifeng Wang , Sachin Saxena , Selwin Sebastian , Shai Brandes , Shepard Siegel , Shijith Thotton , Sivaprasad Tummala , Somnath Kotur , Srikanth Yalavarthi , Stephen Hemminger , Steven Webster , Suanming Mou , Sunil Kumar Kori , Sunil Uttarwar , Sunila Sahu , Tejasree Kondoj , Viacheslav Ovsiienko , Vikas Gupta , Volodymyr Fialko , Wajeeh Atrash , Wisam Jaddo , Xiaoyun Wang , Yipeng Wang , Yisen Zhuang , Yuying Zhang , Zhangfei Gao , Zhirun Yan , Ziyang Xuan , Tyler Retzlaff Subject: [PATCH v2 59/83] crypto/cnxk: move alignment attribute on types Date: Mon, 15 Apr 2024 13:04:21 -0700 Message-Id: <1713211485-9021-60-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1713211485-9021-1-git-send-email-roretzla@linux.microsoft.com> References: <1710949096-5786-1-git-send-email-roretzla@linux.microsoft.com> <1713211485-9021-1-git-send-email-roretzla@linux.microsoft.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 Acked-by: Morten Brørup --- drivers/crypto/cnxk/cn10k_cryptodev_sec.h | 4 ++-- drivers/crypto/cnxk/cn10k_ipsec.h | 4 ++-- drivers/crypto/cnxk/cn10k_tls.h | 4 ++-- drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 2 +- drivers/crypto/cnxk/cn9k_ipsec.h | 8 ++++---- drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 4 ++-- drivers/crypto/cnxk/cnxk_se.h | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_sec.h b/drivers/crypto/cnxk/cn10k_cryptodev_sec.h index 878cf78..77faaa0 100644 --- a/drivers/crypto/cnxk/cn10k_cryptodev_sec.h +++ b/drivers/crypto/cnxk/cn10k_cryptodev_sec.h @@ -25,7 +25,7 @@ struct cn10k_tls_opt { uint16_t mac_len : 7; }; -struct cn10k_sec_session { +struct __rte_aligned(ROC_ALIGN) cn10k_sec_session { uint8_t rte_sess[SEC_SESS_SIZE]; /** PMD private space */ @@ -57,7 +57,7 @@ struct cn10k_sec_session { struct cn10k_ipsec_sa sa; struct cn10k_tls_record tls_rec; }; -} __rte_aligned(ROC_ALIGN); +}; static inline uint64_t cpt_inst_w7_get(struct roc_cpt *roc_cpt, void *cptr) diff --git a/drivers/crypto/cnxk/cn10k_ipsec.h b/drivers/crypto/cnxk/cn10k_ipsec.h index 0d1e14a..4e4e68f 100644 --- a/drivers/crypto/cnxk/cn10k_ipsec.h +++ b/drivers/crypto/cnxk/cn10k_ipsec.h @@ -18,14 +18,14 @@ /* Forward declaration */ struct cn10k_sec_session; -struct cn10k_ipsec_sa { +struct __rte_aligned(ROC_ALIGN) cn10k_ipsec_sa { union { /** Inbound SA */ struct roc_ot_ipsec_inb_sa in_sa; /** Outbound SA */ struct roc_ot_ipsec_outb_sa out_sa; }; -} __rte_aligned(ROC_ALIGN); +}; int cn10k_ipsec_session_create(struct cnxk_cpt_vf *vf, struct cnxk_cpt_qp *qp, struct rte_security_ipsec_xform *ipsec_xfrm, diff --git a/drivers/crypto/cnxk/cn10k_tls.h b/drivers/crypto/cnxk/cn10k_tls.h index 9635bdd..c6bd16d 100644 --- a/drivers/crypto/cnxk/cn10k_tls.h +++ b/drivers/crypto/cnxk/cn10k_tls.h @@ -16,14 +16,14 @@ /* Forward declaration */ struct cn10k_sec_session; -struct cn10k_tls_record { +struct __rte_aligned(ROC_ALIGN) cn10k_tls_record { union { /** Read SA */ struct roc_ie_ot_tls_read_sa read_sa; /** Write SA */ struct roc_ie_ot_tls_write_sa write_sa; }; -} __rte_aligned(ROC_ALIGN); +}; int cn10k_tls_record_session_update(struct cnxk_cpt_vf *vf, struct cnxk_cpt_qp *qp, struct cn10k_sec_session *sess, diff --git a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c index 125a464..96a75a7 100644 --- a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c @@ -126,7 +126,7 @@ cn9k_cpt_enqueue_burst(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops) { struct cpt_inflight_req *infl_req_1, *infl_req_2; - struct cpt_inst_s inst[2] __rte_cache_aligned; + alignas(RTE_CACHE_LINE_SIZE) struct cpt_inst_s inst[2]; struct rte_crypto_op *op_1, *op_2; uint16_t nb_allowed, count = 0; struct cnxk_cpt_qp *qp = qptr; diff --git a/drivers/crypto/cnxk/cn9k_ipsec.h b/drivers/crypto/cnxk/cn9k_ipsec.h index d28642e..4e8d815 100644 --- a/drivers/crypto/cnxk/cn9k_ipsec.h +++ b/drivers/crypto/cnxk/cn9k_ipsec.h @@ -11,18 +11,18 @@ #include "cnxk_security.h" #include "cnxk_security_ar.h" -struct cn9k_ipsec_sa { +struct __rte_aligned(8) cn9k_ipsec_sa { union { /** Inbound SA */ struct roc_ie_on_inb_sa in_sa; /** Outbound SA */ struct roc_ie_on_outb_sa out_sa; }; -} __rte_aligned(8); +}; #define SEC_SESS_SIZE sizeof(struct rte_security_session) -struct cn9k_sec_session { +struct __rte_cache_aligned cn9k_sec_session { uint8_t rte_sess[SEC_SESS_SIZE]; /** PMD private space */ @@ -57,7 +57,7 @@ struct cn9k_sec_session { struct cnxk_cpt_qp *qp; struct cn9k_ipsec_sa sa; -} __rte_cache_aligned; +}; void cn9k_sec_ops_override(void); diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h index e7bba25..46efc4a 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h +++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h @@ -42,7 +42,7 @@ struct cpt_qp_meta_info { #define CPT_OP_FLAGS_IPSEC_DIR_INBOUND (1 << 2) #define CPT_OP_FLAGS_IPSEC_INB_REPLAY (1 << 3) -struct cpt_inflight_req { +struct __rte_aligned(ROC_ALIGN) cpt_inflight_req { union cpt_res_s res; union { void *opaque; @@ -59,7 +59,7 @@ struct cpt_inflight_req { uint8_t *rptr; #endif void *qp; -} __rte_aligned(ROC_ALIGN); +}; PLT_STATIC_ASSERT(sizeof(struct cpt_inflight_req) == ROC_CACHE_LINE_SZ); diff --git a/drivers/crypto/cnxk/cnxk_se.h b/drivers/crypto/cnxk/cnxk_se.h index c211884..6374718 100644 --- a/drivers/crypto/cnxk/cnxk_se.h +++ b/drivers/crypto/cnxk/cnxk_se.h @@ -31,7 +31,7 @@ enum cpt_dp_thread_type { #define SYM_SESS_SIZE sizeof(struct rte_cryptodev_sym_session) -struct cnxk_se_sess { +struct __rte_aligned(ROC_ALIGN) cnxk_se_sess { uint8_t rte_sess[SYM_SESS_SIZE]; uint8_t aes_gcm : 1; @@ -67,7 +67,7 @@ struct cnxk_se_sess { struct cnxk_cpt_qp *qp; struct roc_se_ctx roc_se_ctx; struct roc_cpt_lf *lf; -} __rte_aligned(ROC_ALIGN); +}; struct cnxk_sym_dp_ctx { struct cnxk_se_sess *sess;