Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/62680/?format=api
{ "id": 62680, "url": "http://patches.dpdk.org/api/patches/62680/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1573146604-17803-3-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-3-git-send-email-viacheslavo@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1573146604-17803-3-git-send-email-viacheslavo@mellanox.com", "date": "2019-11-07T17:09:47", "name": "[v3,02/19] net/mlx5: update modify header action translator", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "7cb60b9a9f0364721dd04c47d69081e0148bdffd", "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-3-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/62680/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/62680/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 EC455A034E;\n\tThu, 7 Nov 2019 18:10:31 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id D1D9B1BFA3;\n\tThu, 7 Nov 2019 18:10:19 +0100 (CET)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n by dpdk.org (Postfix) with ESMTP id 117671BF91\n for <dev@dpdk.org>; Thu, 7 Nov 2019 18:10:17 +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:12 +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 xA7HACiL020841;\n Thu, 7 Nov 2019 19:10:12 +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 xA7HACTw017939;\n Thu, 7 Nov 2019 17:10:12 GMT", "(from viacheslavo@localhost)\n by pegasus11.mtr.labs.mlnx (8.14.7/8.14.7/Submit) id xA7HAC90017938;\n Thu, 7 Nov 2019 17:10:12 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:09:47 +0000", "Message-Id": "<1573146604-17803-3-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 02/19] net/mlx5: update modify header action\n\ttranslator", "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": "When composing device command for modify header action, provided mask\nshould be taken more accurate into account thus length and offset\nin action should be set accordingly at precise bit-wise boundaries.\n\nFor the future use, metadata register copy action is also added.\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_flow_dv.c | 150 ++++++++++++++++++++++++++++++----------\n drivers/net/mlx5/mlx5_prm.h | 18 +++--\n 2 files changed, 128 insertions(+), 40 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex 42c265f..6a3850a 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -240,12 +240,62 @@ struct field_modify_info modify_tcp[] = {\n }\n \n /**\n+ * Fetch 1, 2, 3 or 4 byte field from the byte array\n+ * and return as unsigned integer in host-endian format.\n+ *\n+ * @param[in] data\n+ * Pointer to data array.\n+ * @param[in] size\n+ * Size of field to extract.\n+ *\n+ * @return\n+ * converted field in host endian format.\n+ */\n+static inline uint32_t\n+flow_dv_fetch_field(const uint8_t *data, uint32_t size)\n+{\n+\tuint32_t ret;\n+\n+\tswitch (size) {\n+\tcase 1:\n+\t\tret = *data;\n+\t\tbreak;\n+\tcase 2:\n+\t\tret = rte_be_to_cpu_16(*(const unaligned_uint16_t *)data);\n+\t\tbreak;\n+\tcase 3:\n+\t\tret = rte_be_to_cpu_16(*(const unaligned_uint16_t *)data);\n+\t\tret = (ret << 8) | *(data + sizeof(uint16_t));\n+\t\tbreak;\n+\tcase 4:\n+\t\tret = rte_be_to_cpu_32(*(const unaligned_uint32_t *)data);\n+\t\tbreak;\n+\tdefault:\n+\t\tassert(false);\n+\t\tret = 0;\n+\t\tbreak;\n+\t}\n+\treturn ret;\n+}\n+\n+/**\n * Convert modify-header action to DV specification.\n *\n+ * Data length of each action is determined by provided field description\n+ * and the item mask. Data bit offset and width of each action is determined\n+ * by provided item mask.\n+ *\n * @param[in] item\n * Pointer to item specification.\n * @param[in] field\n * Pointer to field modification information.\n+ * For MLX5_MODIFICATION_TYPE_SET specifies destination field.\n+ * For MLX5_MODIFICATION_TYPE_ADD specifies destination field.\n+ * For MLX5_MODIFICATION_TYPE_COPY specifies source field.\n+ * @param[in] dcopy\n+ * Destination field info for MLX5_MODIFICATION_TYPE_COPY in @type.\n+ * Negative offset value sets the same offset as source offset.\n+ * size field is ignored, value is taken from source field.\n * @param[in,out] resource\n * Pointer to the modify-header resource.\n * @param[in] type\n@@ -259,38 +309,68 @@ struct field_modify_info modify_tcp[] = {\n static int\n flow_dv_convert_modify_action(struct rte_flow_item *item,\n \t\t\t struct field_modify_info *field,\n+\t\t\t struct field_modify_info *dcopy,\n \t\t\t struct mlx5_flow_dv_modify_hdr_resource *resource,\n-\t\t\t uint32_t type,\n-\t\t\t struct rte_flow_error *error)\n+\t\t\t uint32_t type, struct rte_flow_error *error)\n {\n \tuint32_t i = resource->actions_num;\n \tstruct mlx5_modification_cmd *actions = resource->actions;\n-\tconst uint8_t *spec = item->spec;\n-\tconst uint8_t *mask = item->mask;\n-\tuint32_t set;\n-\n-\twhile (field->size) {\n-\t\tset = 0;\n-\t\t/* Generate modify command for each mask segment. */\n-\t\tmemcpy(&set, &mask[field->offset], field->size);\n-\t\tif (set) {\n-\t\t\tif (i >= MLX5_MODIFY_NUM)\n-\t\t\t\treturn rte_flow_error_set(error, EINVAL,\n-\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n-\t\t\t\t\t \"too many items to modify\");\n-\t\t\tactions[i].action_type = type;\n-\t\t\tactions[i].field = field->id;\n-\t\t\tactions[i].length = field->size ==\n-\t\t\t\t\t4 ? 0 : field->size * 8;\n-\t\t\trte_memcpy(&actions[i].data[4 - field->size],\n-\t\t\t\t &spec[field->offset], field->size);\n-\t\t\tactions[i].data0 = rte_cpu_to_be_32(actions[i].data0);\n-\t\t\t++i;\n+\n+\t/*\n+\t * The item and mask are provided in big-endian format.\n+\t * The fields should be presented as in big-endian format either.\n+\t * Mask must be always present, it defines the actual field width.\n+\t */\n+\tassert(item->mask);\n+\tassert(field->size);\n+\tdo {\n+\t\tunsigned int size_b;\n+\t\tunsigned int off_b;\n+\t\tuint32_t mask;\n+\t\tuint32_t data;\n+\n+\t\tif (i >= MLX5_MODIFY_NUM)\n+\t\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n+\t\t\t\t \"too many items to modify\");\n+\t\t/* Fetch variable byte size mask from the array. */\n+\t\tmask = flow_dv_fetch_field((const uint8_t *)item->mask +\n+\t\t\t\t\t field->offset, field->size);\n+\t\tif (!mask) {\n+\t\t\t++field;\n+\t\t\tcontinue;\n \t\t}\n-\t\tif (resource->actions_num != i)\n-\t\t\tresource->actions_num = i;\n-\t\tfield++;\n-\t}\n+\t\t/* Deduce actual data width in bits from mask value. */\n+\t\toff_b = rte_bsf32(mask);\n+\t\tsize_b = sizeof(uint32_t) * CHAR_BIT -\n+\t\t\t off_b - __builtin_clz(mask);\n+\t\tassert(size_b);\n+\t\tsize_b = size_b == sizeof(uint32_t) * CHAR_BIT ? 0 : size_b;\n+\t\tactions[i].action_type = type;\n+\t\tactions[i].field = field->id;\n+\t\tactions[i].offset = off_b;\n+\t\tactions[i].length = size_b;\n+\t\t/* Convert entire record to expected big-endian format. */\n+\t\tactions[i].data0 = rte_cpu_to_be_32(actions[i].data0);\n+\t\tif (type == MLX5_MODIFICATION_TYPE_COPY) {\n+\t\t\tassert(dcopy);\n+\t\t\tactions[i].dst_field = dcopy->id;\n+\t\t\tactions[i].dst_offset =\n+\t\t\t\t(int)dcopy->offset < 0 ? off_b : dcopy->offset;\n+\t\t\t/* Convert entire record to big-endian format. */\n+\t\t\tactions[i].data1 = rte_cpu_to_be_32(actions[i].data1);\n+\t\t} else {\n+\t\t\tassert(item->spec);\n+\t\t\tdata = flow_dv_fetch_field((const uint8_t *)item->spec +\n+\t\t\t\t\t\t field->offset, field->size);\n+\t\t\t/* Shift out the trailing masked bits from data. */\n+\t\t\tdata = (data & mask) >> off_b;\n+\t\t\tactions[i].data1 = rte_cpu_to_be_32(data);\n+\t\t}\n+\t\t++i;\n+\t\t++field;\n+\t} while (field->size);\n+\tresource->actions_num = i;\n \tif (!resource->actions_num)\n \t\treturn rte_flow_error_set(error, EINVAL,\n \t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n@@ -334,7 +414,7 @@ struct field_modify_info modify_tcp[] = {\n \t}\n \titem.spec = &ipv4;\n \titem.mask = &ipv4_mask;\n-\treturn flow_dv_convert_modify_action(&item, modify_ipv4, resource,\n+\treturn flow_dv_convert_modify_action(&item, modify_ipv4, NULL, resource,\n \t\t\t\t\t MLX5_MODIFICATION_TYPE_SET, error);\n }\n \n@@ -380,7 +460,7 @@ struct field_modify_info modify_tcp[] = {\n \t}\n \titem.spec = &ipv6;\n \titem.mask = &ipv6_mask;\n-\treturn flow_dv_convert_modify_action(&item, modify_ipv6, resource,\n+\treturn flow_dv_convert_modify_action(&item, modify_ipv6, NULL, resource,\n \t\t\t\t\t MLX5_MODIFICATION_TYPE_SET, error);\n }\n \n@@ -426,7 +506,7 @@ struct field_modify_info modify_tcp[] = {\n \t}\n \titem.spec = ð\n \titem.mask = ð_mask;\n-\treturn flow_dv_convert_modify_action(&item, modify_eth, resource,\n+\treturn flow_dv_convert_modify_action(&item, modify_eth, NULL, resource,\n \t\t\t\t\t MLX5_MODIFICATION_TYPE_SET, error);\n }\n \n@@ -540,7 +620,7 @@ struct field_modify_info modify_tcp[] = {\n \t\titem.mask = &tcp_mask;\n \t\tfield = modify_tcp;\n \t}\n-\treturn flow_dv_convert_modify_action(&item, field, resource,\n+\treturn flow_dv_convert_modify_action(&item, field, NULL, resource,\n \t\t\t\t\t MLX5_MODIFICATION_TYPE_SET, error);\n }\n \n@@ -600,7 +680,7 @@ struct field_modify_info modify_tcp[] = {\n \t\titem.mask = &ipv6_mask;\n \t\tfield = modify_ipv6;\n \t}\n-\treturn flow_dv_convert_modify_action(&item, field, resource,\n+\treturn flow_dv_convert_modify_action(&item, field, NULL, resource,\n \t\t\t\t\t MLX5_MODIFICATION_TYPE_SET, error);\n }\n \n@@ -657,7 +737,7 @@ struct field_modify_info modify_tcp[] = {\n \t\titem.mask = &ipv6_mask;\n \t\tfield = modify_ipv6;\n \t}\n-\treturn flow_dv_convert_modify_action(&item, field, resource,\n+\treturn flow_dv_convert_modify_action(&item, field, NULL, resource,\n \t\t\t\t\t MLX5_MODIFICATION_TYPE_ADD, error);\n }\n \n@@ -702,7 +782,7 @@ struct field_modify_info modify_tcp[] = {\n \titem.type = RTE_FLOW_ITEM_TYPE_TCP;\n \titem.spec = &tcp;\n \titem.mask = &tcp_mask;\n-\treturn flow_dv_convert_modify_action(&item, modify_tcp, resource,\n+\treturn flow_dv_convert_modify_action(&item, modify_tcp, NULL, resource,\n \t\t\t\t\t MLX5_MODIFICATION_TYPE_ADD, error);\n }\n \n@@ -747,7 +827,7 @@ struct field_modify_info modify_tcp[] = {\n \titem.type = RTE_FLOW_ITEM_TYPE_TCP;\n \titem.spec = &tcp;\n \titem.mask = &tcp_mask;\n-\treturn flow_dv_convert_modify_action(&item, modify_tcp, resource,\n+\treturn flow_dv_convert_modify_action(&item, modify_tcp, NULL, resource,\n \t\t\t\t\t MLX5_MODIFICATION_TYPE_ADD, error);\n }\n \ndiff --git a/drivers/net/mlx5/mlx5_prm.h b/drivers/net/mlx5/mlx5_prm.h\nindex 96b9166..b9e53f5 100644\n--- a/drivers/net/mlx5/mlx5_prm.h\n+++ b/drivers/net/mlx5/mlx5_prm.h\n@@ -383,11 +383,12 @@ struct mlx5_cqe {\n /* CQE format value. */\n #define MLX5_COMPRESSED 0x3\n \n-/* Write a specific data value to a field. */\n-#define MLX5_MODIFICATION_TYPE_SET 1\n-\n-/* Add a specific data value to a field. */\n-#define MLX5_MODIFICATION_TYPE_ADD 2\n+/* Action type of header modification. */\n+enum {\n+\tMLX5_MODIFICATION_TYPE_SET = 0x1,\n+\tMLX5_MODIFICATION_TYPE_ADD = 0x2,\n+\tMLX5_MODIFICATION_TYPE_COPY = 0x3,\n+};\n \n /* The field of packet to be modified. */\n enum mlx5_modification_field {\n@@ -470,6 +471,13 @@ struct mlx5_modification_cmd {\n \tunion {\n \t\tuint32_t data1;\n \t\tuint8_t data[4];\n+\t\tstruct {\n+\t\t\tunsigned int rsvd2:8;\n+\t\t\tunsigned int dst_offset:5;\n+\t\t\tunsigned int rsvd3:3;\n+\t\t\tunsigned int dst_field:12;\n+\t\t\tunsigned int rsvd4:4;\n+\t\t};\n \t};\n };\n \n", "prefixes": [ "v3", "02/19" ] }