Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/62693/?format=api
{ "id": 62693, "url": "http://patches.dpdk.org/api/patches/62693/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1573146604-17803-17-git-send-email-viacheslavo@mellanox.com/", "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": "<1573146604-17803-17-git-send-email-viacheslavo@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1573146604-17803-17-git-send-email-viacheslavo@mellanox.com", "date": "2019-11-07T17:10:01", "name": "[v3,16/19] net/mlx5: add meta data support to Rx datapath", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "44eef4e0ca40e20f46096cfab53255db0d70657d", "submitter": { "id": 1102, "url": "http://patches.dpdk.org/api/people/1102/?format=api", "name": "Slava Ovsiienko", "email": "viacheslavo@mellanox.com" }, "delegate": { "id": 3268, "url": "http://patches.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1573146604-17803-17-git-send-email-viacheslavo@mellanox.com/mbox/", "series": [ { "id": 7336, "url": "http://patches.dpdk.org/api/series/7336/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7336", "date": "2019-11-07T17:09:46", "name": "net/mlx5: implement extensive metadata feature", "version": 3, "mbox": "http://patches.dpdk.org/series/7336/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/62693/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/62693/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 9DD7AA034E;\n\tThu, 7 Nov 2019 18:12:40 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 4229C1C02C;\n\tThu, 7 Nov 2019 18:10:47 +0100 (CET)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n by dpdk.org (Postfix) with ESMTP id 6280C1BFDC\n for <dev@dpdk.org>; Thu, 7 Nov 2019 18:10:33 +0100 (CET)", "from Internal Mail-Server by MTLPINE1 (envelope-from\n viacheslavo@mellanox.com)\n with ESMTPS (AES256-SHA encrypted); 7 Nov 2019 19:10:30 +0200", "from pegasus11.mtr.labs.mlnx (pegasus11.mtr.labs.mlnx\n [10.210.16.104])\n by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id xA7HAUU5024320;\n Thu, 7 Nov 2019 19:10:30 +0200", "from pegasus11.mtr.labs.mlnx (localhost [127.0.0.1])\n by pegasus11.mtr.labs.mlnx (8.14.7/8.14.7) with ESMTP id xA7HAUAx017974;\n Thu, 7 Nov 2019 17:10:30 GMT", "(from viacheslavo@localhost)\n by pegasus11.mtr.labs.mlnx (8.14.7/8.14.7/Submit) id xA7HAUwu017973;\n Thu, 7 Nov 2019 17:10:30 GMT" ], "X-Authentication-Warning": "pegasus11.mtr.labs.mlnx: viacheslavo set sender to\n viacheslavo@mellanox.com using -f", "From": "Viacheslav Ovsiienko <viacheslavo@mellanox.com>", "To": "dev@dpdk.org", "Cc": "matan@mellanox.com, rasland@mellanox.com, thomas@monjalon.net,\n orika@mellanox.com, Yongseok Koh <yskoh@mellanox.com>", "Date": "Thu, 7 Nov 2019 17:10:01 +0000", "Message-Id": "<1573146604-17803-17-git-send-email-viacheslavo@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1573146604-17803-1-git-send-email-viacheslavo@mellanox.com>", "References": "<1572940915-29416-1-git-send-email-viacheslavo@mellanox.com>\n <1573146604-17803-1-git-send-email-viacheslavo@mellanox.com>", "Subject": "[dpdk-dev] [PATCH v3 16/19] net/mlx5: add meta data support to Rx\n\tdatapath", "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": "This patch moves metadata from completion descriptor\nto appropriate dynamic mbuf field.\n\nSigned-off-by: Yongseok Koh <yskoh@mellanox.com>\nSigned-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>\nAcked-by: Matan Azrad <matan@mellanox.com>\n---\n drivers/net/mlx5/mlx5_prm.h | 6 ++++--\n drivers/net/mlx5/mlx5_rxtx.c | 5 +++++\n drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 25 +++++++++++++++++++++++--\n drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 23 +++++++++++++++++++++++\n drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 27 +++++++++++++++++++++++----\n 5 files changed, 78 insertions(+), 8 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_prm.h b/drivers/net/mlx5/mlx5_prm.h\nindex b405cb6..a0c37c8 100644\n--- a/drivers/net/mlx5/mlx5_prm.h\n+++ b/drivers/net/mlx5/mlx5_prm.h\n@@ -357,12 +357,14 @@ struct mlx5_cqe {\n \tuint16_t hdr_type_etc;\n \tuint16_t vlan_info;\n \tuint8_t lro_num_seg;\n-\tuint8_t rsvd3[11];\n+\tuint8_t rsvd3[3];\n+\tuint32_t flow_table_metadata;\n+\tuint8_t rsvd4[4];\n \tuint32_t byte_cnt;\n \tuint64_t timestamp;\n \tuint32_t sop_drop_qpn;\n \tuint16_t wqe_counter;\n-\tuint8_t rsvd4;\n+\tuint8_t rsvd5;\n \tuint8_t op_own;\n };\n \ndiff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c\nindex 887e283..f28a909 100644\n--- a/drivers/net/mlx5/mlx5_rxtx.c\n+++ b/drivers/net/mlx5/mlx5_rxtx.c\n@@ -26,6 +26,7 @@\n #include <rte_branch_prediction.h>\n #include <rte_ether.h>\n #include <rte_cycles.h>\n+#include <rte_flow.h>\n \n #include \"mlx5.h\"\n #include \"mlx5_utils.h\"\n@@ -1251,6 +1252,10 @@ enum mlx5_txcmp_code {\n \t\t\tpkt->hash.fdir.hi = mlx5_flow_mark_get(mark);\n \t\t}\n \t}\n+\tif (rte_flow_dynf_metadata_avail() && cqe->flow_table_metadata) {\n+\t\tpkt->ol_flags |= PKT_RX_DYNF_METADATA;\n+\t\t*RTE_FLOW_DYNF_METADATA(pkt) = cqe->flow_table_metadata;\n+\t}\n \tif (rxq->csum)\n \t\tpkt->ol_flags |= rxq_cq_to_ol_flags(cqe);\n \tif (rxq->vlan_strip &&\ndiff --git a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h\nindex 3be3a6d..8e79883 100644\n--- a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h\n+++ b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h\n@@ -416,7 +416,6 @@\n \t\t\tvec_cmpeq((vector unsigned int)flow_tag,\n \t\t\t(vector unsigned int)pinfo_ft_mask)));\n \t}\n-\n \t/*\n \t * Merge the two fields to generate the following:\n \t * bit[1] = l3_ok\n@@ -1011,7 +1010,29 @@\n \t\t\tpkts[pos + 3]->timestamp =\n \t\t\t\trte_be_to_cpu_64(cq[pos + p3].timestamp);\n \t\t}\n-\n+\t\tif (rte_flow_dynf_metadata_avail()) {\n+\t\t\tuint64_t flag = rte_flow_dynf_metadata_mask;\n+\t\t\tint offs = rte_flow_dynf_metadata_offs;\n+\t\t\tuint32_t metadata;\n+\n+\t\t\t/* This code is subject for futher optimization. */\n+\t\t\tmetadata = cq[pos].flow_table_metadata;\n+\t\t\t*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) =\n+\t\t\t\t\t\t\t\tmetadata;\n+\t\t\tpkts[pos]->ol_flags |= metadata ? flag : 0ULL;\n+\t\t\tmetadata = cq[pos + 1].flow_table_metadata;\n+\t\t\t*RTE_MBUF_DYNFIELD(pkts[pos + 1], offs, uint32_t *) =\n+\t\t\t\t\t\t\t\tmetadata;\n+\t\t\tpkts[pos + 1]->ol_flags |= metadata ? flag : 0ULL;\n+\t\t\tmetadata = cq[pos + 2].flow_table_metadata;\n+\t\t\t*RTE_MBUF_DYNFIELD(pkts[pos + 2], offs, uint32_t *) =\n+\t\t\t\t\t\t\t\tmetadata;\n+\t\t\tpkts[pos + 2]->ol_flags |= metadata ? flag : 0ULL;\n+\t\t\tmetadata = cq[pos + 3].flow_table_metadata;\n+\t\t\t*RTE_MBUF_DYNFIELD(pkts[pos + 3], offs, uint32_t *) =\n+\t\t\t\t\t\t\t\tmetadata;\n+\t\t\tpkts[pos + 3]->ol_flags |= metadata ? flag : 0ULL;\n+\t\t}\n #ifdef MLX5_PMD_SOFT_COUNTERS\n \t\t/* Add up received bytes count. */\n \t\tbyte_cnt = vec_perm(op_own, zero, len_shuf_mask);\ndiff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h\nindex e914d01..86785c7 100644\n--- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h\n+++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h\n@@ -687,6 +687,29 @@\n \t\t\t\t\tcontainer_of(p3, struct mlx5_cqe,\n \t\t\t\t\t\t pkt_info)->timestamp);\n \t\t}\n+\t\tif (rte_flow_dynf_metadata_avail()) {\n+\t\t\t/* This code is subject for futher optimization. */\n+\t\t\t*RTE_FLOW_DYNF_METADATA(elts[pos]) =\n+\t\t\t\tcontainer_of(p0, struct mlx5_cqe,\n+\t\t\t\t\t pkt_info)->flow_table_metadata;\n+\t\t\t*RTE_FLOW_DYNF_METADATA(elts[pos + 1]) =\n+\t\t\t\tcontainer_of(p1, struct mlx5_cqe,\n+\t\t\t\t\t pkt_info)->flow_table_metadata;\n+\t\t\t*RTE_FLOW_DYNF_METADATA(elts[pos + 2]) =\n+\t\t\t\tcontainer_of(p2, struct mlx5_cqe,\n+\t\t\t\t\t pkt_info)->flow_table_metadata;\n+\t\t\t*RTE_FLOW_DYNF_METADATA(elts[pos + 3]) =\n+\t\t\t\tcontainer_of(p3, struct mlx5_cqe,\n+\t\t\t\t\t pkt_info)->flow_table_metadata;\n+\t\t\tif (*RTE_FLOW_DYNF_METADATA(elts[pos]))\n+\t\t\t\telts[pos]->ol_flags |= PKT_RX_DYNF_METADATA;\n+\t\t\tif (*RTE_FLOW_DYNF_METADATA(elts[pos + 1]))\n+\t\t\t\telts[pos + 1]->ol_flags |= PKT_RX_DYNF_METADATA;\n+\t\t\tif (*RTE_FLOW_DYNF_METADATA(elts[pos + 2]))\n+\t\t\t\telts[pos + 2]->ol_flags |= PKT_RX_DYNF_METADATA;\n+\t\t\tif (*RTE_FLOW_DYNF_METADATA(elts[pos + 3]))\n+\t\t\t\telts[pos + 3]->ol_flags |= PKT_RX_DYNF_METADATA;\n+\t\t}\n #ifdef MLX5_PMD_SOFT_COUNTERS\n \t\t/* Add up received bytes count. */\n \t\tbyte_cnt = vbic_u16(byte_cnt, invalid_mask);\ndiff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h\nindex ca8ed41..35b7761 100644\n--- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h\n+++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h\n@@ -537,8 +537,8 @@\n \t\tcqe_tmp1 = _mm_loadu_si128((__m128i *)&cq[pos + p2].csum);\n \t\tcqes[3] = _mm_blend_epi16(cqes[3], cqe_tmp2, 0x30);\n \t\tcqes[2] = _mm_blend_epi16(cqes[2], cqe_tmp1, 0x30);\n-\t\tcqe_tmp2 = _mm_loadl_epi64((__m128i *)&cq[pos + p3].rsvd3[9]);\n-\t\tcqe_tmp1 = _mm_loadl_epi64((__m128i *)&cq[pos + p2].rsvd3[9]);\n+\t\tcqe_tmp2 = _mm_loadl_epi64((__m128i *)&cq[pos + p3].rsvd4[2]);\n+\t\tcqe_tmp1 = _mm_loadl_epi64((__m128i *)&cq[pos + p2].rsvd4[2]);\n \t\tcqes[3] = _mm_blend_epi16(cqes[3], cqe_tmp2, 0x04);\n \t\tcqes[2] = _mm_blend_epi16(cqes[2], cqe_tmp1, 0x04);\n \t\t/* C.2 generate final structure for mbuf with swapping bytes. */\n@@ -564,8 +564,8 @@\n \t\tcqe_tmp1 = _mm_loadu_si128((__m128i *)&cq[pos].csum);\n \t\tcqes[1] = _mm_blend_epi16(cqes[1], cqe_tmp2, 0x30);\n \t\tcqes[0] = _mm_blend_epi16(cqes[0], cqe_tmp1, 0x30);\n-\t\tcqe_tmp2 = _mm_loadl_epi64((__m128i *)&cq[pos + p1].rsvd3[9]);\n-\t\tcqe_tmp1 = _mm_loadl_epi64((__m128i *)&cq[pos].rsvd3[9]);\n+\t\tcqe_tmp2 = _mm_loadl_epi64((__m128i *)&cq[pos + p1].rsvd4[2]);\n+\t\tcqe_tmp1 = _mm_loadl_epi64((__m128i *)&cq[pos].rsvd4[2]);\n \t\tcqes[1] = _mm_blend_epi16(cqes[1], cqe_tmp2, 0x04);\n \t\tcqes[0] = _mm_blend_epi16(cqes[0], cqe_tmp1, 0x04);\n \t\t/* C.2 generate final structure for mbuf with swapping bytes. */\n@@ -640,6 +640,25 @@\n \t\t\tpkts[pos + 3]->timestamp =\n \t\t\t\trte_be_to_cpu_64(cq[pos + p3].timestamp);\n \t\t}\n+\t\tif (rte_flow_dynf_metadata_avail()) {\n+\t\t\t/* This code is subject for futher optimization. */\n+\t\t\t*RTE_FLOW_DYNF_METADATA(pkts[pos]) =\n+\t\t\t\tcq[pos].flow_table_metadata;\n+\t\t\t*RTE_FLOW_DYNF_METADATA(pkts[pos + 1]) =\n+\t\t\t\tcq[pos + p1].flow_table_metadata;\n+\t\t\t*RTE_FLOW_DYNF_METADATA(pkts[pos + 2]) =\n+\t\t\t\tcq[pos + p2].flow_table_metadata;\n+\t\t\t*RTE_FLOW_DYNF_METADATA(pkts[pos + 3]) =\n+\t\t\t\tcq[pos + p3].flow_table_metadata;\n+\t\t\tif (*RTE_FLOW_DYNF_METADATA(pkts[pos]))\n+\t\t\t\tpkts[pos]->ol_flags |= PKT_RX_DYNF_METADATA;\n+\t\t\tif (*RTE_FLOW_DYNF_METADATA(pkts[pos + 1]))\n+\t\t\t\tpkts[pos + 1]->ol_flags |= PKT_RX_DYNF_METADATA;\n+\t\t\tif (*RTE_FLOW_DYNF_METADATA(pkts[pos + 2]))\n+\t\t\t\tpkts[pos + 2]->ol_flags |= PKT_RX_DYNF_METADATA;\n+\t\t\tif (*RTE_FLOW_DYNF_METADATA(pkts[pos + 3]))\n+\t\t\t\tpkts[pos + 3]->ol_flags |= PKT_RX_DYNF_METADATA;\n+\t\t}\n #ifdef MLX5_PMD_SOFT_COUNTERS\n \t\t/* Add up received bytes count. */\n \t\tbyte_cnt = _mm_shuffle_epi8(op_own, len_shuf_mask);\n", "prefixes": [ "v3", "16/19" ] }