Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/82722/?format=api
{ "id": 82722, "url": "http://patches.dpdk.org/api/patches/82722/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20201029092751.3837177-11-thomas@monjalon.net/", "project": { "id": 1, "url": "http://patches.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": "<20201029092751.3837177-11-thomas@monjalon.net>", "list_archive_url": "https://inbox.dpdk.org/dev/20201029092751.3837177-11-thomas@monjalon.net", "date": "2020-10-29T09:27:45", "name": "[10/15] net/octeontx2: switch timestamp to dynamic mbuf field", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "22a878cfe414fca9400930c722f83ed9098b05d8", "submitter": { "id": 685, "url": "http://patches.dpdk.org/api/people/685/?format=api", "name": "Thomas Monjalon", "email": "thomas@monjalon.net" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20201029092751.3837177-11-thomas@monjalon.net/mbox/", "series": [ { "id": 13454, "url": "http://patches.dpdk.org/api/series/13454/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=13454", "date": "2020-10-29T09:27:35", "name": "remove mbuf timestamp", "version": 1, "mbox": "http://patches.dpdk.org/series/13454/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/82722/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/82722/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id B6DD8A04DD;\n\tThu, 29 Oct 2020 10:31:35 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 70C57C90E;\n\tThu, 29 Oct 2020 10:28:33 +0100 (CET)", "from wnew3-smtp.messagingengine.com (wnew3-smtp.messagingengine.com\n [64.147.123.17]) by dpdk.org (Postfix) with ESMTP id 66C9FC92C\n for <dev@dpdk.org>; Thu, 29 Oct 2020 10:28:25 +0100 (CET)", "from compute2.internal (compute2.nyi.internal [10.202.2.42])\n by mailnew.west.internal (Postfix) with ESMTP id E33909FE;\n Thu, 29 Oct 2020 05:28:23 -0400 (EDT)", "from mailfrontend1 ([10.202.2.162])\n by compute2.internal (MEProxy); Thu, 29 Oct 2020 05:28:24 -0400", "from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])\n by mail.messagingengine.com (Postfix) with ESMTPA id A0471328005D;\n Thu, 29 Oct 2020 05:28:21 -0400 (EDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=\n from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding; s=fm2; bh=DOn1l1u2vwZ2n\n GbtpoeDWnpnD0GrfJWR9l+cCrsJ/Ds=; b=ZHOdn1WoRETRNHm9qJj1jq6zxNJxy\n zUHMnv1kLI46nXcpmO6HIUGUfJpod1z2nabMAQoOOK6ADJYP18pzkk84oY+m4G7w\n kajnUT8FeP2vOZVBEyuizD4LZj3YltTRs33O8FYdnKDEiLYGPSbebFEeL9V9IA9Y\n fPUR6JA0fCesL3hK8MU2KWVYhmcAR/4SW7h4U6Fxjt9EZOOYItTBCXWb6rNyAW5t\n 1zr5u83ar4YA2sdSSFqfFipe3I5jjmq+fJkG73Sq70tMcdiRbUeS7FVid8/KpVco\n rdNV2+PB/94onPqoYQRbk2y82gaNlqJEszcdTGCA3czVLf2COO6orOaKQ==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=\n messagingengine.com; h=cc:content-transfer-encoding:date:from\n :in-reply-to:message-id:mime-version:references:subject:to\n :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=\n fm1; bh=DOn1l1u2vwZ2nGbtpoeDWnpnD0GrfJWR9l+cCrsJ/Ds=; b=jv7VC7ui\n MjzPJfyOpdUGfm55R97fnWwoQ6/wewLgCwG4+hRFpGnBF1346zlWdz99Wcf1Owe3\n Ha5VgCvRAl6OauYyaWyAuLtuHd6r9JS4izYO+Y2qMfIwveS1NT7cxhC8s7M2SEDm\n 0GxQGd2F5YstosVS9CqkFyv8CQhYRk2KOJBZTG5gzgiUEvJrfAzixyh9xRn4mvPq\n 8Pj0im1/jEMksudFpa+/z7wVOUw6pk5ckpuVP+wqW7eXhjAGl2ArU+SSS18WDxBb\n YdIjOmcqbhbomkdunHEuvU7Agq56qcXWFpafGZYGa3A/L2UQi9U15Kfk2mz6kkuI\n ePxnSrHdMRl+CA==" ], "X-ME-Sender": "<xms:NouaX8B5Ewy0C_LOwxbjyjPERjJHyv0Z5An_H93LrZD5lNLhAAMBDA>\n <xme:NouaX-hyo6ixh0SCXnDYinObragwXRgJD9eQ9tPhEXUkGOHe7GD5yG_pf1aDk9qUr\n mFUvOXRW5vZwCoyYA>", "X-ME-Proxy-Cause": "\n gggruggvucftvghtrhhoucdtuddrgedujedrleefgddthecutefuodetggdotefrodftvf\n curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu\n uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc\n fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs\n ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucggtf\n frrghtthgvrhhnpedvhefgiedvjeegtdevheefhfetleefgfeivefgffevfeejgedtgfeu\n tdehtdegveenucfkphepjeejrddufeegrddvtdefrddukeegnecuvehluhhsthgvrhfuih\n iivgepkeenucfrrghrrghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhho\n nhdrnhgvth", "X-ME-Proxy": "<xmx:NouaX_m0FLzlaqNpd40AgSIrgjjq4Ze4DTtWjhzCONnyOw4jWuQi1g>\n <xmx:NouaXyww2Ld8h1MjDKVHvhLpzeP8VjuVNXZftkYkRnqyMnC2BsWHnw>\n <xmx:NouaXxTPJ098yE23f6VEIbng6M3w_YJ8p1zMIbusOLOx5DLOiKQDIA>\n <xmx:N4uaX--zSc-QDqjqThz434sWQxzvWXFEaw6QYPoW8KeDbbCcyOUveMWl71o>", "From": "Thomas Monjalon <thomas@monjalon.net>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com, david.marchand@redhat.com,\n bruce.richardson@intel.com, olivier.matz@6wind.com,\n andrew.rybchenko@oktetlabs.ru, jerinj@marvell.com, viacheslavo@nvidia.com,\n Nithin Dabilpuram <ndabilpuram@marvell.com>,\n Kiran Kumar K <kirankumark@marvell.com>, Ray Kinsella <mdr@ashroe.eu>,\n Neil Horman <nhorman@tuxdriver.com>", "Date": "Thu, 29 Oct 2020 10:27:45 +0100", "Message-Id": "<20201029092751.3837177-11-thomas@monjalon.net>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20201029092751.3837177-1-thomas@monjalon.net>", "References": "<20201029092751.3837177-1-thomas@monjalon.net>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 10/15] net/octeontx2: switch timestamp to dynamic\n\tmbuf field", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The mbuf timestamp is moved to a dynamic field\nin order to allow removal of the deprecated static field.\nThe related mbuf flag is also replaced.\n\nSigned-off-by: Thomas Monjalon <thomas@monjalon.net>\n---\n drivers/net/octeontx2/otx2_ethdev.c | 33 +++++++++++++++++++++++++++++\n drivers/net/octeontx2/otx2_rx.h | 19 ++++++++++++++---\n drivers/net/octeontx2/version.map | 7 ++++++\n 3 files changed, 56 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c\nindex cfb733a4b5..ad95219438 100644\n--- a/drivers/net/octeontx2/otx2_ethdev.c\n+++ b/drivers/net/octeontx2/otx2_ethdev.c\n@@ -4,6 +4,7 @@\n \n #include <inttypes.h>\n \n+#include <rte_bitops.h>\n #include <rte_ethdev_pci.h>\n #include <rte_io.h>\n #include <rte_malloc.h>\n@@ -14,6 +15,35 @@\n #include \"otx2_ethdev.h\"\n #include \"otx2_ethdev_sec.h\"\n \n+uint64_t rte_pmd_octeontx2_timestamp_rx_dynflag;\n+int rte_pmd_octeontx2_timestamp_dynfield_offset = -1;\n+\n+static int\n+otx2_rx_timestamp_setup(uint16_t flags)\n+{\n+\tint timestamp_rx_dynflag_offset;\n+\n+\tif ((flags & NIX_RX_OFFLOAD_TSTAMP_F) == 0)\n+\t\treturn 0;\n+\n+\trte_pmd_octeontx2_timestamp_dynfield_offset = rte_mbuf_dynfield_lookup(\n+\t\t\tRTE_MBUF_DYNFIELD_TIMESTAMP_NAME, NULL);\n+\tif (rte_pmd_octeontx2_timestamp_dynfield_offset < 0) {\n+\t\totx2_err(\"Failed to lookup timestamp field\");\n+\t\treturn -rte_errno;\n+\t}\n+\ttimestamp_rx_dynflag_offset = rte_mbuf_dynflag_lookup(\n+\t\t\tRTE_MBUF_DYNFLAG_RX_TIMESTAMP_NAME, NULL);\n+\tif (timestamp_rx_dynflag_offset < 0) {\n+\t\totx2_err(\"Failed to lookup Rx timestamp flag\");\n+\t\treturn -rte_errno;\n+\t}\n+\trte_pmd_octeontx2_timestamp_rx_dynflag =\n+\t\t\tRTE_BIT64(timestamp_rx_dynflag_offset);\n+\n+\treturn 0;\n+}\n+\n static inline uint64_t\n nix_get_rx_offload_capa(struct otx2_eth_dev *dev)\n {\n@@ -1874,6 +1904,9 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)\n \tdev->tx_offload_flags |= nix_tx_offload_flags(eth_dev);\n \tdev->rss_info.rss_grps = NIX_RSS_GRPS;\n \n+\tif (otx2_rx_timestamp_setup(dev->rx_offload_flags) != 0)\n+\t\tgoto fail_offloads;\n+\n \tnb_rxq = RTE_MAX(data->nb_rx_queues, 1);\n \tnb_txq = RTE_MAX(data->nb_tx_queues, 1);\n \ndiff --git a/drivers/net/octeontx2/otx2_rx.h b/drivers/net/octeontx2/otx2_rx.h\nindex 61a5c436dd..6981edce82 100644\n--- a/drivers/net/octeontx2/otx2_rx.h\n+++ b/drivers/net/octeontx2/otx2_rx.h\n@@ -63,6 +63,18 @@ union mbuf_initializer {\n \tuint64_t value;\n };\n \n+/* variables are exported because this file is included in other drivers */\n+extern uint64_t rte_pmd_octeontx2_timestamp_rx_dynflag;\n+extern int rte_pmd_octeontx2_timestamp_dynfield_offset;\n+\n+static inline rte_mbuf_timestamp_t *\n+otx2_timestamp_dynfield(struct rte_mbuf *mbuf)\n+{\n+\treturn RTE_MBUF_DYNFIELD(mbuf,\n+\t\trte_pmd_octeontx2_timestamp_dynfield_offset,\n+\t\trte_mbuf_timestamp_t *);\n+}\n+\n static __rte_always_inline void\n otx2_nix_mbuf_to_tstamp(struct rte_mbuf *mbuf,\n \t\t\tstruct otx2_timesync_info *tstamp, const uint16_t flag,\n@@ -77,15 +89,16 @@ otx2_nix_mbuf_to_tstamp(struct rte_mbuf *mbuf,\n \t\t/* Reading the rx timestamp inserted by CGX, viz at\n \t\t * starting of the packet data.\n \t\t */\n-\t\tmbuf->timestamp = rte_be_to_cpu_64(*tstamp_ptr);\n+\t\t*otx2_timestamp_dynfield(mbuf) = rte_be_to_cpu_64(*tstamp_ptr);\n \t\t/* PKT_RX_IEEE1588_TMST flag needs to be set only in case\n \t\t * PTP packets are received.\n \t\t */\n \t\tif (mbuf->packet_type == RTE_PTYPE_L2_ETHER_TIMESYNC) {\n-\t\t\ttstamp->rx_tstamp = mbuf->timestamp;\n+\t\t\ttstamp->rx_tstamp = *otx2_timestamp_dynfield(mbuf);\n \t\t\ttstamp->rx_ready = 1;\n \t\t\tmbuf->ol_flags |= PKT_RX_IEEE1588_PTP |\n-\t\t\t\tPKT_RX_IEEE1588_TMST | PKT_RX_TIMESTAMP;\n+\t\t\t\tPKT_RX_IEEE1588_TMST |\n+\t\t\t\trte_pmd_octeontx2_timestamp_rx_dynflag;\n \t\t}\n \t}\n }\ndiff --git a/drivers/net/octeontx2/version.map b/drivers/net/octeontx2/version.map\nindex 4a76d1d52d..d4f4784bcd 100644\n--- a/drivers/net/octeontx2/version.map\n+++ b/drivers/net/octeontx2/version.map\n@@ -1,3 +1,10 @@\n DPDK_21 {\n \tlocal: *;\n };\n+\n+INTERNAL {\n+\tglobal:\n+\n+\trte_pmd_octeontx2_timestamp_dynfield_offset;\n+\trte_pmd_octeontx2_timestamp_rx_dynflag;\n+};\n", "prefixes": [ "10/15" ] }