Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/42803/?format=api
{ "id": 42803, "url": "http://patches.dpdk.org/api/patches/42803/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/ee7b3fcd73dc0a6a559a99adc37083bb1ac2af37.1531293415.git.nelio.laranjeiro@6wind.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": "<ee7b3fcd73dc0a6a559a99adc37083bb1ac2af37.1531293415.git.nelio.laranjeiro@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/ee7b3fcd73dc0a6a559a99adc37083bb1ac2af37.1531293415.git.nelio.laranjeiro@6wind.com", "date": "2018-07-11T07:22:43", "name": "[v3,10/21] net/mlx5: add flow UDP item", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "251f1ea4bdafea1b33ccab80cf9bf06eb6c60421", "submitter": { "id": 243, "url": "http://patches.dpdk.org/api/people/243/?format=api", "name": "Nélio Laranjeiro", "email": "nelio.laranjeiro@6wind.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/ee7b3fcd73dc0a6a559a99adc37083bb1ac2af37.1531293415.git.nelio.laranjeiro@6wind.com/mbox/", "series": [ { "id": 512, "url": "http://patches.dpdk.org/api/series/512/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=512", "date": "2018-07-11T07:22:33", "name": "net/mlx5: flow rework", "version": 3, "mbox": "http://patches.dpdk.org/series/512/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/42803/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/42803/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 983CC1B51F;\n\tWed, 11 Jul 2018 09:23:47 +0200 (CEST)", "from mail-wm0-f67.google.com (mail-wm0-f67.google.com\n\t[74.125.82.67]) by dpdk.org (Postfix) with ESMTP id 988251B4DE\n\tfor <dev@dpdk.org>; Wed, 11 Jul 2018 09:23:26 +0200 (CEST)", "by mail-wm0-f67.google.com with SMTP id z13-v6so1385747wma.5\n\tfor <dev@dpdk.org>; Wed, 11 Jul 2018 00:23:26 -0700 (PDT)", "from laranjeiro-vm.dev.6wind.com\n\t(host.78.145.23.62.rev.coltfrance.com. [62.23.145.78])\n\tby smtp.gmail.com with ESMTPSA id\n\tt10-v6sm31314212wre.95.2018.07.11.00.23.25\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 11 Jul 2018 00:23:25 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=j8VbX1jANxkfYceXfWDEHAqvwkXaiqVftC18KlRQkjc=;\n\tb=cL3nhL217aIdNiZhqkjPk0Zi1ZJbnYQ5QlJ/IUJF8ftrUFSQFHFLIuYnkreHoM54p1\n\to76z1WuIj0DJAxANOtXJMcf+IJjbGleyq0Sb2C6iMsrIcdp5GmSI7PotpDHQg876TrWr\n\tH2nuZ6cdHOb1yDBKl+61h9AsCFB811cdoQQT1VpnNWdCOyH3JD5Fhu5Q55Bny210M3EU\n\tgJsBVhkMRjY/yXhbsDXlKv5IjqeK+nQxarW2FxVUkmRdEay8NzhTbt7NQ4Sjsm50Jrhj\n\tbqWesqHUymlNz4IgfNQ+GURuJXfBTHJiagDTRo9+iNqJkIKJFb0whNFiriFxuVBOVVlg\n\tnntA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=j8VbX1jANxkfYceXfWDEHAqvwkXaiqVftC18KlRQkjc=;\n\tb=kcLZWPd7NniABK6Ped5qaw6ERyfwtxY66Zpn/1Eh7cIq3CpyBcvPmCTBLCEsoIgy2a\n\t2BAd+RQ0P53gq4JEYsWNOkbHs7sg3Fr3r0XeFt84tREFzm8wgHMxZQCPEJTBD1ZFAnMo\n\tCIhQ7i+woQyGvQCTb6Jd6N1vpn6Bpwo3C5TJREoyo/DovV0MsMi18/NxcqElDp+JYoyl\n\tp1tLpGjXVkB0AhUMT4RiPQvW+XQLjsPM2rBdJ022uYo1HlKdxnNmcEbilzyGbQusxn2u\n\td/rVNi2X2mRUcSVzaALcwhHv9ziIO8mUNRmeGoLAj+84EMWfPm1Ti8s4QgnCQyqFSz4Z\n\tHJyA==", "X-Gm-Message-State": "APt69E1t5K7lwtqM1hQphivGfOAyXHzKaLa7hAgj0h4Vab3Yv1Tm+RE5\n\tM9EfRnUGADEr4rFo1VM7WgK3nmIrCQ==", "X-Google-Smtp-Source": "AAOMgpfol5i7OqDcVLQCZgKFAwEDSOwxjeFa7rSCKRqwZIjNIbnmtK+dtB0gdhBLZMPBf0x63nwnHg==", "X-Received": "by 2002:a1c:3662:: with SMTP id\n\td95-v6mr15766157wma.147.1531293806111; \n\tWed, 11 Jul 2018 00:23:26 -0700 (PDT)", "From": "Nelio Laranjeiro <nelio.laranjeiro@6wind.com>", "To": "dev@dpdk.org,\n\tYongseok Koh <yskoh@mellanox.com>", "Cc": "Adrien Mazarguil <adrien.mazarguil@6wind.com>", "Date": "Wed, 11 Jul 2018 09:22:43 +0200", "Message-Id": "<ee7b3fcd73dc0a6a559a99adc37083bb1ac2af37.1531293415.git.nelio.laranjeiro@6wind.com>", "X-Mailer": "git-send-email 2.18.0", "In-Reply-To": "<cover.1531293415.git.nelio.laranjeiro@6wind.com>", "References": "<cover.1530111623.git.nelio.laranjeiro@6wind.com>\n\t<cover.1531293415.git.nelio.laranjeiro@6wind.com>", "Subject": "[dpdk-dev] [PATCH v3 10/21] net/mlx5: add flow UDP item", "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": "Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\nAcked-by: Yongseok Koh <yskoh@mellanox.com>\n---\n drivers/net/mlx5/mlx5_flow.c | 97 +++++++++++++++++++++++++++++++++---\n 1 file changed, 91 insertions(+), 6 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c\nindex 513f70d40..0096ed8a2 100644\n--- a/drivers/net/mlx5/mlx5_flow.c\n+++ b/drivers/net/mlx5/mlx5_flow.c\n@@ -52,6 +52,9 @@ extern const struct eth_dev_ops mlx5_dev_ops_isolate;\n #define MLX5_FLOW_FATE_DROP (1u << 0)\n #define MLX5_FLOW_FATE_QUEUE (1u << 1)\n \n+/* possible L3 layers protocols filtering. */\n+#define MLX5_IP_PROTOCOL_UDP 17\n+\n /** Handles information leading to a drop fate. */\n struct mlx5_flow_verbs {\n \tunsigned int size; /**< Size of the attribute. */\n@@ -68,10 +71,12 @@ struct mlx5_flow_verbs {\n struct rte_flow {\n \tTAILQ_ENTRY(rte_flow) next; /**< Pointer to the next flow structure. */\n \tstruct rte_flow_attr attributes; /**< User flow attribute. */\n+\tuint32_t l3_protocol_en:1; /**< Protocol filtering requested. */\n \tuint32_t layers;\n \t/**< Bit-fields of present layers see MLX5_FLOW_LAYER_*. */\n \tuint32_t fate;\n \t/**< Bit-fields of present fate see MLX5_FLOW_FATE_*. */\n+\tuint8_t l3_protocol; /**< valid when l3_protocol_en is set. */\n \tstruct mlx5_flow_verbs verbs; /* Verbs flow. */\n \tuint16_t queue; /**< Destination queue to redirect traffic to. */\n };\n@@ -568,8 +573,6 @@ mlx5_flow_item_ipv4(const struct rte_flow_item *item, struct rte_flow *flow,\n \tif (ret < 0)\n \t\treturn ret;\n \tflow->layers |= MLX5_FLOW_LAYER_OUTER_L3_IPV4;\n-\tif (size > flow_size)\n-\t\treturn size;\n \tif (spec) {\n \t\tipv4.val = (struct ibv_flow_ipv4_ext_filter){\n \t\t\t.src_ip = spec->hdr.src_addr,\n@@ -589,7 +592,10 @@ mlx5_flow_item_ipv4(const struct rte_flow_item *item, struct rte_flow *flow,\n \t\tipv4.val.proto &= ipv4.mask.proto;\n \t\tipv4.val.tos &= ipv4.mask.tos;\n \t}\n-\tmlx5_flow_spec_verbs_add(flow, &ipv4, size);\n+\tflow->l3_protocol_en = !!ipv4.mask.proto;\n+\tflow->l3_protocol = ipv4.val.proto;\n+\tif (size <= flow_size)\n+\t\tmlx5_flow_spec_verbs_add(flow, &ipv4, size);\n \treturn size;\n }\n \n@@ -660,8 +666,6 @@ mlx5_flow_item_ipv6(const struct rte_flow_item *item, struct rte_flow *flow,\n \tif (ret < 0)\n \t\treturn ret;\n \tflow->layers |= MLX5_FLOW_LAYER_OUTER_L3_IPV6;\n-\tif (size > flow_size)\n-\t\treturn size;\n \tif (spec) {\n \t\tunsigned int i;\n \t\tuint32_t vtc_flow_val;\n@@ -701,7 +705,85 @@ mlx5_flow_item_ipv6(const struct rte_flow_item *item, struct rte_flow *flow,\n \t\tipv6.val.next_hdr &= ipv6.mask.next_hdr;\n \t\tipv6.val.hop_limit &= ipv6.mask.hop_limit;\n \t}\n-\tmlx5_flow_spec_verbs_add(flow, &ipv6, size);\n+\tflow->l3_protocol_en = !!ipv6.mask.next_hdr;\n+\tflow->l3_protocol = ipv6.val.next_hdr;\n+\tif (size <= flow_size)\n+\t\tmlx5_flow_spec_verbs_add(flow, &ipv6, size);\n+\treturn size;\n+}\n+\n+/**\n+ * Convert the @p item into a Verbs specification after ensuring the NIC\n+ * will understand and process it correctly.\n+ * If the necessary size for the conversion is greater than the @p flow_size,\n+ * nothing is written in @p flow, the validation is still performed.\n+ *\n+ * @param[in] item\n+ * Item specification.\n+ * @param[in, out] flow\n+ * Pointer to flow structure.\n+ * @param[in] flow_size\n+ * Size in bytes of the available space in @p flow, if too small, nothing is\n+ * written.\n+ * @param[out] error\n+ * Pointer to error structure.\n+ *\n+ * @return\n+ * On success the number of bytes consumed/necessary, if the returned value\n+ * is lesser or equal to @p flow_size, the @p item has fully been converted,\n+ * otherwise another call with this returned memory size should be done.\n+ * On error, a negative errno value is returned and rte_errno is set.\n+ */\n+static int\n+mlx5_flow_item_udp(const struct rte_flow_item *item, struct rte_flow *flow,\n+\t\t const size_t flow_size, struct rte_flow_error *error)\n+{\n+\tconst struct rte_flow_item_udp *spec = item->spec;\n+\tconst struct rte_flow_item_udp *mask = item->mask;\n+\tunsigned int size = sizeof(struct ibv_flow_spec_tcp_udp);\n+\tstruct ibv_flow_spec_tcp_udp udp = {\n+\t\t.type = IBV_FLOW_SPEC_UDP,\n+\t\t.size = size,\n+\t};\n+\tint ret;\n+\n+\tif (!(flow->layers & MLX5_FLOW_LAYER_OUTER_L3))\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\t\t item,\n+\t\t\t\t\t \"L3 is mandatory to filter on L4\");\n+\tif (flow->layers & MLX5_FLOW_LAYER_OUTER_L4)\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\t\t item,\n+\t\t\t\t\t \"L4 layer is already present\");\n+\tif (flow->l3_protocol_en && flow->l3_protocol != MLX5_IP_PROTOCOL_UDP)\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\t\t item,\n+\t\t\t\t\t \"protocol filtering not compatible\"\n+\t\t\t\t\t \" with UDP layer\");\n+\tif (!mask)\n+\t\tmask = &rte_flow_item_udp_mask;\n+\tret = mlx5_flow_item_acceptable\n+\t\t(item, (const uint8_t *)mask,\n+\t\t (const uint8_t *)&rte_flow_item_udp_mask,\n+\t\t sizeof(struct rte_flow_item_udp), error);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\tflow->layers |= MLX5_FLOW_LAYER_OUTER_L4_UDP;\n+\tif (size > flow_size)\n+\t\treturn size;\n+\tif (spec) {\n+\t\tudp.val.dst_port = spec->hdr.dst_port;\n+\t\tudp.val.src_port = spec->hdr.src_port;\n+\t\tudp.mask.dst_port = mask->hdr.dst_port;\n+\t\tudp.mask.src_port = mask->hdr.src_port;\n+\t\t/* Remove unwanted bits from values. */\n+\t\tudp.val.src_port &= udp.mask.src_port;\n+\t\tudp.val.dst_port &= udp.mask.dst_port;\n+\t}\n+\tmlx5_flow_spec_verbs_add(flow, &udp, size);\n \treturn size;\n }\n \n@@ -756,6 +838,9 @@ mlx5_flow_items(const struct rte_flow_item pattern[],\n \t\tcase RTE_FLOW_ITEM_TYPE_IPV6:\n \t\t\tret = mlx5_flow_item_ipv6(pattern, flow, remain, error);\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ITEM_TYPE_UDP:\n+\t\t\tret = mlx5_flow_item_udp(pattern, flow, remain, error);\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\treturn rte_flow_error_set(error, ENOTSUP,\n \t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n", "prefixes": [ "v3", "10/21" ] }