From: Yongseok Koh <yskoh@mellanox.com>
To: yliu@fridaylinux.org
Cc: stable@dpdk.org, shahafs@mellanox.com,
adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com
Subject: [dpdk-stable] [PATCH v2 35/67] net/mlx5: improve flow error explanation
Date: Mon, 4 Jun 2018 17:38:07 -0700 [thread overview]
Message-ID: <20180605003811.14448-6-yskoh@mellanox.com> (raw)
In-Reply-To: <20180605003811.14448-1-yskoh@mellanox.com>
From: Nélio Laranjeiro <nelio.laranjeiro@6wind.com>
[ upstream commit fca13017680e538c5fe01f44e69fe01ce1609181 ]
Fill the error context in conversion function to provide a better reason on
why it cannot be done to the user.
Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
---
drivers/net/mlx5/mlx5_flow.c | 72 ++++++++++++++++++++++++--------------------
1 file changed, 40 insertions(+), 32 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index c150ad52b..c5111de7b 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -83,40 +83,46 @@ ibv_destroy_counter_set(struct ibv_counter_set *cs)
extern const struct eth_dev_ops mlx5_dev_ops;
extern const struct eth_dev_ops mlx5_dev_ops_isolate;
+/** Structure give to the conversion functions. */
+struct mlx5_flow_data {
+ struct mlx5_flow_parse *parser; /** Parser context. */
+ struct rte_flow_error *error; /** Error context. */
+};
+
static int
mlx5_flow_create_eth(const struct rte_flow_item *item,
const void *default_mask,
- void *data);
+ struct mlx5_flow_data *data);
static int
mlx5_flow_create_vlan(const struct rte_flow_item *item,
const void *default_mask,
- void *data);
+ struct mlx5_flow_data *data);
static int
mlx5_flow_create_ipv4(const struct rte_flow_item *item,
const void *default_mask,
- void *data);
+ struct mlx5_flow_data *data);
static int
mlx5_flow_create_ipv6(const struct rte_flow_item *item,
const void *default_mask,
- void *data);
+ struct mlx5_flow_data *data);
static int
mlx5_flow_create_udp(const struct rte_flow_item *item,
const void *default_mask,
- void *data);
+ struct mlx5_flow_data *data);
static int
mlx5_flow_create_tcp(const struct rte_flow_item *item,
const void *default_mask,
- void *data);
+ struct mlx5_flow_data *data);
static int
mlx5_flow_create_vxlan(const struct rte_flow_item *item,
const void *default_mask,
- void *data);
+ struct mlx5_flow_data *data);
struct mlx5_flow_parse;
@@ -291,7 +297,7 @@ struct mlx5_flow_items {
*/
int (*convert)(const struct rte_flow_item *item,
const void *default_mask,
- void *data);
+ struct mlx5_flow_data *data);
/** Size in bytes of the destination structure. */
const unsigned int dst_sz;
/** List of possible following items. */
@@ -1157,6 +1163,11 @@ mlx5_flow_convert(struct rte_eth_dev *dev,
/* Third step. Conversion parse, fill the specifications. */
parser->inner = 0;
for (; items->type != RTE_FLOW_ITEM_TYPE_END; ++items) {
+ struct mlx5_flow_data data = {
+ .parser = parser,
+ .error = error,
+ };
+
if (items->type == RTE_FLOW_ITEM_TYPE_VOID)
continue;
cur_item = &mlx5_flow_items[items->type];
@@ -1164,13 +1175,9 @@ mlx5_flow_convert(struct rte_eth_dev *dev,
(cur_item->default_mask ?
cur_item->default_mask :
cur_item->mask),
- parser);
- if (ret) {
- rte_flow_error_set(error, rte_errno,
- RTE_FLOW_ERROR_TYPE_ITEM,
- items, "item not supported");
+ &data);
+ if (ret)
goto exit_free;
- }
}
if (parser->mark)
mlx5_flow_create_flag_mark(parser, parser->mark_id);
@@ -1263,11 +1270,11 @@ mlx5_flow_create_copy(struct mlx5_flow_parse *parser, void *src,
static int
mlx5_flow_create_eth(const struct rte_flow_item *item,
const void *default_mask,
- void *data)
+ struct mlx5_flow_data *data)
{
const struct rte_flow_item_eth *spec = item->spec;
const struct rte_flow_item_eth *mask = item->mask;
- struct mlx5_flow_parse *parser = (struct mlx5_flow_parse *)data;
+ struct mlx5_flow_parse *parser = data->parser;
const unsigned int eth_size = sizeof(struct ibv_flow_spec_eth);
struct ibv_flow_spec_eth eth = {
.type = parser->inner | IBV_FLOW_SPEC_ETH,
@@ -1315,11 +1322,11 @@ mlx5_flow_create_eth(const struct rte_flow_item *item,
static int
mlx5_flow_create_vlan(const struct rte_flow_item *item,
const void *default_mask,
- void *data)
+ struct mlx5_flow_data *data)
{
const struct rte_flow_item_vlan *spec = item->spec;
const struct rte_flow_item_vlan *mask = item->mask;
- struct mlx5_flow_parse *parser = (struct mlx5_flow_parse *)data;
+ struct mlx5_flow_parse *parser = data->parser;
struct ibv_flow_spec_eth *eth;
const unsigned int eth_size = sizeof(struct ibv_flow_spec_eth);
@@ -1358,11 +1365,11 @@ mlx5_flow_create_vlan(const struct rte_flow_item *item,
static int
mlx5_flow_create_ipv4(const struct rte_flow_item *item,
const void *default_mask,
- void *data)
+ struct mlx5_flow_data *data)
{
const struct rte_flow_item_ipv4 *spec = item->spec;
const struct rte_flow_item_ipv4 *mask = item->mask;
- struct mlx5_flow_parse *parser = (struct mlx5_flow_parse *)data;
+ struct mlx5_flow_parse *parser = data->parser;
unsigned int ipv4_size = sizeof(struct ibv_flow_spec_ipv4_ext);
struct ibv_flow_spec_ipv4_ext ipv4 = {
.type = parser->inner | IBV_FLOW_SPEC_IPV4_EXT,
@@ -1413,11 +1420,11 @@ mlx5_flow_create_ipv4(const struct rte_flow_item *item,
static int
mlx5_flow_create_ipv6(const struct rte_flow_item *item,
const void *default_mask,
- void *data)
+ struct mlx5_flow_data *data)
{
const struct rte_flow_item_ipv6 *spec = item->spec;
const struct rte_flow_item_ipv6 *mask = item->mask;
- struct mlx5_flow_parse *parser = (struct mlx5_flow_parse *)data;
+ struct mlx5_flow_parse *parser = data->parser;
unsigned int ipv6_size = sizeof(struct ibv_flow_spec_ipv6);
struct ibv_flow_spec_ipv6 ipv6 = {
.type = parser->inner | IBV_FLOW_SPEC_IPV6,
@@ -1472,11 +1479,11 @@ mlx5_flow_create_ipv6(const struct rte_flow_item *item,
static int
mlx5_flow_create_udp(const struct rte_flow_item *item,
const void *default_mask,
- void *data)
+ struct mlx5_flow_data *data)
{
const struct rte_flow_item_udp *spec = item->spec;
const struct rte_flow_item_udp *mask = item->mask;
- struct mlx5_flow_parse *parser = (struct mlx5_flow_parse *)data;
+ struct mlx5_flow_parse *parser = data->parser;
unsigned int udp_size = sizeof(struct ibv_flow_spec_tcp_udp);
struct ibv_flow_spec_tcp_udp udp = {
.type = parser->inner | IBV_FLOW_SPEC_UDP,
@@ -1521,11 +1528,11 @@ mlx5_flow_create_udp(const struct rte_flow_item *item,
static int
mlx5_flow_create_tcp(const struct rte_flow_item *item,
const void *default_mask,
- void *data)
+ struct mlx5_flow_data *data)
{
const struct rte_flow_item_tcp *spec = item->spec;
const struct rte_flow_item_tcp *mask = item->mask;
- struct mlx5_flow_parse *parser = (struct mlx5_flow_parse *)data;
+ struct mlx5_flow_parse *parser = data->parser;
unsigned int tcp_size = sizeof(struct ibv_flow_spec_tcp_udp);
struct ibv_flow_spec_tcp_udp tcp = {
.type = parser->inner | IBV_FLOW_SPEC_TCP,
@@ -1570,11 +1577,11 @@ mlx5_flow_create_tcp(const struct rte_flow_item *item,
static int
mlx5_flow_create_vxlan(const struct rte_flow_item *item,
const void *default_mask,
- void *data)
+ struct mlx5_flow_data *data)
{
const struct rte_flow_item_vxlan *spec = item->spec;
const struct rte_flow_item_vxlan *mask = item->mask;
- struct mlx5_flow_parse *parser = (struct mlx5_flow_parse *)data;
+ struct mlx5_flow_parse *parser = data->parser;
unsigned int size = sizeof(struct ibv_flow_spec_tunnel);
struct ibv_flow_spec_tunnel vxlan = {
.type = parser->inner | IBV_FLOW_SPEC_VXLAN_TUNNEL,
@@ -1605,10 +1612,11 @@ mlx5_flow_create_vxlan(const struct rte_flow_item *item,
* before will also match this rule.
* To avoid such situation, VNI 0 is currently refused.
*/
- if (!vxlan.val.tunnel_id) {
- rte_errno = EINVAL;
- return -rte_errno;
- }
+ if (!vxlan.val.tunnel_id)
+ return rte_flow_error_set(data->error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "VxLAN vni cannot be 0");
mlx5_flow_create_copy(parser, &vxlan, size);
return 0;
}
--
2.11.0
next prev parent reply other threads:[~2018-06-05 0:38 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-05 0:27 [dpdk-stable] [PATCH v2 00/67] net/mlx5: backport patches for v17.11.3 LTS Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 01/67] net/mlx5: remove get priv internal function Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 02/67] net/mlx4: store RSS hash result in mbufs Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 03/67] net/mlx5: fix synchronization on polling Rx completions Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 04/67] net/mlx5: fix allocation when no memory on device NUMA node Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 05/67] net/mlx5: fix flow director conversion Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 06/67] net/mlx5: fix reception of multiple MAC addresses Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 07/67] net/mlx5: fix secondary process mempool registration Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 08/67] net/mlx5: remove assert un-accessible from secondary process Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 09/67] net/mlx5: warn for unsuccessful memory registration Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 10/67] net/mlx5: map UAR address around huge pages Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 11/67] net/mlx4: fix single port configuration Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 12/67] net/mlx4: fix broadcast Rx Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 13/67] net/mlx4: fix removal detection of stopped port Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 14/67] net/mlx5: fix CRC strip capability query Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 15/67] net/mlx5: fix close after start failure Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 16/67] net/mlx: control netdevices through ioctl only Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 17/67] net/mlx5: fix disabling Tx packet inlining Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 18/67] net/mlx5: fix sriov flag Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 19/67] net/mlx5: name parameters in function prototypes Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 20/67] net/mlx5: mark parameters with unused attribute Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 21/67] net/mlx5: normalize function prototypes Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 22/67] net/mlx5: add missing function documentation Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 23/67] net/mlx5: remove useless empty lines Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 24/67] net/mlx5: remove control path locks Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 25/67] net/mlx5: prefix all functions with mlx5 Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 26/67] net/mlx5: change non failing function return values Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 27/67] net/mlx5: standardize on negative errno values Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 28/67] net/mlx5: use port id in PMD log Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 29/67] net/mlx5: use dynamic logging Yongseok Koh
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 30/67] net/mlx5: remove kernel version check Yongseok Koh
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 31/67] net/mlx5: change pkt burst select function prototype Yongseok Koh
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 32/67] net/mlx5: fix link status behavior Yongseok Koh
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 33/67] net/mlx5: fix link status to use wait to complete Yongseok Koh
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 34/67] net/mlx5: change tunnel flow priority Yongseok Koh
2018-06-05 0:38 ` Yongseok Koh [this message]
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 36/67] net/mlx5: refuse empty VLAN flow specification Yongseok Koh
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 37/67] net/mlx5: fix icc build Yongseok Koh
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 38/67] net/mlx5: setup RSS regardless of queue count Yongseok Koh
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 39/67] net/mlx5: enforce RSS key length limitation Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 40/67] net/mlx5: fix RSS key length query Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 41/67] net/mlx4: fix a typo in header file Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 42/67] net/mlx5: remove 32-bit support Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 43/67] net/mlx5: remove excessive data prefetch Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 44/67] net/mlx5: fix link status initialization Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 45/67] net/mlx4: fix RSS resource leak in case of error Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 46/67] net/mlx5: fix RSS flow action bounds check Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 47/67] net/mlx5: fix invalid flow item check Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 48/67] net/mlx5: split L3/L4 in flow director Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 49/67] net/mlx5: fix flow director mask Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 50/67] net/mlx5: fix flow director rule deletion crash Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 51/67] net/mlx4: fix Rx resource leak in case of error Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 52/67] net/mlx5: fix ethtool link setting call order Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 53/67] net/mlx5: fix socket connection return value Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 54/67] net/mlx5: add data-plane debug message macro Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 55/67] net/mlx5: fix probe return value polarity Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 56/67] net/mlx5: fix flow validation Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 57/67] net/mlx4: fix UDP flow rule limitation enforcement Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 58/67] net/mlx5: fix double free on error handling Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 59/67] net/mlx5: fix resource leak in case of error Yongseok Koh
2018-06-05 0:41 ` [dpdk-stable] [PATCH v2 60/67] net/mlx5: fix calculation of Tx TSO inline room size Yongseok Koh
2018-06-05 0:41 ` [dpdk-stable] [PATCH v2 61/67] net/mlx5: change device reference for secondary process Yongseok Koh
2018-06-05 0:41 ` [dpdk-stable] [PATCH v2 62/67] net/mlx4: avoid constant recreations in function Yongseok Koh
2018-06-05 0:41 ` [dpdk-stable] [PATCH v2 63/67] net/mlx5: fix flow director drop rule deletion crash Yongseok Koh
2018-06-05 0:41 ` [dpdk-stable] [PATCH v2 64/67] net/mlx5: fix build with clang on ARM Yongseok Koh
2018-06-05 0:41 ` [dpdk-stable] [PATCH v2 65/67] net/mlx5: fix count in xstats Yongseok Koh
2018-06-05 0:41 ` [dpdk-stable] [PATCH v2 66/67] net: add IPv6 header fields macros Yongseok Koh
2018-06-05 0:41 ` [dpdk-stable] [PATCH v2 67/67] net/mlx5: fix IPv6 header fields Yongseok Koh
2018-06-08 15:25 ` [dpdk-stable] [PATCH v2 00/67] net/mlx5: backport patches for v17.11.3 LTS Yuanhan Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180605003811.14448-6-yskoh@mellanox.com \
--to=yskoh@mellanox.com \
--cc=adrien.mazarguil@6wind.com \
--cc=nelio.laranjeiro@6wind.com \
--cc=shahafs@mellanox.com \
--cc=stable@dpdk.org \
--cc=yliu@fridaylinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).