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 29FA042B71; Mon, 22 May 2023 15:15:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E7F3D42D3B; Mon, 22 May 2023 15:15:28 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id 62CC342D33 for ; Mon, 22 May 2023 15:15:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684761326; x=1716297326; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=HDq555mK4EuzjhEPRoDom8uNW9fLrYn0Z9z8SIiAZ6k=; b=N7+SHduyncjf00EWysMOhsks94JtqS8fbTTTFEUbGu19AlyhV+VZGZvn BoBy6Jv0fSkEB2o8kfanD6oIzmpMCjGaad+VrRx1N/W8UE7AtMneuHzv0 BFOHGkjUHRw2Szi/pc2OjFMKqDVXFZ3G06h816WslAY/ICez+LjWjGxt2 r8mHWwZ9K8dE7KnOAgan85TVJ8sGssrF3ZLmqsOLoVL5t/loIRqjsGj+Y bHL8FzPw6kLZpHfnItxXEF8XmRmrPMIudjAj/kleAVYc/6788qXfsg8Yl DtXLS21qqtdks9nXpSVIeJVgAzoZM6S6tX8KR8dWR6LOqgaUJ4v7frHKw w==; X-IronPort-AV: E=McAfee;i="6600,9927,10717"; a="342369358" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="342369358" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 06:15:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10717"; a="950085717" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="950085717" Received: from unknown (HELO npg-dpdk-simeisu-cvl-119d218.sh.intel.com) ([10.67.119.231]) by fmsmga006.fm.intel.com with ESMTP; 22 May 2023 06:15:23 -0700 From: Simei Su To: thomas@monjalon.net, ferruh.yigit@amd.com, andrew.rybchenko@oktetlabs.ru, kirill.rybalchenko@intel.com, qi.z.zhang@intel.com Cc: dev@dpdk.org, wenjun1.wu@intel.com, Simei Su Subject: [RFC v3 2/3] examples/ptpclient: refine application Date: Mon, 22 May 2023 21:23:31 +0800 Message-Id: <20230522132332.102030-3-simei.su@intel.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20230522132332.102030-1-simei.su@intel.com> References: <20230403092248.81551-1-simei.su@intel.com> <20230522132332.102030-1-simei.su@intel.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 This patch reworks code to split delay request message parsing from follow up message parsing which doesn't break original logic. Signed-off-by: Simei Su Signed-off-by: Wenjun Wu --- examples/ptpclient/ptpclient.c | 48 ++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c index cdf2da6..74a1bf5 100644 --- a/examples/ptpclient/ptpclient.c +++ b/examples/ptpclient/ptpclient.c @@ -382,21 +382,11 @@ parse_sync(struct ptpv2_data_slave_ordinary *ptp_data, uint16_t rx_tstamp_idx) static void parse_fup(struct ptpv2_data_slave_ordinary *ptp_data) { - struct rte_ether_hdr *eth_hdr; - struct rte_ether_addr eth_addr; struct ptp_header *ptp_hdr; - struct clock_id *client_clkid; struct ptp_message *ptp_msg; - struct delay_req_msg *req_msg; - struct rte_mbuf *created_pkt; struct tstamp *origin_tstamp; - struct rte_ether_addr eth_multicast = ether_multicast; - size_t pkt_size; - int wait_us; struct rte_mbuf *m = ptp_data->m; - 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)); if (memcmp(&ptp_data->master_clock_id, @@ -413,6 +403,26 @@ parse_fup(struct ptpv2_data_slave_ordinary *ptp_data) ptp_data->tstamp1.tv_sec = ((uint64_t)ntohl(origin_tstamp->sec_lsb)) | (((uint64_t)ntohs(origin_tstamp->sec_msb)) << 32); +} + +static void +send_delay_request(struct ptpv2_data_slave_ordinary *ptp_data) +{ + struct rte_ether_hdr *eth_hdr; + struct rte_ether_addr eth_addr; + struct ptp_header *ptp_hdr; + struct clock_id *client_clkid; + struct delay_req_msg *req_msg; + struct rte_mbuf *created_pkt; + struct rte_ether_addr eth_multicast = ether_multicast; + size_t pkt_size; + int wait_us; + struct rte_mbuf *m = ptp_data->m; + 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)); if (ptp_data->seqID_FOLLOWUP == ptp_data->seqID_SYNC) { ret = rte_eth_macaddr_get(ptp_data->portid, ð_addr); @@ -550,12 +560,6 @@ parse_drsp(struct ptpv2_data_slave_ordinary *ptp_data) ((uint64_t)ntohl(rx_tstamp->sec_lsb)) | (((uint64_t)ntohs(rx_tstamp->sec_msb)) << 32); - /* Evaluate the delta for adjustment. */ - ptp_data->delta = delta_eval(ptp_data); - - rte_eth_timesync_adjust_time(ptp_data->portid, - ptp_data->delta); - ptp_data->current_ptp_port = ptp_data->portid; /* Update kernel time if enabled in app parameters. */ @@ -568,6 +572,16 @@ parse_drsp(struct ptpv2_data_slave_ordinary *ptp_data) } } +static void +ptp_adjust_time(struct ptpv2_data_slave_ordinary *ptp_data) +{ + /* Evaluate the delta for adjustment. */ + ptp_data->delta = delta_eval(ptp_data); + + rte_eth_timesync_adjust_time(ptp_data->portid, + ptp_data->delta); +} + /* This function processes PTP packets, implementing slave PTP IEEE1588 L2 * functionality. */ @@ -594,9 +608,11 @@ parse_ptp_frames(uint16_t portid, struct rte_mbuf *m) { break; case FOLLOW_UP: parse_fup(&ptp_data); + send_delay_request(&ptp_data); break; case DELAY_RESP: parse_drsp(&ptp_data); + ptp_adjust_time(&ptp_data); print_clock_info(&ptp_data); break; default: -- 2.9.5