From patchwork Wed Mar 20 15:36:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 138497 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 31AEA43D05; Wed, 20 Mar 2024 16:39:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3010942D0C; Wed, 20 Mar 2024 16:38:31 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 3B5BF41151 for ; Wed, 20 Mar 2024 16:38:23 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id E159420B74C6; Wed, 20 Mar 2024 08:38:20 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com E159420B74C6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1710949100; bh=qhBAISTayZxczxR2oDbEGsOksT5bZ5TEYdfnJ1QvkPY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LyVeqSb9pmKcrUPpUllL9eqwvkUW+s5Ir3x5Gk2nfRxet98IAQDUD+Gcrf7JWaT/y 9GaagZQYedvnUg/t6vZKixDGOCNTW50LFeSawCOz5XBReTvDyZ0zCTI8sqth9pZePQ b2frgWrTmG4NaC9ZB0uG1zzHGVVjy9kYctf8HJD4= 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 , Junfeng Guo , 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 06/83] net/bonding: move alignment attribute on types Date: Wed, 20 Mar 2024 08:36:59 -0700 Message-Id: <1710949096-5786-7-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1710949096-5786-1-git-send-email-roretzla@linux.microsoft.com> References: <1710949096-5786-1-git-send-email-roretzla@linux.microsoft.com> 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 --- drivers/net/bonding/rte_eth_bond_8023ad.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.h b/drivers/net/bonding/rte_eth_bond_8023ad.h index 4c280c7..b2deb26 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.h +++ b/drivers/net/bonding/rte_eth_bond_8023ad.h @@ -57,12 +57,12 @@ struct slow_protocol { } __rte_packed; /** Generic slow protocol frame type structure */ -struct slow_protocol_frame { +struct __rte_aligned(2) slow_protocol_frame { struct rte_ether_hdr eth_hdr; struct slow_protocol slow_protocol; -} __rte_packed __rte_aligned(2); +} __rte_packed; -struct port_params { +struct __rte_aligned(2) port_params { uint16_t system_priority; /**< System priority (unused in current implementation) */ struct rte_ether_addr system; @@ -73,18 +73,18 @@ struct port_params { /**< Priority of this (unused in current implementation) */ uint16_t port_number; /**< Port number. It corresponds to member port id. */ -} __rte_packed __rte_aligned(2); +} __rte_packed; -struct lacpdu_actor_partner_params { +struct __rte_aligned(2) lacpdu_actor_partner_params { uint8_t tlv_type_info; uint8_t info_length; struct port_params port_params; uint8_t state; uint8_t reserved_3[3]; -} __rte_packed __rte_aligned(2); +} __rte_packed; /** LACPDU structure (5.4.2 in 802.1AX documentation). */ -struct lacpdu { +struct __rte_aligned(2) lacpdu { uint8_t subtype; uint8_t version_number; @@ -99,15 +99,15 @@ struct lacpdu { uint8_t tlv_type_terminator; uint8_t terminator_length; uint8_t reserved_50[50]; -} __rte_packed __rte_aligned(2); +} __rte_packed; /** LACPDU frame: Contains ethernet header and LACPDU. */ -struct lacpdu_header { +struct __rte_aligned(2) lacpdu_header { struct rte_ether_hdr eth_hdr; struct lacpdu lacpdu; -} __rte_packed __rte_aligned(2); +} __rte_packed; -struct marker { +struct __rte_aligned(2) marker { uint8_t subtype; uint8_t version_number; @@ -121,12 +121,12 @@ struct marker { uint8_t tlv_type_terminator; uint8_t terminator_length; uint8_t reserved_90[90]; -} __rte_packed __rte_aligned(2); +} __rte_packed; -struct marker_header { +struct __rte_aligned(2) marker_header { struct rte_ether_hdr eth_hdr; struct marker marker; -} __rte_packed __rte_aligned(2); +} __rte_packed; struct rte_eth_bond_8023ad_conf { uint32_t fast_periodic_ms;