From patchwork Mon Oct 2 14:50:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 29482 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E50BF1B255; Mon, 2 Oct 2017 16:50:59 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0065.outbound.protection.outlook.com [104.47.0.65]) by dpdk.org (Postfix) with ESMTP id CF80F1B24F for ; Mon, 2 Oct 2017 16:50:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=6En+BLN8yNRy77D9P3XQ/m9YxaguKnDu8yw1QLLGQO0=; b=eWkugLf4VXfn/AQYhg38jADXebiniZo/fRw6PSUKlqgBFrjqC4ONBgWSi2auaeUmPjSXBDwhVYOyWhowvHXPguSoLW0L7U+jZFREECWk5h8Li2Kv+uVMAQFUa8fU8+QsuCKWghFiHx2bgZ3U2xMlKfFua6RtK2UtnSIZi69HiIw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rasland@mellanox.com; Received: from mellanox.com (37.142.13.130) by AM2PR05MB1217.eurprd05.prod.outlook.com (2a01:111:e400:8450::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Mon, 2 Oct 2017 14:50:54 +0000 From: Raslan Darawsheh To: dev@dpdk.org Cc: yskoh@mellanox.com, shahafs@mellanox.com Date: Mon, 2 Oct 2017 17:50:41 +0300 Message-Id: <1506955841-19683-3-git-send-email-rasland@mellanox.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506955841-19683-1-git-send-email-rasland@mellanox.com> References: <1506617303-32509-1-git-send-email-rasland@mellanox.com> <1506955841-19683-1-git-send-email-rasland@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: DB6PR0801CA0051.eurprd08.prod.outlook.com (2603:10a6:4:2b::19) To AM2PR05MB1217.eurprd05.prod.outlook.com (2a01:111:e400:8450::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 80262136-f516-408a-b41c-08d509a4fc5a X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:AM2PR05MB1217; X-Microsoft-Exchange-Diagnostics: 1; AM2PR05MB1217; 3:+NAcgrZzXFbuSfpXB8wniCxK9/btCr7CWSuIjaOlh9bWYbDovhYWkVq6WWSglW0ErajmDTNW15wzIqbkHWD6N3xVXgetB7RuGm0MVgI2Cuw7C8f5dmROaabTSm6jtc1hOv4rc2eiRmIZBcBR63UqdtvpH0hQcinHUWuZhtahGqTZ7jQl4DD5Urvky2HQs0Zh8mVMtC7Z7atr3/A7Z07nHFMprXWcgMxo/9dBqE1yNiHJLcEXG7YOzFolpstk1981; 25:MV4baREpH1bCnP+y8AbP52QD8lB3fSdzyuUfxkAFHpwM4FK/b/xHJt1n0EOz6YgNRIjYacJ8YqSkdHcycp8Qg6AweqGf0uC5MrfpVWq5f4akaJIyswam5O9ax7Bmwtb3X/uObRR5BBySxg/aXwTuOWMDoHTuffx7g1f4hKrPn2X9i9EYFAbrxgUlFzj755E4oQ7oxEScZ+cJxmeAQG7twBf2lzBQMKM69y2o2f5u9cGd2XHC8qvyPLcGFTB/+2kHKZyjajEF2biV8fyMJPGwrKdjr7GPJIfuozjX3lPLjz4yaUs7tCZ9rrhwP9F6MFzi6KhFudhVrWDS+skZS73elg==; 31:0SrmjkizH1Pp0QUf6vczzN3EU8aIcuWfQDFMc7nvxhTp7CPwkJ2Zc3805SZrew+cXeIFXv3VUmIJ5v1qgIQhvIAHK0k5NMb/hczruumKFax4JqK1C7nsJ2nOLaG6dAaW2aj0KfZ/KahLS79ED8uOaWLO88tg9XafdGDDt9w8BdUuMBIGpdDqPED6IIl7Xm3SCqTVa3tSFtnEuSFwmWNDCNGqxfuclGOXY+qYkljJNOk= X-MS-TrafficTypeDiagnostic: AM2PR05MB1217: X-Microsoft-Exchange-Diagnostics: 1; AM2PR05MB1217; 20:JU0Wz+/q5SqlrALVeHYefs/M2zuBq5KPCIEa0ExQZGJcXawW4DKiFhK15P/DLkIzz5WVtkawBBbyZ5x4g7O6efMiXUn4eBc+V7ezXmWwtQJ6uBW6GkqBMm7zzrnZMgWGSEKMSyr0eEsAbgDxiSfyFyV3gknBSWw6ujolE8aijCjH6X9hfZTXHjZ8h3XgpoocQFc4pUtaVGYoEehGvA3YqNUzfmQznq6PSMayo5pYvht6AjJeivd4qEl7oSS/JZNZLCmjfgkakymWWscT/RMPpsKiLBtG3+avFYyCAz9Wg8hQjSsUkeWBRHj/fyHroVUkVi4D1OiNqeFJtNO/kpCcNsCM6l2uqSYfux9xwDwdkdVevrYn7szqL35QSolvcCDvt6ZKTvau/VrG7ORjpfmeCClvjPYhqSZveFNEteVKNfKTRsDACmxeiJmrWrfq74WsXkcvic95DZ7mmt5Nrirc/demIokVARQy/kqC3+dUFzVDI9AagkhwMzb/mX3cH7Pr; 4:mADE9MEOwDQ8385AR608EeGm8Dum6s49qZzG3GMmMFq2l4xbgahYNoEVX//igwe/KYDouEI4u3EoIlX9lCImPFc1/lbXbBR8LUfYofgtzhPCnZVcEZy74mItUrpsDDnhcsAY8u5ZiW2b5lndR6mjw98S0gpIuAA9ygX2DiqJ0a0R4oi1nhSC/hd4grpWL2bWP+7870WNNy9pS45cT3alfliH/qVFvq4OCxltJ595bcja91rlbekPZcAhrlhQU6Ij X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(20161123555025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM2PR05MB1217; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM2PR05MB1217; X-Forefront-PRVS: 0448A97BF2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(346002)(376002)(199003)(189002)(5003940100001)(5660300001)(6666003)(478600001)(50466002)(97736004)(4326008)(55016002)(53936002)(16586007)(21086003)(316002)(48376002)(36756003)(33026002)(6116002)(3846002)(16526017)(8936002)(7736002)(47776003)(50226002)(66066001)(105586002)(2906002)(305945005)(107886003)(81156014)(2950100002)(81166006)(25786009)(8676002)(106356001)(68736007)(101416001)(69596002)(50986999)(2361001)(6916009)(76176999)(189998001)(86362001)(2351001)(33646002)(309714004); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR05MB1217; H:mellanox.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM2PR05MB1217; 23:2Lxgj27x7tV0LDbtlfGxfyqxv88L+34IfUhGiXS/6?= j95sfTYqukQSeblCsBAADG9qSF+m3Hb/AcZ+xtAvZnZQMjl+PxMv8iHUyjTfOdD3qsdWGbFhUg6qBBMDqmDVgWLHiqUUDD/VEgumpSNsuLdfi2+/NVPO3ZWVsRdqUR9gKzrS9JPLp10NGOElC7seQFL5LpzzdjHEVxU1hQngVLkbgVYdF2NlBTXOGl88JK2GySs8VL414RI0gAlkKAyyX7dqyvATG7Da7VF6gJ5OF5qRVLlajyaLvk04PvLdLeO21aPZI4GUb8+4y7rUlenC2lRnoWRDTXtR90/UoxyhqaKDSUgrGWlmCYHf3eElGVJlTQ1WH3TT1HaLI3YmxeV8S+As8toRW/nzDH/iFmup4ORaiKmpTXl5a/j0RGiHKil7eRodkSA2JwYThF8iOACqSxfVohfb3d388AyVEcyk+DxqcZnoMb8sJ7ioC1HZfL0dhXaz8CoCvhm/rnYgPeeqv/wb//l/QB8amxu/OirKmOu38D+kPMwZbmqi6upp6ULjfrdlkb0Besq/fr9//6rTgcSa++24eBLk/x9GJPHBmf71LJc9R/L/6THixInm1QvLwciy1jBn/E7XnsyzNQpX6J2QI3Fnn0fvLsaMHwO+QHfMdVcMzbOA5kwwIsFU1w+H1b38soHonuX1TYRi8Mx6l7pp3psqk05r/vV2hVkisQ1ONeWq0QXWAxzpuTi1o7Sbtb21Odl3xceMLPxHXI+Di7d6T3SdBAPb5sJ3sX3WSRPM9PiwntZHh/FLTs7OrMxqp7eJsJw2aBJvvJY3bQpdMkwH0HzycNFGw3m0mN8LOC2n0t7ZZmcR5C0B39gLKW2R4qOBfgK+Pi/VRiUvRV1VUPyaJSRihtpNDTtWHdwh4b3Mno0d4Qdq1FMtPyR7aeB0Z7hsa9BSj+w3SC8Sat+sUhrl/EoLdO3ZtLyKRVmgJnI/mBN1wrQXSe8DU/yOuhVGVVH2EIwLekmyY7fGSb/apFyzDLVRIenw1+o1VhMTA8yq1NRt4QeJpzM3ulWlVY7AEtQcdzfLKvMDWF+xeJ6pKR2r5AYhRXjUMNniL8oY/S4bAJU2XLtBFrhOgTUk6T1VZrdy30/iZEXiJB9x0R+bYk4zdITMAeM1dnxvl01kWu3VL5zvtcfoIMAZLd12sam4jE/yS/78SESidTPPM/rrb3d X-Microsoft-Exchange-Diagnostics: 1; AM2PR05MB1217; 6:1RyGpbXb4Dq124ULW1Dt5MNxZeIHurHXCfQUvVn6SM6wjNKJSeSku/5Q7tB3yOJlRQj1Guzd0hq24O6om6s7ocrJHDpt67n6jNDYSWGiIgLZZ6Mtn3Wm/wtlY4jwfv9+Tt3gaaDvTlH4L4ZzAJvBvdk4Efb7fdP336bWfFS0seEFFmbBFyxq/6rSJuLjyMBo52w71oLthyrt0NqEe5gWe6dAPNrprDJKuybbgOU2aUxLEOWdKnghYNDTIw3qhK8gNMCkye2Z3ys/5inFMSYVywhN0TDatEFk8n3kJs2k3lPXKhcosb3bUemVaF5IGs3mD2ui+XGapJpQCF/5F4zyyw==; 5:XKe+sFqgnTQ08TEYvteCvT0KJAk4SaM3o6x13FqNk2Sc1Tdc45T7zGZkCTV2iHCCAOnCLmivPMh1MauKqwMA0UcRkTwhmiWpT/zU9u0b0Z7VenAPl6g+DR4wod6nnqEy/au0Jj4o4NhBFVU0nXKdNA==; 24:jhTgXo/FuHiQAaEy8aExYYORJ0eISac1NorGr9LzRXVZzKqxwcRTIQAVixDgTAff378LhQdNKbASWZoGPPAE+sQk9yD6Ngi5KVgDS2GpFMo=; 7:vaX9pq3R9XF2kylt6BEtclXCFiXLnsJQoQvvuZBDDScGCDmIY6Bo1cVhPQLg91yvn3bEpwLt9gmunH/RSPWZO2brDYGT/Ve4Q2ZrTYVSAQIk3++tbI9PUviCVgvQYf/pmZgHh2yFONYw3vTLvGC2TRqIPw55dmvGaMrFDRP7iDwC4NypEkyekqe98imdZPTLD8FKQNI5jHszSsfiVBJ/QV+Q8GjroSQk5uK7u4tvB3A= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2017 14:50:54.8851 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR05MB1217 Subject: [dpdk-dev] [PATCH 3/3] net/mlx5: add Rx HW timestamp X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Expose Rx HW timestamp to packet mbufs. Signed-off-by :Raslan Darawsheh Acked-by: Yongseok Koh --- drivers/net/mlx5/mlx5_ethdev.c | 3 ++- drivers/net/mlx5/mlx5_rxq.c | 6 +++++- drivers/net/mlx5/mlx5_rxtx.c | 5 +++++ drivers/net/mlx5/mlx5_rxtx.h | 3 ++- drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 13 ++++++++++++- 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index d8bcef4..892c2cc 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -686,7 +686,8 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) DEV_RX_OFFLOAD_UDP_CKSUM | DEV_RX_OFFLOAD_TCP_CKSUM) : 0) | - (priv->hw_vlan_strip ? DEV_RX_OFFLOAD_VLAN_STRIP : 0); + (priv->hw_vlan_strip ? DEV_RX_OFFLOAD_VLAN_STRIP : 0) | + DEV_RX_OFFLOAD_TIMESTAMP; if (!priv->mps) info->tx_offload_capa = DEV_TX_OFFLOAD_VLAN_INSERT; if (priv->hw_csum) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 9bb6a29..e48e240 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -609,7 +609,7 @@ mlx5_priv_rxq_ibv_new(struct priv *priv, uint16_t idx) attr.cq.mlx5 = (struct mlx5dv_cq_init_attr){ .comp_mask = 0, }; - if (priv->cqe_comp) { + if (priv->cqe_comp && !rxq_data->hw_timestamp) { attr.cq.ibv.comp_mask |= IBV_CQ_INIT_ATTR_MASK_FLAGS; attr.cq.mlx5.comp_mask |= MLX5DV_CQ_INIT_ATTR_MASK_COMPRESSED_CQE; @@ -620,6 +620,8 @@ mlx5_priv_rxq_ibv_new(struct priv *priv, uint16_t idx) */ if (rxq_check_vec_support(rxq_data) < 0) cqe_n *= 2; + } else if (priv->cqe_comp && rxq_data->hw_timestamp) { + DEBUG("Rx CQE compression is disabled for HW timestamp"); } tmpl->cq = ibv_cq_ex_to_cq(mlx5dv_create_cq(priv->ctx, &attr.cq.ibv, &attr.cq.mlx5)); @@ -936,6 +938,8 @@ mlx5_priv_rxq_new(struct priv *priv, uint16_t idx, uint16_t desc, if (priv->hw_csum_l2tun) tmpl->rxq.csum_l2tun = !!dev->data->dev_conf.rxmode.hw_ip_checksum; + tmpl->rxq.hw_timestamp = + !!dev->data->dev_conf.rxmode.hw_timestamp; /* Configure VLAN stripping. */ tmpl->rxq.vlan_strip = (priv->hw_vlan_strip && !!dev->data->dev_conf.rxmode.hw_vlan_strip); diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index 275cd6a..961967b 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -1887,6 +1887,11 @@ mlx5_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n) pkt->vlan_tci = rte_be_to_cpu_16(cqe->vlan_info); } + if (rxq->hw_timestamp) { + pkt->timestamp = + rte_be_to_cpu_64(cqe->timestamp); + pkt->ol_flags |= PKT_RX_TIMESTAMP; + } if (rxq->crc_present) len -= ETHER_CRC_LEN; PKT_LEN(pkt) = len; diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h index 8470a55..c207a8b 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -106,6 +106,7 @@ struct rxq_zip { struct mlx5_rxq_data { unsigned int csum:1; /* Enable checksum offloading. */ unsigned int csum_l2tun:1; /* Same for L2 tunnels. */ + unsigned int hw_timestamp:1; /* Enable HW timestamp. */ unsigned int vlan_strip:1; /* Enable VLAN stripping. */ unsigned int crc_present:1; /* CRC must be subtracted. */ unsigned int sges_n:2; /* Log 2 of SGEs (max buffers per packet). */ @@ -115,7 +116,7 @@ struct mlx5_rxq_data { unsigned int rss_hash:1; /* RSS hash result is enabled. */ unsigned int mark:1; /* Marked flow available on the queue. */ unsigned int pending_err:1; /* CQE error needs to be handled. */ - unsigned int :7; /* Remaining bits. */ + unsigned int :6; /* Remaining bits. */ volatile uint32_t *rq_db; volatile uint32_t *cq_db; uint16_t rq_ci; diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h index c2142d7..e9819b7 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h @@ -545,7 +545,8 @@ rxq_cq_to_ptype_oflags_v(struct mlx5_rxq_data *rxq, __m128i cqes[4], { __m128i pinfo0, pinfo1; __m128i pinfo, ptype; - __m128i ol_flags = _mm_set1_epi32(rxq->rss_hash * PKT_RX_RSS_HASH); + __m128i ol_flags = _mm_set1_epi32(rxq->rss_hash * PKT_RX_RSS_HASH | + rxq->hw_timestamp * PKT_RX_TIMESTAMP); __m128i cv_flags; const __m128i zero = _mm_setzero_si128(); const __m128i ptype_mask = @@ -938,6 +939,16 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n) rxq->pending_err |= !!_mm_cvtsi128_si64(opcode); /* D.5 fill in mbuf - rearm_data and packet_type. */ rxq_cq_to_ptype_oflags_v(rxq, cqes, opcode, &pkts[pos]); + if (rxq->hw_timestamp) { + pkts[pos]->timestamp = + rte_be_to_cpu_64(cq[pos].timestamp); + pkts[pos + 1]->timestamp = + rte_be_to_cpu_64(cq[pos + p1].timestamp); + pkts[pos + 2]->timestamp = + rte_be_to_cpu_64(cq[pos + p2].timestamp); + pkts[pos + 3]->timestamp = + rte_be_to_cpu_64(cq[pos + p3].timestamp); + } #ifdef MLX5_PMD_SOFT_COUNTERS /* Add up received bytes count. */ byte_cnt = _mm_shuffle_epi8(op_own, len_shuf_mask);