DPDK patches and discussions
 help / color / mirror / Atom feed
From: Ori Kam <orika@mellanox.com>
To: yskoh@mellanox.com, shahafs@mellanox.com
Cc: dev@dpdk.org, orika@mellanox.com
Subject: [dpdk-dev] [PATCH v2] net/mlx5: fix E-Switch flow without port item
Date: Thu, 25 Apr 2019 12:20:55 +0000	[thread overview]
Message-ID: <1556194855-12679-1-git-send-email-orika@mellanox.com> (raw)
Message-ID: <20190425122055.T9m9oOTqlkPY0OsOFkKrhqKSdPRJ9iqB_gHF5ku1iDs@z> (raw)
In-Reply-To: <1556018356-86706-1-git-send-email-orika@mellanox.com>

When creating a flow rule without the port_id pattern item, always the
PF was selected.

This commit fixes this issue, if no port_id pattern item is available
then we use the port that the flow was created on as source port.

Fixes: 822fb3195348 ("net/mlx5: add port id item to Direct Verbs")

Signed-off-by: Ori Kam <orika@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index c2a2fc6..b3f802d 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -3623,6 +3623,8 @@ struct field_modify_info modify_tcp[] = {
 	union flow_dv_attr flow_attr = { .attr = 0 };
 	struct mlx5_flow_dv_tag_resource tag_resource;
 	uint32_t modify_action_position = UINT32_MAX;
+	void *match_mask = matcher.mask.buf;
+	void *match_value = dev_flow->dv.value.buf;
 
 	flow->group = attr->group;
 	if (attr->transfer)
@@ -3895,23 +3897,8 @@ struct field_modify_info modify_tcp[] = {
 	}
 	dev_flow->dv.actions_n = actions_n;
 	flow->actions = action_flags;
-	if (attr->ingress && !attr->transfer &&
-	    (priv->representor || priv->master)) {
-		/* It was validated - we support unidirection flows only. */
-		assert(!attr->egress);
-		/*
-		 * Add matching on source vport index only
-		 * for ingress rules in E-Switch configurations.
-		 */
-		flow_dv_translate_item_source_vport(matcher.mask.buf,
-						    dev_flow->dv.value.buf,
-						    priv->vport_id,
-						    0xffff);
-	}
 	for (; items->type != RTE_FLOW_ITEM_TYPE_END; items++) {
 		int tunnel = !!(item_flags & MLX5_FLOW_LAYER_TUNNEL);
-		void *match_mask = matcher.mask.buf;
-		void *match_value = dev_flow->dv.value.buf;
 
 		switch (items->type) {
 		case RTE_FLOW_ITEM_TYPE_PORT_ID:
@@ -4018,6 +4005,19 @@ struct field_modify_info modify_tcp[] = {
 		}
 		item_flags |= last_item;
 	}
+	/*
+	 * In case of ingress traffic when E-Switch mode is enabled,
+	 * we have two cases where we need to set the source port manually.
+	 * The first one, is in case of Nic steering rule, and the second is
+	 * E-Switch rule where no port_id item was found. In both cases
+	 * the source port is set according the current port in use.
+	 */
+	if ((attr->ingress && !(item_flags & MLX5_FLOW_ITEM_PORT_ID)) &&
+	    (priv->representor || priv->master)) {
+		if (flow_dv_translate_item_port_id(dev, match_mask,
+						   match_value, NULL))
+			return -rte_errno;
+	}
 	assert(!flow_dv_check_valid_spec(matcher.mask.buf,
 					 dev_flow->dv.value.buf));
 	dev_flow->layers = item_flags;
-- 
1.8.3.1


  parent reply	other threads:[~2019-04-25 12:21 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-23 11:19 [dpdk-dev] [PATCH] " Ori Kam
2019-04-23 11:19 ` Ori Kam
2019-04-23 21:03 ` Yongseok Koh
2019-04-23 21:03   ` Yongseok Koh
2019-04-25  7:02   ` Ori Kam
2019-04-25  7:02     ` Ori Kam
2019-04-25 17:53     ` Yongseok Koh
2019-04-25 17:53       ` Yongseok Koh
2019-04-25 12:20 ` Ori Kam [this message]
2019-04-25 12:20   ` [dpdk-dev] [PATCH v2] " Ori Kam
2019-04-25 17:54   ` Yongseok Koh
2019-04-25 17:54     ` Yongseok Koh
2019-05-01  6:09     ` Shahaf Shuler
2019-05-01  6:09       ` Shahaf Shuler

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=1556194855-12679-1-git-send-email-orika@mellanox.com \
    --to=orika@mellanox.com \
    --cc=dev@dpdk.org \
    --cc=shahafs@mellanox.com \
    --cc=yskoh@mellanox.com \
    /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).