Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/50068/?format=api
{ "id": 50068, "url": "http://patches.dpdk.org/api/patches/50068/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1548683340-26470-1-git-send-email-dekelp@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": "<1548683340-26470-1-git-send-email-dekelp@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1548683340-26470-1-git-send-email-dekelp@mellanox.com", "date": "2019-01-28T13:49:00", "name": "net/mlx5: fix concurrent use of Tx offloads", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "b8c7830400a7fe25134b40b476c5ae1a1a1d40ee", "submitter": { "id": 1082, "url": "http://patches.dpdk.org/api/people/1082/?format=api", "name": "Dekel Peled", "email": "dekelp@mellanox.com" }, "delegate": { "id": 6624, "url": "http://patches.dpdk.org/api/users/6624/?format=api", "username": "shahafs", "first_name": "Shahaf", "last_name": "Shuler", "email": "shahafs@mellanox.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1548683340-26470-1-git-send-email-dekelp@mellanox.com/mbox/", "series": [ { "id": 3337, "url": "http://patches.dpdk.org/api/series/3337/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=3337", "date": "2019-01-28T13:49:00", "name": "net/mlx5: fix concurrent use of Tx offloads", "version": 1, "mbox": "http://patches.dpdk.org/series/3337/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/50068/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/50068/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 40EFE5B2A;\n\tMon, 28 Jan 2019 14:53:44 +0100 (CET)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n\tby dpdk.org (Postfix) with ESMTP id A64065B16\n\tfor <dev@dpdk.org>; Mon, 28 Jan 2019 14:53:42 +0100 (CET)", "from Internal Mail-Server by MTLPINE1 (envelope-from\n\tdekelp@mellanox.com)\n\twith ESMTPS (AES256-SHA encrypted); 28 Jan 2019 15:53:41 +0200", "from mtl-vdi-280.wap.labs.mlnx. (mtl-vdi-280.wap.labs.mlnx\n\t[10.128.130.87])\n\tby labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x0SDrftD024619;\n\tMon, 28 Jan 2019 15:53:41 +0200" ], "From": "Dekel Peled <dekelp@mellanox.com>", "To": "yskoh@mellanox.com, shahafs@mellanox.com", "Cc": "dev@dpdk.org, orika@mellanox.com, dekelp@mellanox.com, stable@dpdk.org", "Date": "Mon, 28 Jan 2019 15:49:00 +0200", "Message-Id": "<1548683340-26470-1-git-send-email-dekelp@mellanox.com>", "X-Mailer": "git-send-email 1.7.1", "Subject": "[dpdk-dev] [PATCH] net/mlx5: fix concurrent use of Tx offloads", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Original patch implemented the use of match_metadata offload in the\ndifferent burst functions.\nThe concurrent use of match_metadata and multi_segs offloads was\nnot handled.\n\nThis patch updates function txq_scatter_v(), to pass metadata value\nfrom mbuf to wqe, when indicated by offload flags.\n\nFixes: 6bd7fbd03c62 (\"net/mlx5: support metadata as flow rule criteria\")\nCc: stable@dpdk.org\n\nSigned-off-by: Dekel Peled <dekelp@mellanox.com>\n---\n drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 10 +++++++---\n drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 10 ++++++----\n 2 files changed, 13 insertions(+), 7 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h\nindex 883fe1b..cfcb923 100644\n--- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h\n+++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h\n@@ -104,6 +104,7 @@\n \t\tsizeof(struct mlx5_wqe) / MLX5_WQE_DWORD_SIZE;\n \tunsigned int n;\n \tvolatile struct mlx5_wqe *wqe = NULL;\n+\tuint32_t metadata_ol = txq->offloads & DEV_TX_OFFLOAD_MATCH_METADATA;\n \n \tassert(elts_n > pkts_n);\n \tmlx5_tx_complete(txq);\n@@ -127,6 +128,9 @@\n \t\tuint8x16_t *t_wqe;\n \t\tuint8_t *dseg;\n \t\tuint8x16_t ctrl;\n+\t\trte_be32_t metadata = (metadata_ol &&\n+\t\t\t\t (pkts[n]->ol_flags & PKT_TX_METADATA)) ?\n+\t\t\t\t\t\tpkts[n]->tx_metadata : 0;\n \n \t\tassert(segs_n);\n \t\tmax_elts = elts_n - (elts_head - txq->elts_tail);\n@@ -164,9 +168,9 @@\n \t\tctrl = vqtbl1q_u8(ctrl, ctrl_shuf_m);\n \t\tvst1q_u8((void *)t_wqe, ctrl);\n \t\t/* Fill ESEG in the header. */\n-\t\tvst1q_u16((void *)(t_wqe + 1),\n-\t\t\t ((uint16x8_t) { 0, 0, cs_flags, rte_cpu_to_be_16(len),\n-\t\t\t\t\t 0, 0, 0, 0 }));\n+\t\tvst1q_u32((void *)(t_wqe + 1), ((uint32x4_t) { 0,\n+\t\t\t\t\t cs_flags << 16 | rte_cpu_to_be_16(len),\n+\t\t\t\t\t metadata, 0 }));\n \t\ttxq->wqe_ci = wqe_ci;\n \t}\n \tif (!n)\ndiff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h\nindex 14117c4..dbc7d6f 100644\n--- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h\n+++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h\n@@ -104,6 +104,7 @@\n \t\tsizeof(struct mlx5_wqe) / MLX5_WQE_DWORD_SIZE;\n \tunsigned int n;\n \tvolatile struct mlx5_wqe *wqe = NULL;\n+\tuint32_t metadata_ol = txq->offloads & DEV_TX_OFFLOAD_MATCH_METADATA;\n \n \tassert(elts_n > pkts_n);\n \tmlx5_tx_complete(txq);\n@@ -125,6 +126,9 @@\n \t\tuint16_t max_wqe;\n \t\t__m128i *t_wqe, *dseg;\n \t\t__m128i ctrl;\n+\t\trte_be32_t metadata = (metadata_ol &&\n+\t\t\t\t (pkts[n]->ol_flags & PKT_TX_METADATA)) ?\n+\t\t\t\t\t\tpkts[n]->tx_metadata : 0;\n \n \t\tassert(segs_n);\n \t\tmax_elts = elts_n - (elts_head - txq->elts_tail);\n@@ -164,10 +168,8 @@\n \t\tctrl = _mm_shuffle_epi8(ctrl, shuf_mask_ctrl);\n \t\t_mm_store_si128(t_wqe, ctrl);\n \t\t/* Fill ESEG in the header. */\n-\t\t_mm_store_si128(t_wqe + 1,\n-\t\t\t\t_mm_set_epi16(0, 0, 0, 0,\n-\t\t\t\t\t rte_cpu_to_be_16(len), cs_flags,\n-\t\t\t\t\t 0, 0));\n+\t\t_mm_store_si128(t_wqe + 1, _mm_set_epi32(0, metadata,\n+\t\t\t\t(rte_cpu_to_be_16(len) << 16) | cs_flags, 0));\n \t\ttxq->wqe_ci = wqe_ci;\n \t}\n \tif (!n)\n", "prefixes": [] }