From patchwork Mon Oct 2 14:01:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 29479 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 706A41B232; Mon, 2 Oct 2017 16:01:23 +0200 (CEST) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10051.outbound.protection.outlook.com [40.107.1.51]) by dpdk.org (Postfix) with ESMTP id 9B2F71B225 for ; Mon, 2 Oct 2017 16:01:20 +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=w/r5S7xTdWLwWVPw+5SQJtoCtQrDuOK30M5GaJXreChXJs/KHn+Q1Bbrx95LJHRvBze0TI5Mb0zHmaMKr0b+1NpQxhgO2CNhfOxKf4SYQTpJYWfkIKFkDgOqCLHtrT2z02d1fTTj7l1WEJlw703mlfgFWtP+LqZzJItWpyq7pzg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rasland@mellanox.com; Received: from mellanox.com (37.142.13.130) by VI1PR05MB1229.eurprd05.prod.outlook.com (2a01:111:e400:582e::25) 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:01:17 +0000 From: Raslan Darawsheh To: dev@dpdk.org Cc: yskoh@mellanox.com, shahafs@mellanox.com Date: Mon, 2 Oct 2017 17:01:04 +0300 Message-Id: <1506952864-27839-3-git-send-email-rasland@mellanox.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506952864-27839-1-git-send-email-rasland@mellanox.com> References: <1503560793-21597-1-git-send-email-rasland@mellanox.com> <1506952864-27839-1-git-send-email-rasland@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: VI1PR0302CA0024.eurprd03.prod.outlook.com (2603:10a6:800:e9::34) To VI1PR05MB1229.eurprd05.prod.outlook.com (2a01:111:e400:582e::25) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 91ea9155-6e6e-4453-14a2-08d5099e0da6 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:VI1PR05MB1229; X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB1229; 3:fV7x6wmCa9kolH9sisI7Qv4A8nBL9KJeCsHxkm86FHifWXC5KSUjG1rSU5VDoRJyrnXZlALB2wGgDz8qtg7X1+1IZRwtI/5We5ZlydFXGhL7l3PK4UzpFXyd6az6glk/mwdp7K6NzrYqXtIE44/RLoGEzYfkjpw0hw3BMVzOtBsDNqolH+0SCQTNMbWnZStIg2ChKvuPe2+thkOfyxIumIk9eybK6RSZgRnw77r7ItXB422DCrAOgHOC15FfXC+R; 25:ZSRHe2m/33PizV42xFQjjGU+gdIU+NbRwcdltkmQygj5n6mDveJCjArmPHb6f8RNxud36b20rZXQpJpXFz1wGcRFsE+gDl/kIwA5Lkt/7g/qPH6N6x0Hb4jpWzmFXNUYfAQ7fs/X6wkVyuqvpx2nA6ZLMwUW+pb82CYd+KwSKFkrqN21sx9Ef3BvFXz6tmCA8lLgAwLyZrNTw2bKw693AdtRO8Dk/Wcp6z5fXzg8fo+Dzqzkm+oDf7kEf8t+ZDMPVMWfbewng7znx84LdC3/6BkU/Ivj0eSaYsXksiAoOdEtfT6g9qQeEbE/LUZuvKQBSr6tezE8PDjgIns2uf/tig==; 31:lx/eJzrAXWLJqJIGqjTLI6XpKAKbxNjRIPGP0WesZsHak7UQmOhlkhH2tE7zMNTvWOCktv/tbhdjxSvUjeN4+fG8zCOTgxWA1T2SS/CV2+fgAlodrsRgW5iQRQWG4EC2WO5Rt0152lVCQLGNId7vgXfiKNN5qwc0bNrODcczUgAaHxG7zssX5RfTOuksoOLyxU4/i/toUx6ttjAy/PL1HjZVm+37ncCg0WuNLxLjVUU= X-MS-TrafficTypeDiagnostic: VI1PR05MB1229: X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB1229; 20:MI9J2dNm23CfjyX4XWFIBI+87CHi3dHOKY6nsXWuPr7ZBYpQjbSVg3q2IxiwVgt+FRJcSPAJkBXespXdmtIuLXgJiSZYrB3eKp5CivuLCL2xnQbQG7QgY28yHG28oWiYxiA6skOrlTAqaUOMElfmxIQ975oGfciGboI8jaQ8XGMIERSactovqCi1oOYTqeTj9aVLNvPv7H1GRYfpAYNgWvifLk2S3cNV1/PUTZqPvbrqumgnJF6pP7S8pHGLw8Q1eRDdq6Edv0gZCGxz8CKqN3oY/r/RxsXMlcvAExo7mspHdz1fSHcgvEWxUIpkQgGTcnPDS958f/O4faeIxu8k87XM/7m3wxirBSwkHl2ej6L2lsJK76j8hOQUOR+80M72t8grF4MYRhNvDZnthlLyNGClkilKq0vkq7lGIvl2/IKO2uqcadkd+uVWPLlI5KyG9iqeHJhskxRyZMehql49vRLvDHT+cI65MhRFwPmL6vi4aJ81ngUPxmqW99VUe4Dr; 4:pnQwQqY9pyVPOhd7Awak/iZZRfByEwQ5kbnAiE/u3laXuYoQTA4OPHtNXjldJjrq1EtwfjM+H+tMrodIIgvFlHyD2zNS05cZaasfz4zVUsjVILGyhO++xVlRBiUcmypraLi00JtWHIlTikbuZOfpoHxrRy3mcCM/0a0BhUTkfEMXLCbCtuNpcfkyK526Imp1iAq5T3aQoOcx0IhVcw/czCwoU/XygeGLnDm6clZ6xeQ98O5TteU3qTc49Sik6RvF 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)(5005006)(8121501046)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6041248)(20161123558100)(20161123564025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:VI1PR05MB1229; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:VI1PR05MB1229; X-Forefront-PRVS: 0448A97BF2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(346002)(376002)(199003)(189002)(47776003)(21086003)(101416001)(33646002)(189998001)(478600001)(4326008)(76176999)(50986999)(5660300001)(53936002)(5003940100001)(55016002)(6916009)(16586007)(2950100002)(6116002)(3846002)(305945005)(6666003)(69596002)(68736007)(16526017)(316002)(107886003)(36756003)(8936002)(2351001)(7736002)(105586002)(8676002)(2906002)(50466002)(48376002)(81166006)(81156014)(25786009)(106356001)(86362001)(50226002)(97736004)(33026002)(66066001)(2361001)(309714004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR05MB1229; H:mellanox.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:3; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR05MB1229; 23:woNEyKif0yICjkxPcMnzlK8fUIl1B4hipLxXwfL/8?= DoYifRl0HrU+qx/ySTwQHPD2sZcZ2RqssVrJ8He5M96vAPtx8IWHSMWSX9GJm4yaNZbT7wPG+L4Wrj8i/1iHXsv0+RsgUyEpyEqFuNmswvV1vdLAl4JC9+Y08JoJrgFeSEER2hCO233XuiuVC+6P9oZfLPLe2cE4luV89Mv1X+0mA4Bpk6sb/+XZQ4JHu+5bKU1O9b6K7YJgpFC5unnnPtmfe1bcZ5MsCM93GzfMXFXcZgI0BzRSEiYcKiAPRvMnauwINFYkr3yMD7XpifXMFSlfQHd5cpKgNeAOXaKa9/4tb+KbjfVkmLnFwGMrjrJsthgWUp1rlY0fbRftmhsNmcW6/lj9Vt4lVIA+WGFL9/byeMwfw3pUWo34VUUh+FRFuwYjdZKaILlZRdzOCZIhYDBKVYitqmOy82hvscmSXa6aRGxoLUodMtC4kMyaNTmN6xtdi/IEFW2Zww8ccFoC3EPbAxpzkbpqfOBY85GZoEMN4u7fWKL07SDXUtYplaTMaFRuwOiSJiExZuV7l5SLRydWM1QbG5MqDDqxE+YZqWmrmbfTZINQ/1uSBteH8VvrQ387Oy/T4E6lYFKldDLq5dz3C2PPLmBvKW3t7msgBObzbmdmYKVihgvwkJJZHi1vQ9ZZS2Yv8lvGICfdu0Rt3pT+oNP4ODYYy4Yc20yA28kPQp1kixt782fSe6IaSlPcV9nvNwXibechArUl+aM6johbiFOyCsk9bo98RSV7RudwZLjkfx471uiDWFj61ZGV862bxAiBDNwkBSTy4NPNy5EyeMsBxkx2aiVPlVXVm21oJJeNMIs8fAfykPsYqmBQt4ZUslSjEFE9EVkySQDu6+6umALoXixczjMjW0nBqGFJvoRSWPLTxT33gP+/4lIk226vFIAZbxY+G0EFHBa8xgjyWJf62BJusp+R7QvtSY19D3VFMYnazAgKDfr3VFgS5eWsLjK9kgDNPK9GkD8tkfFEHPWDU3q493gqFwEQnom3Qw8EpdM+lBjj9SFSRTNIYJu860GgnFPhvBBCjfXCWrVKsSox1nXhBXWOrdHy8VflfJ7yeCnyhm7cFQKbsLpp8L3LXw2zEZu5//h7rFuOl1MnG0tNTGLLXE2+dvgMjd2KLj8XXAtTUNeMQfHlsG0nkWQIW8xdlWR4YTGARX5Q0t1 X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB1229; 6:RaJBCwBv87pyv869qFPqR76xm4Src3RN/5Pw4l+ZYCtQHH/lF8/avUNwv4LTQkDHsFVOvaEWKNGVtm/7IQvYbiDuvRaXmbBas5P6KfUpmYcwmKffSOu8YsYLMKomRq8l6n2alwpFUtYGj2QJw/NP0iT6o5pChS26l3t6uaM4MtFsCUhEGWPaZQWsDC8NJce9adqAZqorqhdfmfKZJNtKP2lREoUz96U46kJzvp9+/Qfpi/U4dFUCmuTUkgDgYQNIWaVZBntM7ISv8zSAvZqL+dnMLTr+7w/birbkhSUhBs4Ask+F3gQYBtV5IxjuPGSGWvemhJBTGvvrJFyGZ1vv/A==; 5:F3ARATtPz04Jh6kvuNQ7Rfy7M3xupLasP0m67Cj6bbMyeyV3sSELjSJ2WpxQhgQsbUyR/rvV8iOm/ZVUAIGB+o5v3kp/4MVuU80c/mNmYvXNwsTEWse4zTCePOSY9eUbihRHRZc/NksbGnKbVd1amw==; 24:++v75/OOWN2L4gvnBe8M8LQQ/5ShnazYeP8mXKsXHJFXpEMXw7HMWxmaI5cJ7iB8qK+Ft4JAQ7td9KnKX/ms6QCq/mweOtZdUDURL+QwIi0=; 7:MVgCSYJUoz7W6eCPzI/hVaa0GFk5PcuS3zAwBTq9CSWZ5Z1qKNWugQxmtEHN7VRaCiLAromnRu44ZMp+PdqDuZrNyCMukD2U2vvVWg/0pwoW4U1RZXG09QeIZR7AtDAFVeGUkwLG2gVbcMyIdDilq1vrHcP4LIOLamRan33RBwFTkArNffjVdROr8nS4rGp6vvFRx2wz64q/w8XQxVBKxHcsIUphRw+NoRty+pfiQok= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2017 14:01:17.5795 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB1229 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);