From patchwork Mon Apr 15 20:04:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 139342 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 33EB643E7E; Mon, 15 Apr 2024 22:10:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8563E40EDB; Mon, 15 Apr 2024 22:05:54 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 7608540A6E for ; Mon, 15 Apr 2024 22:05:00 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 01A5020FD4D1; Mon, 15 Apr 2024 13:04:47 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 01A5020FD4D1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1713211490; bh=fv515SQjWb1bixztLcCx0ZOBzwCnKHFJWP4b1pz38mY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IENtw3cjdaENHxrfcUeWjliufuUfxyIz801CrpCM4G0fsUqruG5gYcDIKixTeYnaW jKByY2oqjQtfRDGAO/oNDAZRBv30HQ5mLjv/Xkl49IQcI9KMhoCkzhQ5wVrZ3VlW1v UJ0tujUlBYhK/3mUxncSI+6YIYOu8ZjH2BJWn/J8= 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 69/83] common/qat: move alignment attribute on types Date: Mon, 15 Apr 2024 13:04:31 -0700 Message-Id: <1713211485-9021-70-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/common/qat/qat_adf/icp_qat_hw.h | 8 ++++---- drivers/common/qat/qat_common.h | 4 ++-- drivers/common/qat/qat_qp.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/common/qat/qat_adf/icp_qat_hw.h b/drivers/common/qat/qat_adf/icp_qat_hw.h index 21ee3cf..1d61a0b 100644 --- a/drivers/common/qat/qat_adf/icp_qat_hw.h +++ b/drivers/common/qat/qat_adf/icp_qat_hw.h @@ -391,10 +391,10 @@ enum icp_qat_hw_cipher_convert { #define ICP_QAT_HW_CCM_MSG_LEN_MAX_FIELD_SIZE 4 #define ICP_QAT_HW_CCM_NONCE_OFFSET 1 -struct icp_qat_hw_cipher_algo_blk { +struct __rte_cache_aligned icp_qat_hw_cipher_algo_blk { struct icp_qat_hw_cipher_config cipher_config; uint8_t key[ICP_QAT_HW_CIPHER_MAX_KEY_SZ]; -} __rte_cache_aligned; +}; struct icp_qat_hw_gen2_crc_cd { uint32_t flags; @@ -423,10 +423,10 @@ struct icp_qat_hw_ucs_cipher_config { uint32_t reserved[3]; }; -struct icp_qat_hw_cipher_algo_blk20 { +struct __rte_cache_aligned icp_qat_hw_cipher_algo_blk20 { struct icp_qat_hw_ucs_cipher_config cipher_config; uint8_t key[ICP_QAT_HW_CIPHER_MAX_KEY_SZ]; -} __rte_cache_aligned; +}; enum icp_qat_hw_ucs_cipher_reflect_out { ICP_QAT_HW_CIPHER_UCS_REFLECT_OUT_DISABLED = 0, diff --git a/drivers/common/qat/qat_common.h b/drivers/common/qat/qat_common.h index 6d0f4ae..70d78ee 100644 --- a/drivers/common/qat/qat_common.h +++ b/drivers/common/qat/qat_common.h @@ -61,11 +61,11 @@ struct qat_flat_buf { } __extension__ -struct qat_sgl { +struct __rte_cache_aligned qat_sgl { qat_sgl_hdr; /* flexible array of flat buffers*/ struct qat_flat_buf buffers[0]; -} __rte_packed __rte_cache_aligned; +} __rte_packed; /** Common, i.e. not service-specific, statistics */ struct qat_common_stats { diff --git a/drivers/common/qat/qat_qp.h b/drivers/common/qat/qat_qp.h index ae18fb9..94590d3 100644 --- a/drivers/common/qat/qat_qp.h +++ b/drivers/common/qat/qat_qp.h @@ -81,7 +81,7 @@ typedef int (*qat_op_dequeue_t)(void **op, uint8_t *resp, void *op_cookie, #define QAT_BUILD_REQUEST_MAX_OPAQUE_SIZE 2 -struct qat_qp { +struct __rte_cache_aligned qat_qp { void *mmap_bar_addr; struct qat_queue tx_q; struct qat_queue rx_q; @@ -95,10 +95,10 @@ struct qat_qp { struct qat_pci_device *qat_dev; /**< qat device this qp is on */ uint32_t enqueued; - uint32_t dequeued __rte_aligned(4); + alignas(sizeof(uint32_t)) uint32_t dequeued; uint16_t max_inflights; uint16_t min_enq_burst_threshold; -} __rte_cache_aligned; +}; /** * Structure with data needed for creation of queue pair.