From patchwork Fri Jul 7 20:39:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 129384 X-Patchwork-Delegate: thomas@monjalon.net 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 AAEAC42DFC; Fri, 7 Jul 2023 22:40:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 639D842D4B; Fri, 7 Jul 2023 22:39:26 +0200 (CEST) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mails.dpdk.org (Postfix) with ESMTP id A17C742D2D for ; Fri, 7 Jul 2023 22:39:21 +0200 (CEST) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1b8b318c5a7so16071455ad.3 for ; Fri, 07 Jul 2023 13:39:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1688762360; x=1691354360; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kCWRDMcwmvFF9ALe0kl8MmyAQw2GA717TEvW0vvHaVg=; b=i0aH8SN+fiL8m9lY9RYvPt+pm1xPMVcmwN6IqkzE53b2ozvl5rY/bfQpanNi1hYTWY Gc0GPVXZxxJE6iP+25YmikLCnd65Gc0K7fMHm/T07qMxmU5bdqM0uuQT1rLQpV3EHr2O FLkeV8q9qVk+sD1PSi1m9AA9GgT7GCAcql/GmR4tK+xlvhwSoOVGTZQc0PfXrKy/3fN8 W5mCg9pVFpmL0RwRvP+A9GNVga4myKeufWnUlUrHMujFrYRoyGM77KBXcvUwNkMnFNv3 yfIeJDK87Ib0kK+bO4qhWZotksIRa9+qUA1ZfRbb1gwiu5US+1eJ83h8BcXszVS2tFQ0 RQxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688762360; x=1691354360; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kCWRDMcwmvFF9ALe0kl8MmyAQw2GA717TEvW0vvHaVg=; b=cPmVvQm1yIFrDBxFbWxsOaYYxl2vGIOqZu/jKtmwoQpoaRcgvfznd4HH2jzMO9C3VI NuOUEPwheefefqiQoEZqejvXA993s8WN48VdsL3Aeel2KOArupKtdTIOPDsxJhAR/wwl fsSRZRbE5Go2H+dPZPnoofpJshxsNCv7U8DQ9da91QEjt+tjxQGK6iyDOVnZ0beJdlDZ s1Qakh9kyIxOHDm/JU/qitphCvTc1q4nmOEsEBvyGmw0fj/tcbcfJ0ygmhAzOnyLBKu6 72cV2TSthvySVWPKl3AlGr4gDhqtvvBIhnEOG1VEzKADWbEdcaSM8Ni57SL/b9a8JNZD Y0uw== X-Gm-Message-State: ABy/qLYXNNGAPZ5GP/ppcPCmfLLJLCES7cNAjBKtxJr+oCn7cXbzoVEy uc0r8eId0OnQGiD4EjYUtz5x5Hdo6qmZ6h2/lZ4ghK2O X-Google-Smtp-Source: APBJJlG7ENu8E/BdS7VtTlsd7gOTT3iFaQ+rwpOYEjJO0nEMtEX4KWd3vOTI5qOVb6/3aQEydm03Kg== X-Received: by 2002:a17:902:d395:b0:1b9:be2e:2b40 with SMTP id e21-20020a170902d39500b001b9be2e2b40mr3934537pld.50.1688762360715; Fri, 07 Jul 2023 13:39:20 -0700 (PDT) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id t15-20020a170902b20f00b001b83db0bcf2sm3640493plr.141.2023.07.07.13.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 13:39:20 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Kirill Rybalchenko Subject: [PATCH v4 10/11] examples/ptpclient: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 13:39:07 -0700 Message-Id: <20230707203908.64371-11-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230707203908.64371-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230707203908.64371-1-stephen@networkplumber.org> 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 Replace explicit packet offset computations with rte_pktmbuf_mtod_offset(). Signed-off-by: Stephen Hemminger --- examples/ptpclient/ptpclient.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c index cdf2da64dfee..2535d848a1e9 100644 --- a/examples/ptpclient/ptpclient.c +++ b/examples/ptpclient/ptpclient.c @@ -354,8 +354,8 @@ parse_sync(struct ptpv2_data_slave_ordinary *ptp_data, uint16_t rx_tstamp_idx) { struct ptp_header *ptp_hdr; - ptp_hdr = (struct ptp_header *)(rte_pktmbuf_mtod(ptp_data->m, char *) - + sizeof(struct rte_ether_hdr)); + ptp_hdr = rte_pktmbuf_mtod_offset(ptp_data->m, struct ptp_header *, + sizeof(struct rte_ether_hdr)); ptp_data->seqID_SYNC = rte_be_to_cpu_16(ptp_hdr->seq_id); if (ptp_data->ptpset == 0) { @@ -397,15 +397,15 @@ parse_fup(struct ptpv2_data_slave_ordinary *ptp_data) int ret; eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - ptp_hdr = (struct ptp_header *)(rte_pktmbuf_mtod(m, char *) - + sizeof(struct rte_ether_hdr)); + ptp_hdr = rte_pktmbuf_mtod_offset(m, struct ptp_header *, + sizeof(struct rte_ether_hdr)); if (memcmp(&ptp_data->master_clock_id, &ptp_hdr->source_port_id.clock_id, sizeof(struct clock_id)) != 0) return; ptp_data->seqID_FOLLOWUP = rte_be_to_cpu_16(ptp_hdr->seq_id); - ptp_msg = (struct ptp_message *) (rte_pktmbuf_mtod(m, char *) + + ptp_msg = rte_pktmbuf_mtod_offset(m, struct ptp_message *, sizeof(struct rte_ether_hdr)); origin_tstamp = &ptp_msg->follow_up.precise_origin_tstamp; @@ -537,8 +537,8 @@ parse_drsp(struct ptpv2_data_slave_ordinary *ptp_data) struct tstamp *rx_tstamp; uint16_t seq_id; - ptp_msg = (struct ptp_message *) (rte_pktmbuf_mtod(m, char *) + - sizeof(struct rte_ether_hdr)); + ptp_msg = rte_pktmbuf_mtod_offset(m, struct ptp_message *, + sizeof(struct rte_ether_hdr)); seq_id = rte_be_to_cpu_16(ptp_msg->delay_resp.hdr.seq_id); if (memcmp(&ptp_data->client_clock_id, &ptp_msg->delay_resp.req_port_id.clock_id, @@ -585,8 +585,8 @@ parse_ptp_frames(uint16_t portid, struct rte_mbuf *m) { if (eth_type == PTP_PROTOCOL) { ptp_data.m = m; ptp_data.portid = portid; - ptp_hdr = (struct ptp_header *)(rte_pktmbuf_mtod(m, char *) - + sizeof(struct rte_ether_hdr)); + ptp_hdr = rte_pktmbuf_mtod_offset(m, struct ptp_header *, + sizeof(struct rte_ether_hdr)); switch (ptp_hdr->msg_type) { case SYNC: