From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7288D45D31; Wed, 27 Nov 2024 01:55:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8A7AC42DCB; Wed, 27 Nov 2024 01:53:41 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 93859427CC for ; Wed, 27 Nov 2024 01:53:04 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1213) id B47DF2050D80; Tue, 26 Nov 2024 16:53:02 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com B47DF2050D80 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1732668783; bh=PhTAAZFPuyInEyrL8ior8n8+h40vIPkBilMn2Ju0E/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nI3fglnDMCY8y+bNtN1WaAzPF8NKTiB3CkTVvNsstKz58iGo0Hg3zLuxQT2knba9K wlpZax/VcqsG3qc4BavfyoPayMYuMWqbsiyCiEI4bEeOekPn04N6+Hyp6lVQ5sfDAv ToplTRzy/G0WxzJB4QNa195ws/H1eWYtw3fho5gg= From: Andre Muezerie To: roretzla@linux.microsoft.com Cc: aman.deep.singh@intel.com, anatoly.burakov@intel.com, bruce.richardson@intel.com, byron.marohn@intel.com, conor.walsh@intel.com, cristian.dumitrescu@intel.com, david.hunt@intel.com, dev@dpdk.org, dsosnowski@nvidia.com, gakhil@marvell.com, jerinj@marvell.com, jingjing.wu@intel.com, kirill.rybalchenko@intel.com, konstantin.v.ananyev@yandex.ru, matan@nvidia.com, orika@nvidia.com, radu.nicolau@intel.com, ruifeng.wang@arm.com, sameh.gobriel@intel.com, sivaprasad.tummala@amd.com, skori@marvell.com, stephen@networkplumber.org, suanmingm@nvidia.com, vattunuru@marvell.com, viacheslavo@nvidia.com, vladimir.medvedkin@intel.com, yipeng1.wang@intel.com, Andre Muezerie Subject: [PATCH v6 23/30] examples/ptpclient: replace packed attributes Date: Tue, 26 Nov 2024 16:52:34 -0800 Message-Id: <1732668761-5556-24-git-send-email-andremue@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1732668761-5556-1-git-send-email-andremue@linux.microsoft.com> References: <1710968771-16435-1-git-send-email-roretzla@linux.microsoft.com> <1732668761-5556-1-git-send-email-andremue@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 MSVC struct packing is not compatible with GCC. Replace macro __rte_packed with __rte_packed_begin to push existing pack value and set packing to 1-byte and macro __rte_packed_end to restore the pack value prior to the push. Macro __rte_packed_end is deliberately utilized to trigger a MSVC compiler warning if no existing packing has been pushed allowing easy identification of locations where the __rte_packed_begin is missing. Signed-off-by: Andre Muezerie --- examples/ptpclient/ptpclient.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c index 23fa487081..5486a87119 100644 --- a/examples/ptpclient/ptpclient.c +++ b/examples/ptpclient/ptpclient.c @@ -85,21 +85,24 @@ static const struct rte_ether_addr ether_multicast = { }; /* Structs used for PTP handling. */ +__rte_packed_begin struct tstamp { uint16_t sec_msb; uint32_t sec_lsb; uint32_t ns; -} __rte_packed; +} __rte_packed_end; struct clock_id { uint8_t id[8]; }; +__rte_packed_begin struct port_id { struct clock_id clock_id; uint16_t port_number; -} __rte_packed; +} __rte_packed_end; +__rte_packed_begin struct ptp_header { uint8_t msg_type; uint8_t ver; @@ -113,39 +116,44 @@ struct ptp_header { uint16_t seq_id; uint8_t control; int8_t log_message_interval; -} __rte_packed; +} __rte_packed_end; +__rte_packed_begin struct sync_msg { struct ptp_header hdr; struct tstamp origin_tstamp; -} __rte_packed; +} __rte_packed_end; +__rte_packed_begin struct follow_up_msg { struct ptp_header hdr; struct tstamp precise_origin_tstamp; uint8_t suffix[]; -} __rte_packed; +} __rte_packed_end; +__rte_packed_begin struct delay_req_msg { struct ptp_header hdr; struct tstamp origin_tstamp; -} __rte_packed; +} __rte_packed_end; +__rte_packed_begin struct delay_resp_msg { struct ptp_header hdr; struct tstamp rx_tstamp; struct port_id req_port_id; uint8_t suffix[]; -} __rte_packed; +} __rte_packed_end; struct ptp_message { + __rte_packed_begin union { struct ptp_header header; struct sync_msg sync; struct delay_req_msg delay_req; struct follow_up_msg follow_up; struct delay_resp_msg delay_resp; - } __rte_packed; + } __rte_packed_end; }; struct ptpv2_time_receiver_ordinary { -- 2.34.1