From patchwork Tue Oct 3 06:33:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 29508 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 D30ED1B2EB; Tue, 3 Oct 2017 08:34:08 +0200 (CEST) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40047.outbound.protection.outlook.com [40.107.4.47]) by dpdk.org (Postfix) with ESMTP id CFEFB1B2D4 for ; Tue, 3 Oct 2017 08:34:06 +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=7DEuCyO91VLnYc+UmhDYzMsfo8h8aCwO7YDfDs0giNM=; b=YYUIGlmUVe4rFJgB8peBfsnRNaRgig7f9BytmB/m760u4s2zJ2QQQPi43OVyU14eU0xDuYfd6JcYE6RPEnP8QXCS7Z8qG0zNPZqqsFu588GGpLSj7LMJyt9DGJGu4LG7qimVt1rOo4l5TueTjJlY25Kq+Y7rsgOIaUasNNwm6Io= 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; Tue, 3 Oct 2017 06:34:04 +0000 From: Raslan Darawsheh To: dev@dpdk.org Cc: yskoh@mellanox.com, shahafs@mellanox.com, ferruh.yigit@intel.com Date: Tue, 3 Oct 2017 09:33:50 +0300 Message-Id: <1507012430-8421-3-git-send-email-rasland@mellanox.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507012430-8421-1-git-send-email-rasland@mellanox.com> References: <1506617303-32509-1-git-send-email-rasland@mellanox.com> <1507012430-8421-1-git-send-email-rasland@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: DB6PR0202CA0020.eurprd02.prod.outlook.com (2603:10a6:4:29::30) To AM2PR05MB1217.eurprd05.prod.outlook.com (2a01:111:e400:8450::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 90302c5d-8750-4ae6-e420-08d50a28be4e 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:MiwCWnk3Bo8Oy8/6q0QtsNLtFRm3AoYfipJQbFJnwcE/LtXpXkqS0ogsZK+oH0lM3mER1YAejeMShNj6i9/Ih5rF7feC+mHgaQtBaZxa3A16Li1/AHxI9Y4oUs4gERzM+l024OiyFpS/2XopcB1/6qLZ6R/Y4YpngTMud/XbMC0S+/aPaJ+SZqkUzv0rPmFE92/EJHG/lp6eIf4dwCuy/AjVjAGrnmujmtL7gwzoLuup/5dhgsVfIfTCruwAp/m4; 25:YBIi5GRJgHsnd1rE4EQAq+APfhZ4VYE9dB7EMCFTbg9I53knI4dxZ1BoAJOvqqETkuMW0JqaMuFGsZdV5z1lbRbydVreT0chlMb72v33IKtAJWcNXQ/KFxLkSzSDWn4ZVyiRMU2dcA3OAejcEdGJO3CME6ybzpO+a6y2+MGVF7qH2TfgKG3h3WTuxCtXHPQXzWZCp0S1zkS4iVIuHP4OPA4JZ6gWeIbpBoPfWZ9a6Xx6wMGM8UrMbox9dN5GGsHv0Ew2Qtf/ND/LRaK1lbqkqETMsUf4iaPLU0SRqrlF6/u/N8XosNc6RypjqWOZ7jbsfkXsfB6MxFwiG0KauQscqA==; 31:8GuK0GnYO95t7H+t5Z+ulYW8Qzs1QkRySMbHDx069zXCWCKOlzh6DsXtDlJTdmuPRNGxjH57L5GjsQIYKQASe0YCzUTfhu9pESs+m0J2Vb7TZnb1m8eymLWrfTI6XHuW1bJpuhYlvHm+ITXsFo+1lFrXPEG/jyA2kNEeQ+Enpmru6MYsq6yWOBlh81mwYOAfDX4ulli+WBv4WdvD/LtFekXV5jxAv+bi1VnJ6DjmQq4= X-MS-TrafficTypeDiagnostic: AM2PR05MB1217: X-Microsoft-Exchange-Diagnostics: 1; AM2PR05MB1217; 20:fQ8L/8L/ho8Mfj2b2LstyjhGNTXUOFWUFEg7TEvtwkItNSQD7R1g7pfRmNra+91qsYgg6RqUHK4nn2rsj/V9thPZcDvQ1o4HZ7Fn28kKCmEzsMGxkG20siutRSqNH656KPyvg3dMMBaEmLuuvbA/hnce6cRzpOmwBHVrAnmFVZKr1ZW81TzurSTVhQUCYz4OiA65U17verzoY/go5u08ZTjtk7FmG5kKH87V4gRbDhhuNDQbeUdbCj2+GW27zJopE1gqIvQ+kttWsTyzLB/ZJ8LtE3U9kUQoTXfWOQWpnSYa2rc7YFxhDzkALYieWWqvO5bn7zFM/DrUNJU9f1abH+hiSX9RAiSPyllIKkTdvkvXvz9hQWUTW3IqgNJG0laE+H0kVjrOMLj+E9UvUYjvUU7DUgnGSMHjTRP2TCoDhyO611hhLCPzKlmGIaQLabLTQ7wscc7X7GgbER2dZCAWdKkobtcCQtzu8f05uGJDe+bnvU/NonEisoUXpdix1fnR; 4:q0s8+1e07kaJ8h0UhAfHZ6TVvY82WZcVP6olgsEvbnpsuco2gKk2vVDysO3KSplrjUoWSy6GJOcX0JgC8J4AWx02+rIZr0Ei9FkEKgCeo37BwiA6vytsXUtnL67vp/jl3PQspRQ3Nla+lXCYsehqTdUUJDrr5zCNspJaicpzU3G3ulutyFwbHb0jYZnBtc9Rg36kCt0lN4EGCgr5tR///KFwFMt5/telPeMLFi5X4c9iAzt4XOI4a5C/4F1wBS7k 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)(93006095)(93001095)(10201501046)(3002001)(100000703101)(100105400095)(6055026)(6041248)(20161123564025)(20161123558100)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(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: 044968D9E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(199003)(189002)(478600001)(33026002)(6666003)(4326008)(50466002)(2906002)(5003940100001)(55016002)(53936002)(48376002)(36756003)(7736002)(21086003)(66066001)(47776003)(81156014)(81166006)(8676002)(305945005)(6116002)(50226002)(189998001)(6916009)(2950100002)(25786009)(5660300001)(16526017)(3846002)(76176999)(97736004)(33646002)(16586007)(50986999)(86362001)(2351001)(2361001)(106356001)(105586002)(68736007)(69596002)(101416001)(8936002)(316002)(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:9psbSk4AvNUKsy/bZwVBbWbGQP3ZsYxck9ufKf2FM?= Qvv/Bn6raKnLpC2YVNxiLxZvPluJHHf0g4OEkpPRSi/dBxTb15j3dQ5x0i+P//2hCe3u4KNwPgQpaz4cZ5fPGateGnWaPyE7TPuZ8ZfBnVEWVvI2TonNHyHuI7OEbeLuHxRToh7zUg9diCTSq063noxDkABXAeF5KEc58t75nihRGzMewOaetdbVKRyNOF4lofqVB5kUmFrZ/aL71QJ62W+ofCtv/FYCl4MkSe65rgPp6Pup0pH7UE8dYF4I8SOoiac2sxhviL+FcomdbMq/hQvymxk0GzUwszo2wItDpqBJIkYt3hdcLBHHcjt89jqC+lYi7mDjkl9TdqZ9Z+piJcwiSbhIyF+AmY/uE6oF09hy+KA2L9frScbRfloHOKm2X2+AckFhr207fBbKCE5SUgP8MO29y62JjwCIoDMLH7jY8bwBgnN22u2SFihzuaUzyDF8zsMe/l4s0SAjW0zGNP/7NhDDsbSBvMnU3AgFuIiaajrLUhMBhiBnIVeVTuch4OSMwHXPKAjb7bdqenh3YuRkM6qtEVzLmd0vlGKgxFnIrE9MNtCsCeKhcHSM9NftqxFVGVt+aVQwOQPU8RUsoj51RC+12WkHHnbShNuYQGSUyfa26wGmZedYjpFIStLShQ/KBDK0NpyArEO3w0GrxJc6NK4RyhK+EF1tox4gb5jSKRRl3Vlwx6uPn8ismIKsKZhi0CldnXACc/vsQJ8KC+BQtdFJwhO/Oebttpqg+Fmik8pmuCSYbEyB4ez4hXBED0s2oeV9WoIqrmx7vXaA1rEzLZrdB7ZRmPgVitenWUkNlEi27vSvGsNsMyLIMFfpe8o+ZwDbG1IIK0hS1zckQkNeNhFETE9JBpKtbYMYML3Y417KHHCqosB5wlSVZ36RnrndkZuBHMzqdbz46VwTYz7/LPT3I9XjyaZQ7oPr5wtDO2LHjNkEHQfSEsKcz5+/75xFdU1xcrYp9efuzeF5gDSJh+zPuccz/aHdXqOMoyrkzUq3FfqzmoL7GNIB4CYPmvhKlLuTnI+xtmI5JJ6P6vaWrNeYPYpe5E+LqzLKJhmCERCp1v87wcqd0m3N/IvBW1n98FebEPECqqAPeOp73rGBf0WfVwAtBwMFRJKDItx5w== X-Microsoft-Exchange-Diagnostics: 1; AM2PR05MB1217; 6:rxtAVjbb3osJKA+Jc0NpsrA97ShZnV8niXuT8qM06a29oy26GQrQMnFpjV8PpUKby29ODijdNUaFvDSMCvVSIbDiWXOeY54nVKzMVKDqftgyzESVq6+BG0idC20DqESyf7KbWsQHhgxr2r5H8e21XPL1Z9QMbg5YQan9A4j7LlcsaHKAXMcDb3l0ZHO4ps+/iLyyXxvaC4uaZVUm/QVkGwdJvYsg3YRJyoCp6i0QrD1D61Z/bbqalMIR7agkcDgFRsvLreC/4ZT+DOnUJVFfrEwdE/f8JkbZpBSYOZwspwo/2Vf3Xmd0rqGsHuEoemx8trTyks705ScVtk/JJgKNVQ==; 5:UDko6HpPAnJChgZtz98fEBooGBKF/zh8FMh86qXfcpomPtGai6KXFUj8LDa5GINyrrVOmezyaWdSPsRKAhVYi9KGArZo6Ohgw9Pyl4zi7mGVFTNa6AHkH45UDi+AHr9AZtNLHOKEsb2o6/u5MKZOuA==; 24:PLaL4ivZuy3AvO9YPks9let/un/ewDVnMvtBSQONLaUTyfq+yyfacCNZ0kJGmmAsIjIu2M7J1AvJEAt4HCcaDkugAMRF9KnrnZANT4nh8IM=; 7:YPPoMr1NpTKvObigUHkthrlpBXkyWM7WzcVt8mBn5wU/pnHudYapgUNTaO1Niflki3ccKuvYiZTsGFvVC7YDyV+SRTPkQYQQhFJoJMSPFDMOPlPU2ewbcQsXJajexMuZNB3uXaxmFJSSKyKq7i37I0c3ekOeTd6TvvCV7VoPIeHRlWdRR3FyeoVB11F5n+5rhue64o+zOdhUYGXOfI/Fo17uuGCh7u2uSF0atnxceks= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2017 06:34:04.2479 (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 v5 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 --- 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);