All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
To: dev@dpdk.org, Yongseok Koh <yskoh@mellanox.com>
Cc: Adrien Mazarguil <adrien.mazarguil@6wind.com>, stable@dpdk.org
Subject: [PATCH 2/2] net/mlx5: fix flow director mask
Date: Thu, 12 Apr 2018 16:31:46 +0200	[thread overview]
Message-ID: <6ca95f37bf3d000532e57536149619cd9544f096.1523543393.git.nelio.laranjeiro@6wind.com> (raw)
In-Reply-To: <cover.1523543393.git.nelio.laranjeiro@6wind.com>
In-Reply-To: <cover.1523543393.git.nelio.laranjeiro@6wind.com>

During the transition to resurrect flow director on top of rte_flow, mask
handling was removed by mistake.

Fixes: 4c3e9bcdd52e ("net/mlx5: support flow director")
Cc: stable@dpdk.org

Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Acked-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
---
 drivers/net/mlx5/mlx5_flow.c | 59 ++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 19 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 7ba643b83..5e75afa7f 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -2661,6 +2661,9 @@ mlx5_fdir_filter_convert(struct rte_eth_dev *dev,
 {
 	struct priv *priv = dev->data->dev_private;
 	const struct rte_eth_fdir_input *input = &fdir_filter->input;
+	const struct rte_eth_fdir_masks *mask =
+		&dev->data->dev_conf.fdir_conf.mask;
+	unsigned int i;
 
 	/* Validate queue number. */
 	if (fdir_filter->action.rx_queue >= priv->rxqs_n) {
@@ -2701,11 +2704,16 @@ mlx5_fdir_filter_convert(struct rte_eth_dev *dev,
 	case RTE_ETH_FLOW_NONFRAG_IPV4_TCP:
 	case RTE_ETH_FLOW_NONFRAG_IPV4_OTHER:
 		attributes->l3.ipv4.hdr = (struct ipv4_hdr){
-			.src_addr = input->flow.udp4_flow.ip.src_ip,
-			.dst_addr = input->flow.udp4_flow.ip.dst_ip,
-			.time_to_live = input->flow.udp4_flow.ip.ttl,
-			.type_of_service = input->flow.udp4_flow.ip.tos,
-			.next_proto_id = input->flow.udp4_flow.ip.proto,
+			.src_addr = input->flow.udp4_flow.ip.src_ip &
+				mask->ipv4_mask.src_ip,
+			.dst_addr = input->flow.udp4_flow.ip.dst_ip &
+				mask->ipv4_mask.dst_ip,
+			.time_to_live = input->flow.udp4_flow.ip.ttl &
+				mask->ipv4_mask.ttl,
+			.type_of_service = input->flow.udp4_flow.ip.tos &
+				mask->ipv4_mask.ttl,
+			.next_proto_id = input->flow.udp4_flow.ip.proto &
+				mask->ipv4_mask.proto,
 		};
 		attributes->items[1] = (struct rte_flow_item){
 			.type = RTE_FLOW_ITEM_TYPE_IPV4,
@@ -2720,12 +2728,17 @@ mlx5_fdir_filter_convert(struct rte_eth_dev *dev,
 			.hop_limits = input->flow.udp6_flow.ip.hop_limits,
 			.proto = input->flow.udp6_flow.ip.proto,
 		};
-		memcpy(attributes->l3.ipv6.hdr.src_addr,
-		       input->flow.udp6_flow.ip.src_ip,
-		       RTE_DIM(attributes->l3.ipv6.hdr.src_addr));
-		memcpy(attributes->l3.ipv6.hdr.dst_addr,
-		       input->flow.udp6_flow.ip.dst_ip,
-		       RTE_DIM(attributes->l3.ipv6.hdr.src_addr));
+
+		for (i = 0;
+		     i != RTE_DIM(attributes->l3.ipv6.hdr.src_addr);
+		     ++i) {
+			attributes->l3.ipv6.hdr.src_addr[i] =
+				input->flow.udp6_flow.ip.src_ip[i] &
+				mask->ipv6_mask.src_ip[i];
+			attributes->l3.ipv6.hdr.dst_addr[i] =
+				input->flow.udp6_flow.ip.dst_ip[i] &
+				mask->ipv6_mask.dst_ip[i];
+		}
 		attributes->items[1] = (struct rte_flow_item){
 			.type = RTE_FLOW_ITEM_TYPE_IPV6,
 			.spec = &attributes->l3,
@@ -2742,8 +2755,10 @@ mlx5_fdir_filter_convert(struct rte_eth_dev *dev,
 	switch (fdir_filter->input.flow_type) {
 	case RTE_ETH_FLOW_NONFRAG_IPV4_UDP:
 		attributes->l4.udp.hdr = (struct udp_hdr){
-			.src_port = input->flow.udp4_flow.src_port,
-			.dst_port = input->flow.udp4_flow.dst_port,
+			.src_port = input->flow.udp4_flow.src_port &
+				mask->src_port_mask,
+			.dst_port = input->flow.udp4_flow.dst_port &
+				mask->dst_port_mask,
 		};
 		attributes->items[2] = (struct rte_flow_item){
 			.type = RTE_FLOW_ITEM_TYPE_UDP,
@@ -2753,8 +2768,10 @@ mlx5_fdir_filter_convert(struct rte_eth_dev *dev,
 		break;
 	case RTE_ETH_FLOW_NONFRAG_IPV4_TCP:
 		attributes->l4.tcp.hdr = (struct tcp_hdr){
-			.src_port = input->flow.tcp4_flow.src_port,
-			.dst_port = input->flow.tcp4_flow.dst_port,
+			.src_port = input->flow.tcp4_flow.src_port &
+				mask->src_port_mask,
+			.dst_port = input->flow.tcp4_flow.dst_port &
+				mask->dst_port_mask,
 		};
 		attributes->items[2] = (struct rte_flow_item){
 			.type = RTE_FLOW_ITEM_TYPE_TCP,
@@ -2764,8 +2781,10 @@ mlx5_fdir_filter_convert(struct rte_eth_dev *dev,
 		break;
 	case RTE_ETH_FLOW_NONFRAG_IPV6_UDP:
 		attributes->l4.udp.hdr = (struct udp_hdr){
-			.src_port = input->flow.udp6_flow.src_port,
-			.dst_port = input->flow.udp6_flow.dst_port,
+			.src_port = input->flow.udp6_flow.src_port &
+				mask->src_port_mask,
+			.dst_port = input->flow.udp6_flow.dst_port &
+				mask->dst_port_mask,
 		};
 		attributes->items[2] = (struct rte_flow_item){
 			.type = RTE_FLOW_ITEM_TYPE_UDP,
@@ -2775,8 +2794,10 @@ mlx5_fdir_filter_convert(struct rte_eth_dev *dev,
 		break;
 	case RTE_ETH_FLOW_NONFRAG_IPV6_TCP:
 		attributes->l4.tcp.hdr = (struct tcp_hdr){
-			.src_port = input->flow.tcp6_flow.src_port,
-			.dst_port = input->flow.tcp6_flow.dst_port,
+			.src_port = input->flow.tcp6_flow.src_port &
+				mask->src_port_mask,
+			.dst_port = input->flow.tcp6_flow.dst_port &
+				mask->dst_port_mask,
 		};
 		attributes->items[2] = (struct rte_flow_item){
 			.type = RTE_FLOW_ITEM_TYPE_TCP,
-- 
2.17.0

  parent reply	other threads:[~2018-04-12 14:31 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-12 14:31 [PATCH 0/2] net/mlx5: fix flow director mask Nelio Laranjeiro
2018-04-12 14:31 ` [PATCH 1/2] net/mlx5: split L3/L4 in flow director Nelio Laranjeiro
2018-04-12 14:31 ` Nelio Laranjeiro [this message]
2018-04-13 15:28 ` [PATCH v2 0/2] net/mlx5: fix flow director mask Nelio Laranjeiro
2018-04-17  9:01   ` [PATCH v3 " Nelio Laranjeiro
2018-04-23  5:39     ` Shahaf Shuler
2018-04-17  9:01   ` [PATCH v3 1/2] net/mlx5: split L3/L4 in flow director Nelio Laranjeiro
2018-04-17  9:01   ` [PATCH v3 2/2] net/mlx5: fix flow director mask Nelio Laranjeiro
2018-04-13 15:28 ` [PATCH v2 1/2] net/mlx5: split L3/L4 in flow director Nelio Laranjeiro
2018-04-13 15:28 ` [PATCH v2 2/2] net/mlx5: fix flow director mask Nelio Laranjeiro

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=6ca95f37bf3d000532e57536149619cd9544f096.1523543393.git.nelio.laranjeiro@6wind.com \
    --to=nelio.laranjeiro@6wind.com \
    --cc=adrien.mazarguil@6wind.com \
    --cc=dev@dpdk.org \
    --cc=stable@dpdk.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.