Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/126357/?format=api
{ "id": 126357, "url": "http://patchwork.dpdk.org/api/patches/126357/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230421071603.55680-2-wenjing.qiao@intel.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230421071603.55680-2-wenjing.qiao@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230421071603.55680-2-wenjing.qiao@intel.com", "date": "2023-04-21T07:15:57", "name": "[v2,1/7] common/idpf: fix 64b timestamp roll over issue", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "0f659acfa75ee5dfb817ac333a524094063a3fc3", "submitter": { "id": 2680, "url": "http://patchwork.dpdk.org/api/people/2680/?format=api", "name": "Wenjing Qiao", "email": "wenjing.qiao@intel.com" }, "delegate": { "id": 1540, "url": "http://patchwork.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230421071603.55680-2-wenjing.qiao@intel.com/mbox/", "series": [ { "id": 27811, "url": "http://patchwork.dpdk.org/api/series/27811/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=27811", "date": "2023-04-21T07:15:56", "name": "update idpf and cpfl timestamp", "version": 2, "mbox": "http://patchwork.dpdk.org/series/27811/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/126357/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/126357/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 76ED4429A9;\n\tFri, 21 Apr 2023 09:21:26 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id BF21C42D0C;\n\tFri, 21 Apr 2023 09:21:15 +0200 (CEST)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n by mails.dpdk.org (Postfix) with ESMTP id C5A39410FB;\n Fri, 21 Apr 2023 09:21:11 +0200 (CEST)", "from fmsmga008.fm.intel.com ([10.253.24.58])\n by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 21 Apr 2023 00:21:00 -0700", "from dpdk-wenjing-01.sh.intel.com ([10.67.118.239])\n by fmsmga008.fm.intel.com with ESMTP; 21 Apr 2023 00:20:58 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1682061672; x=1713597672;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=WWFcWl2KC+0knXIB1wubDjOtnZeMXFkf7DyQIqR3DZk=;\n b=cNanEGjO0y5EAstiYvNP1x8lbvpEp4/ZXVL553rhoPFPomoFAe5XT5xd\n ru46gegawE38YjTR7mtWwhQn71OXS/yGykXXFf66v0OsyXBtpBp1a5o0r\n RbEeZOBPUNsnF9kwAVC/yj7lCDcy6ZEi4IzROQDSk6Yw5d2zIlYgvcBC1\n rZJprfxLgRnQYnOYvS7/pvxbBqVAw2FX2iPd4M+N45WQL6dNd7THqior4\n u1uEjGBk0fEXCPjDj904MIuYB/RcJHXALX5V2GkYPUGei6WqkwCoThkr1\n TKEGqbEf/J97WtvIV/8jMUs1FA3crbyQOhyU4DyOGOeYPf/PQ1cKLL+56 A==;", "X-IronPort-AV": [ "E=McAfee;i=\"6600,9927,10686\"; a=\"343424992\"", "E=Sophos;i=\"5.99,214,1677571200\"; d=\"scan'208\";a=\"343424992\"", "E=McAfee;i=\"6600,9927,10686\"; a=\"756811890\"", "E=Sophos;i=\"5.99,214,1677571200\"; d=\"scan'208\";a=\"756811890\"" ], "X-ExtLoop1": "1", "From": "Wenjing Qiao <wenjing.qiao@intel.com>", "To": "jingjing.wu@intel.com,\n\tbeilei.xing@intel.com,\n\tqi.z.zhang@intel.com", "Cc": "dev@dpdk.org,\n\tWenjing Qiao <wenjing.qiao@intel.com>,\n\tstable@dpdk.org", "Subject": "[PATCH v2 1/7] common/idpf: fix 64b timestamp roll over issue", "Date": "Fri, 21 Apr 2023 03:15:57 -0400", "Message-Id": "<20230421071603.55680-2-wenjing.qiao@intel.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20230421071603.55680-1-wenjing.qiao@intel.com>", "References": "<20230420091935.43116-2-wenjing.qiao@intel.com>\n <20230421071603.55680-1-wenjing.qiao@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Reading MTS register at first packet will cause timestamp\nroll over issue. To support caculating 64b timestamp, need\nan alarm to save master time from registers every 1 second.\n\nFixes: 8c6098afa075 (\"common/idpf: add Rx/Tx data path\")\nCc: stable@dpdk.org\n\nSigned-off-by: Wenjing Qiao <wenjing.qiao@intel.com>\n---\n drivers/common/idpf/idpf_common_rxtx.c | 108 ++++++++++++-------------\n drivers/common/idpf/idpf_common_rxtx.h | 3 +-\n drivers/common/idpf/version.map | 1 +\n 3 files changed, 55 insertions(+), 57 deletions(-)", "diff": "diff --git a/drivers/common/idpf/idpf_common_rxtx.c b/drivers/common/idpf/idpf_common_rxtx.c\nindex fc87e3e243..19bcb94077 100644\n--- a/drivers/common/idpf/idpf_common_rxtx.c\n+++ b/drivers/common/idpf/idpf_common_rxtx.c\n@@ -4,6 +4,7 @@\n \n #include <rte_mbuf_dyn.h>\n #include <rte_errno.h>\n+#include <rte_alarm.h>\n \n #include \"idpf_common_rxtx.h\"\n \n@@ -442,56 +443,23 @@ idpf_qc_split_rxq_mbufs_alloc(struct idpf_rx_queue *rxq)\n \treturn 0;\n }\n \n-#define IDPF_TIMESYNC_REG_WRAP_GUARD_BAND 10000\n /* Helper function to convert a 32b nanoseconds timestamp to 64b. */\n static inline uint64_t\n-idpf_tstamp_convert_32b_64b(struct idpf_adapter *ad, uint32_t flag,\n-\t\t\t uint32_t in_timestamp)\n+idpf_tstamp_convert_32b_64b(uint64_t time_hw, uint32_t in_timestamp)\n {\n-#ifdef RTE_ARCH_X86_64\n-\tstruct idpf_hw *hw = &ad->hw;\n \tconst uint64_t mask = 0xFFFFFFFF;\n-\tuint32_t hi, lo, lo2, delta;\n+\tconst uint32_t half_overflow_duration = 0x1 << 31;\n+\tuint32_t delta;\n \tuint64_t ns;\n \n-\tif (flag != 0) {\n-\t\tIDPF_WRITE_REG(hw, GLTSYN_CMD_SYNC_0_0, PF_GLTSYN_CMD_SYNC_SHTIME_EN_M);\n-\t\tIDPF_WRITE_REG(hw, GLTSYN_CMD_SYNC_0_0, PF_GLTSYN_CMD_SYNC_EXEC_CMD_M |\n-\t\t\t PF_GLTSYN_CMD_SYNC_SHTIME_EN_M);\n-\t\tlo = IDPF_READ_REG(hw, PF_GLTSYN_SHTIME_L_0);\n-\t\thi = IDPF_READ_REG(hw, PF_GLTSYN_SHTIME_H_0);\n-\t\t/*\n-\t\t * On typical system, the delta between lo and lo2 is ~1000ns,\n-\t\t * so 10000 seems a large-enough but not overly-big guard band.\n-\t\t */\n-\t\tif (lo > (UINT32_MAX - IDPF_TIMESYNC_REG_WRAP_GUARD_BAND))\n-\t\t\tlo2 = IDPF_READ_REG(hw, PF_GLTSYN_SHTIME_L_0);\n-\t\telse\n-\t\t\tlo2 = lo;\n-\n-\t\tif (lo2 < lo) {\n-\t\t\tlo = IDPF_READ_REG(hw, PF_GLTSYN_SHTIME_L_0);\n-\t\t\thi = IDPF_READ_REG(hw, PF_GLTSYN_SHTIME_H_0);\n-\t\t}\n-\n-\t\tad->time_hw = ((uint64_t)hi << 32) | lo;\n-\t}\n-\n-\tdelta = (in_timestamp - (uint32_t)(ad->time_hw & mask));\n-\tif (delta > (mask / 2)) {\n-\t\tdelta = ((uint32_t)(ad->time_hw & mask) - in_timestamp);\n-\t\tns = ad->time_hw - delta;\n+\tdelta = (in_timestamp - (uint32_t)(time_hw & mask));\n+\tif (delta > half_overflow_duration) {\n+\t\tdelta = ((uint32_t)(time_hw & mask) - in_timestamp);\n+\t\tns = time_hw - delta;\n \t} else {\n-\t\tns = ad->time_hw + delta;\n+\t\tns = time_hw + delta;\n \t}\n-\n \treturn ns;\n-#else /* !RTE_ARCH_X86_64 */\n-\tRTE_SET_USED(ad);\n-\tRTE_SET_USED(flag);\n-\tRTE_SET_USED(in_timestamp);\n-\treturn 0;\n-#endif /* RTE_ARCH_X86_64 */\n }\n \n #define IDPF_RX_FLEX_DESC_ADV_STATUS0_XSUM_S\t\t\t\t\\\n@@ -659,9 +627,6 @@ idpf_dp_splitq_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \trx_desc_ring = rxq->rx_ring;\n \tptype_tbl = rxq->adapter->ptype_tbl;\n \n-\tif ((rxq->offloads & IDPF_RX_OFFLOAD_TIMESTAMP) != 0)\n-\t\trxq->hw_register_set = 1;\n-\n \twhile (nb_rx < nb_pkts) {\n \t\trx_desc = &rx_desc_ring[rx_id];\n \n@@ -720,10 +685,8 @@ idpf_dp_splitq_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\tif (idpf_timestamp_dynflag > 0 &&\n \t\t (rxq->offloads & IDPF_RX_OFFLOAD_TIMESTAMP)) {\n \t\t\t/* timestamp */\n-\t\t\tts_ns = idpf_tstamp_convert_32b_64b(ad,\n-\t\t\t\t\t\t\t rxq->hw_register_set,\n+\t\t\tts_ns = idpf_tstamp_convert_32b_64b(ad->time_hw,\n \t\t\t\t\t\t\t rte_le_to_cpu_32(rx_desc->ts_high));\n-\t\t\trxq->hw_register_set = 0;\n \t\t\t*RTE_MBUF_DYNFIELD(rxm,\n \t\t\t\t\t idpf_timestamp_dynfield_offset,\n \t\t\t\t\t rte_mbuf_timestamp_t *) = ts_ns;\n@@ -1077,9 +1040,6 @@ idpf_dp_singleq_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \trx_ring = rxq->rx_ring;\n \tptype_tbl = rxq->adapter->ptype_tbl;\n \n-\tif ((rxq->offloads & IDPF_RX_OFFLOAD_TIMESTAMP) != 0)\n-\t\trxq->hw_register_set = 1;\n-\n \twhile (nb_rx < nb_pkts) {\n \t\trxdp = &rx_ring[rx_id];\n \t\trx_status0 = rte_le_to_cpu_16(rxdp->flex_nic_wb.status_error0);\n@@ -1142,10 +1102,8 @@ idpf_dp_singleq_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\tif (idpf_timestamp_dynflag > 0 &&\n \t\t (rxq->offloads & IDPF_RX_OFFLOAD_TIMESTAMP) != 0) {\n \t\t\t/* timestamp */\n-\t\t\tts_ns = idpf_tstamp_convert_32b_64b(ad,\n-\t\t\t\t\t rxq->hw_register_set,\n+\t\t\tts_ns = idpf_tstamp_convert_32b_64b(ad->time_hw,\n \t\t\t\t\t rte_le_to_cpu_32(rxd.flex_nic_wb.flex_ts.ts_high));\n-\t\t\trxq->hw_register_set = 0;\n \t\t\t*RTE_MBUF_DYNFIELD(rxm,\n \t\t\t\t\t idpf_timestamp_dynfield_offset,\n \t\t\t\t\t rte_mbuf_timestamp_t *) = ts_ns;\n@@ -1272,10 +1230,8 @@ idpf_dp_singleq_recv_scatter_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\tif (idpf_timestamp_dynflag > 0 &&\n \t\t (rxq->offloads & IDPF_RX_OFFLOAD_TIMESTAMP) != 0) {\n \t\t\t/* timestamp */\n-\t\t\tts_ns = idpf_tstamp_convert_32b_64b(ad,\n-\t\t\t\trxq->hw_register_set,\n+\t\t\tts_ns = idpf_tstamp_convert_32b_64b(ad->time_hw,\n \t\t\t\trte_le_to_cpu_32(rxd.flex_nic_wb.flex_ts.ts_high));\n-\t\t\trxq->hw_register_set = 0;\n \t\t\t*RTE_MBUF_DYNFIELD(rxm,\n \t\t\t\t\t idpf_timestamp_dynfield_offset,\n \t\t\t\t\t rte_mbuf_timestamp_t *) = ts_ns;\n@@ -1621,3 +1577,43 @@ idpf_qc_splitq_rx_vec_setup(struct idpf_rx_queue *rxq)\n \trxq->bufq2->ops = &def_rx_ops_vec;\n \treturn idpf_rxq_vec_setup_default(rxq->bufq2);\n }\n+\n+#define IDPF_TIMESYNC_REG_WRAP_GUARD_BAND\t10000\n+void\n+idpf_dev_read_time_hw(void *cb_arg)\n+{\n+#ifdef RTE_ARCH_X86_64\n+\tstruct idpf_adapter *ad = (struct idpf_adapter *)cb_arg;\n+\tuint32_t hi, lo, lo2;\n+\tint rc = 0;\n+\tstruct idpf_hw *hw = &ad->hw;\n+\n+\tIDPF_WRITE_REG(hw, GLTSYN_CMD_SYNC_0_0, PF_GLTSYN_CMD_SYNC_SHTIME_EN_M);\n+\tIDPF_WRITE_REG(hw, GLTSYN_CMD_SYNC_0_0,\n+\t\t PF_GLTSYN_CMD_SYNC_EXEC_CMD_M | PF_GLTSYN_CMD_SYNC_SHTIME_EN_M);\n+\tlo = IDPF_READ_REG(hw, PF_GLTSYN_SHTIME_L_0);\n+\thi = IDPF_READ_REG(hw, PF_GLTSYN_SHTIME_H_0);\n+\t/*\n+\t * On typical system, the delta between lo and lo2 is ~1000ns,\n+\t * so 10000 seems a large-enough but not overly-big guard band.\n+\t */\n+\tif (lo > (UINT32_MAX - IDPF_TIMESYNC_REG_WRAP_GUARD_BAND))\n+\t\tlo2 = IDPF_READ_REG(hw, PF_GLTSYN_SHTIME_L_0);\n+\telse\n+\t\tlo2 = lo;\n+\n+\tif (lo2 < lo) {\n+\t\tlo = IDPF_READ_REG(hw, PF_GLTSYN_SHTIME_L_0);\n+\t\thi = IDPF_READ_REG(hw, PF_GLTSYN_SHTIME_H_0);\n+\t}\n+\n+\tad->time_hw = ((uint64_t)hi << 32) | lo;\n+#else /* !RTE_ARCH_X86_64 */\n+\tad->time_hw = 0;\n+#endif /* RTE_ARCH_X86_64 */\n+\n+\t/* re-alarm watchdog */\n+\trc = rte_eal_alarm_set(1000 * 1000, &idpf_dev_read_time_hw, cb_arg);\n+\tif (rc)\n+\t\tDRV_LOG(ERR, \"Failed to reset device watchdog alarm\");\n+}\ndiff --git a/drivers/common/idpf/idpf_common_rxtx.h b/drivers/common/idpf/idpf_common_rxtx.h\nindex 11260d07f9..af1425eb3f 100644\n--- a/drivers/common/idpf/idpf_common_rxtx.h\n+++ b/drivers/common/idpf/idpf_common_rxtx.h\n@@ -142,7 +142,6 @@ struct idpf_rx_queue {\n \tstruct idpf_rx_queue *bufq2;\n \n \tuint64_t offloads;\n-\tuint32_t hw_register_set;\n };\n \n struct idpf_tx_entry {\n@@ -300,4 +299,6 @@ __rte_internal\n uint16_t idpf_dp_singleq_recv_scatter_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t\t uint16_t nb_pkts);\n \n+__rte_internal\n+void idpf_dev_read_time_hw(void *cb_arg);\n #endif /* _IDPF_COMMON_RXTX_H_ */\ndiff --git a/drivers/common/idpf/version.map b/drivers/common/idpf/version.map\nindex 70334a1b03..c67c554911 100644\n--- a/drivers/common/idpf/version.map\n+++ b/drivers/common/idpf/version.map\n@@ -14,6 +14,7 @@ INTERNAL {\n \tidpf_dp_splitq_recv_pkts_avx512;\n \tidpf_dp_splitq_xmit_pkts;\n \tidpf_dp_splitq_xmit_pkts_avx512;\n+\tidpf_dev_read_time_hw;\n \n \tidpf_qc_rx_thresh_check;\n \tidpf_qc_rx_queue_release;\n", "prefixes": [ "v2", "1/7" ] }