Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/82718/?format=api
{ "id": 82718, "url": "http://patches.dpdk.org/api/patches/82718/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20201029092751.3837177-7-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-7-thomas@monjalon.net>", "list_archive_url": "https://inbox.dpdk.org/dev/20201029092751.3837177-7-thomas@monjalon.net", "date": "2020-10-29T09:27:41", "name": "[06/15] net/dpaa2: switch timestamp to dynamic mbuf field", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "57e7662dc7157b28d46db110e5bfdf0824b70bf4", "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-7-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/82718/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/82718/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 8BE6EA04DD;\n\tThu, 29 Oct 2020 10:30:02 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 59784C8F2;\n\tThu, 29 Oct 2020 10:28:19 +0100 (CET)", "from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com\n [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id 5799CC8B6\n for <dev@dpdk.org>; Thu, 29 Oct 2020 10:28:13 +0100 (CET)", "from compute2.internal (compute2.nyi.internal [10.202.2.42])\n by mailout.nyi.internal (Postfix) with ESMTP id B5AB15C013E;\n Thu, 29 Oct 2020 05:28:11 -0400 (EDT)", "from mailfrontend1 ([10.202.2.162])\n by compute2.internal (MEProxy); Thu, 29 Oct 2020 05:28:11 -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 691E83280063;\n Thu, 29 Oct 2020 05:28:10 -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=VopuAHQpDKGDL\n rnULTcPk7NtBvcwX/S1QrLaKk0hbDk=; b=U7SymSdGIF35qy4w3zVdZIjLMp3Bh\n uOfjFYJkfg4IpDlhU+6o/+RWKR1nOKILo6l5cWLc8Q/0H4jk+Qfg4uC38iBcSAJM\n h3Hpz1nSzM/81FTI2YCMEPoZKDKIQcwZoqGtJObdDOpnS48fRKFZptjbd+PYxk+N\n 4LFiDtzWIhcKx1zAsPOGDh85f2eXxTzFi1Lr9gO1kVhnoZTFNY0fgOHSj6zjUnHY\n aCdPNnpSqy6ez2nLuuBHgMY4XbKbC+kQOZoepl84mSAqE5QKj2i2m4DJQT8aBrPk\n hhtiZv5M6g+NYCd8NaSQK6HBjt/BeG383iu8TqAymH2qapzaV04QjcNDQ==", "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=VopuAHQpDKGDLrnULTcPk7NtBvcwX/S1QrLaKk0hbDk=; b=CKWiKITF\n x405+mcleROeFRAgpaHRwburTnFc+opV6LHAUsZaspBxTrkYL1C3/07FyNHKnPoS\n 8io+sxA5PM4Xh8SVzmy8LpPKbOvdWBXxGKx3q9o4dGOA6fzANnedbUI29Ny23sqQ\n 44r7QrD6JaESk+K6f6LF6XrB81LX2Bvl6tATe3Gi7j6v/3dIwd5lqezwXDXs1CSl\n RLcZzPa4GWM033Zj4wERDraF4Da3DklBJqatcBG8LGjgp+Wfthw2BaPE6NB1/RBz\n 3wkW7hBIWKvrQuMjrADDrL6BnxA9s5O959C8L4Apr+CJ5/nJxPD0BrJdsXQ/+cEw\n UfHIj0xXczmX+w==" ], "X-ME-Sender": "<xms:K4uaX-3KT6pxqFdCq_LivGVNGGgNHImmEMXUZ5RABawQIl0zJYbHag>\n <xme:K4uaXxFxvBQP_zS5SmuPEZ3hyBYohtTu6ZIE0T_KBbIt4dDsZ8xsA0lKg9Zqq0FNE\n 7b112fxdqpnKzkroQ>", "X-ME-Proxy-Cause": "\n gggruggvucftvghtrhhoucdtuddrgedujedrleefgddthecutefuodetggdotefrodftvf\n curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu\n uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc\n fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs\n ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucggtf\n frrghtthgvrhhnpedvhefgiedvjeegtdevheefhfetleefgfeivefgffevfeejgedtgfeu\n tdehtdegveenucfkphepjeejrddufeegrddvtdefrddukeegnecuvehluhhsthgvrhfuih\n iivgepfeenucfrrghrrghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhho\n nhdrnhgvth", "X-ME-Proxy": "<xmx:K4uaX27C3RLnyi9GOfPM4nAwGIIunXLjXmOgJrhO8O2B49B-rmObWw>\n <xmx:K4uaX_0IZitz2Cwc5lurPY-hP--oKRS9niREmUpImyLva5CepkZTOg>\n <xmx:K4uaXxHmBBKDiotK8xvV_NAwKj3j3m95m8DTUzbZZWh62bC2P4FtaQ>\n <xmx:K4uaX41h2Eq6amSKce-E2vasD-d59qdqYLip6hGvFPuxduhXPgJMsg>", "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 Hemant Agrawal <hemant.agrawal@nxp.com>,\n Sachin Saxena <sachin.saxena@oss.nxp.com>", "Date": "Thu, 29 Oct 2020 10:27:41 +0100", "Message-Id": "<20201029092751.3837177-7-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 06/15] net/dpaa2: 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/dpaa2/dpaa2_ethdev.c | 20 ++++++++++++++++++++\n drivers/net/dpaa2/dpaa2_ethdev.h | 2 ++\n drivers/net/dpaa2/dpaa2_rxtx.c | 25 ++++++++++++++++++-------\n 3 files changed, 40 insertions(+), 7 deletions(-)", "diff": "diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c\nindex 04e60c56f2..ff368174bd 100644\n--- a/drivers/net/dpaa2/dpaa2_ethdev.c\n+++ b/drivers/net/dpaa2/dpaa2_ethdev.c\n@@ -8,6 +8,7 @@\n #include <time.h>\n #include <net/if.h>\n \n+#include <rte_bitops.h>\n #include <rte_mbuf.h>\n #include <rte_ethdev_driver.h>\n #include <rte_malloc.h>\n@@ -65,6 +66,8 @@ static uint64_t dev_tx_offloads_nodis =\n \n /* enable timestamp in mbuf */\n bool dpaa2_enable_ts[RTE_MAX_ETHPORTS];\n+uint64_t dpaa2_timestamp_rx_dynflag;\n+int dpaa2_timestamp_dynfield_offset = -1;\n \n struct rte_dpaa2_xstats_name_off {\n \tchar name[RTE_ETH_XSTATS_NAME_SIZE];\n@@ -505,6 +508,7 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)\n \tstruct rte_eth_conf *eth_conf = &dev->data->dev_conf;\n \tuint64_t rx_offloads = eth_conf->rxmode.offloads;\n \tuint64_t tx_offloads = eth_conf->txmode.offloads;\n+\tint timestamp_rx_dynflag_offset;\n \tint rx_l3_csum_offload = false;\n \tint rx_l4_csum_offload = false;\n \tint tx_l3_csum_offload = false;\n@@ -587,7 +591,23 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)\n #if !defined(RTE_LIBRTE_IEEE1588)\n \tif (rx_offloads & DEV_RX_OFFLOAD_TIMESTAMP)\n #endif\n+\t{\n+\t\tdpaa2_timestamp_dynfield_offset = rte_mbuf_dynfield_lookup(\n+\t\t\t\tRTE_MBUF_DYNFIELD_TIMESTAMP_NAME, NULL);\n+\t\tif (dpaa2_timestamp_dynfield_offset < 0) {\n+\t\t\tDPAA2_PMD_ERR(\"Error to lookup timestamp field\");\n+\t\t\treturn -rte_errno;\n+\t\t}\n+\t\ttimestamp_rx_dynflag_offset = rte_mbuf_dynflag_lookup(\n+\t\t\t\tRTE_MBUF_DYNFLAG_RX_TIMESTAMP_NAME, NULL);\n+\t\tif (timestamp_rx_dynflag_offset < 0) {\n+\t\t\tDPAA2_PMD_ERR(\"Error to lookup Rx timestamp flag\");\n+\t\t\treturn -rte_errno;\n+\t\t}\n+\t\tdpaa2_timestamp_rx_dynflag =\n+\t\t\t\tRTE_BIT64(timestamp_rx_dynflag_offset);\n \t\tdpaa2_enable_ts[dev->data->port_id] = true;\n+\t}\n \n \tif (tx_offloads & DEV_TX_OFFLOAD_IPV4_CKSUM)\n \t\ttx_l3_csum_offload = true;\ndiff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h\nindex 94cf253827..8d82f74684 100644\n--- a/drivers/net/dpaa2/dpaa2_ethdev.h\n+++ b/drivers/net/dpaa2/dpaa2_ethdev.h\n@@ -92,6 +92,8 @@\n \n /* enable timestamp in mbuf*/\n extern bool dpaa2_enable_ts[];\n+extern uint64_t dpaa2_timestamp_rx_dynflag;\n+extern int dpaa2_timestamp_dynfield_offset;\n \n #define DPAA2_QOS_TABLE_RECONFIGURE\t1\n #define DPAA2_FS_TABLE_RECONFIGURE\t2\ndiff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c\nindex 4dd1d5f578..cef70bfabe 100644\n--- a/drivers/net/dpaa2/dpaa2_rxtx.c\n+++ b/drivers/net/dpaa2/dpaa2_rxtx.c\n@@ -31,6 +31,13 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf,\n \n static void enable_tx_tstamp(struct qbman_fd *fd) __rte_unused;\n \n+static inline rte_mbuf_timestamp_t *\n+dpaa2_timestamp_dynfield(struct rte_mbuf *mbuf)\n+{\n+\treturn RTE_MBUF_DYNFIELD(mbuf,\n+\t\tdpaa2_timestamp_dynfield_offset, rte_mbuf_timestamp_t *);\n+}\n+\n #define DPAA2_MBUF_TO_CONTIG_FD(_mbuf, _fd, _bpid) do { \\\n \tDPAA2_SET_FD_ADDR(_fd, DPAA2_MBUF_VADDR_TO_IOVA(_mbuf)); \\\n \tDPAA2_SET_FD_LEN(_fd, _mbuf->data_len); \\\n@@ -109,9 +116,10 @@ dpaa2_dev_rx_parse_new(struct rte_mbuf *m, const struct qbman_fd *fd,\n \tm->ol_flags |= PKT_RX_RSS_HASH;\n \n \tif (dpaa2_enable_ts[m->port]) {\n-\t\tm->timestamp = annotation->word2;\n-\t\tm->ol_flags |= PKT_RX_TIMESTAMP;\n-\t\tDPAA2_PMD_DP_DEBUG(\"pkt timestamp:0x%\" PRIx64 \"\", m->timestamp);\n+\t\t*dpaa2_timestamp_dynfield(m) = annotation->word2;\n+\t\tm->ol_flags |= dpaa2_timestamp_rx_dynflag;\n+\t\tDPAA2_PMD_DP_DEBUG(\"pkt timestamp:0x%\" PRIx64 \"\",\n+\t\t\t\t*dpaa2_timestamp_dynfield(m));\n \t}\n \n \tDPAA2_PMD_DP_DEBUG(\"HW frc = 0x%x\\t packet type =0x%x \"\n@@ -223,9 +231,12 @@ dpaa2_dev_rx_parse(struct rte_mbuf *mbuf, void *hw_annot_addr)\n \telse if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L4CE))\n \t\tmbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD;\n \n-\tmbuf->ol_flags |= PKT_RX_TIMESTAMP;\n-\tmbuf->timestamp = annotation->word2;\n-\tDPAA2_PMD_DP_DEBUG(\"pkt timestamp: 0x%\" PRIx64 \"\", mbuf->timestamp);\n+\tif (dpaa2_enable_ts[mbuf->port]) {\n+\t\t*dpaa2_timestamp_dynfield(mbuf) = annotation->word2;\n+\t\tmbuf->ol_flags |= dpaa2_timestamp_rx_dynflag;\n+\t\tDPAA2_PMD_DP_DEBUG(\"pkt timestamp: 0x%\" PRIx64 \"\",\n+\t\t\t\t*dpaa2_timestamp_dynfield(mbuf));\n+\t}\n \n \t/* Check detailed parsing requirement */\n \tif (annotation->word3 & 0x7FFFFC3FFFF)\n@@ -629,7 +640,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\telse\n \t\t\tbufs[num_rx] = eth_fd_to_mbuf(fd, eth_data->port_id);\n #if defined(RTE_LIBRTE_IEEE1588)\n-\t\tpriv->rx_timestamp = bufs[num_rx]->timestamp;\n+\t\tpriv->rx_timestamp = *dpaa2_timestamp_dynfield(bufs[num_rx]);\n #endif\n \n \t\tif (eth_data->dev_conf.rxmode.offloads &\n", "prefixes": [ "06/15" ] }