From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by dpdk.org (Postfix) with ESMTP id 1E2541B893 for ; Thu, 12 Apr 2018 16:31:35 +0200 (CEST) Received: by mail-wr0-f195.google.com with SMTP id u11so5326007wri.12 for ; Thu, 12 Apr 2018 07:31:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=CHHLq+EfbZl8uyHR3Gq4BEXF/jctkzYuvbrlb2bIxKY=; b=ovjjHgXtqu79xdphDhirak98m10+wQjAt8NHOmDikqNRSVXOKlhjMYjK/RBvT0dXn9 Z9/Y2SxA/bRXEmtvO00z8n3Af+sJqBzk6UR5/VpTq05hX9Ox6/G+beMpQJc0pDwPMGGa xk4zI3XiFNyzpy0Fkaj/T2cLY1z/FU/8Dwt1mptYnXw8oVom41lHLFhKQ8pThQQFeK3z zZG5MWmVRx4hqhBq8w6FTlyR7PwvaA+S6zzxcxndHYMO1DXYwAPvswB9hek8vV0hk2do IaJaHc2pjG+gTnT4hI7LgWKhHOyOBOgdFth3Prl431H8oPEhkwx7hWfixpze2NqsqWPB gUzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=CHHLq+EfbZl8uyHR3Gq4BEXF/jctkzYuvbrlb2bIxKY=; b=Kr34MuL9xFI6V4UXr82oJTLRemkTfyR+qVJFPK2yz1t910/DdcNRa1kuGJhbqrOt7O PefNlFzdLe1box+PKUzlxtFm92hw7zssc3lWf5Nd3DvnmSqCSS0Zqz6xKdvusT2yy7cE QgZwONOZIPrJg4efYW0jcyiGyz01GtA9eBAlnkHo+bd86kuOY6OL7sifwAoDfRIfBMmw mcKdQF5GJouXmh76AmtGzxQSjhpOfYuY8u63K4HW5SdGwSwcDFvjKYUD2+d7eENB+79k 5uVode5+6bcGhknYy03mWwlJ7UMjxADOAMDHP4SWoOaiqhDTkEbftteJBTBRD9XuwJ7h cGMA== X-Gm-Message-State: ALQs6tChBsbcPwv9qOdFL5+yPsko/3pPFP2JNqWBYy9q4o0MHBdmb1wr PCbniEdgTQwjZVWQlb2h6Nf5 X-Google-Smtp-Source: AIpwx48Vv8C/kuhoZ2AmF2gTQevKHTK6w9KPPsplND0S/Fl4WUkeQVwomQStp+Q3ih9DoOi7prN7Ow== X-Received: by 10.223.187.138 with SMTP id q10mr947264wrg.62.1523543494838; Thu, 12 Apr 2018 07:31:34 -0700 (PDT) Received: from laranjeiro-vm.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id t142sm4104471wmt.12.2018.04.12.07.31.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Apr 2018 07:31:34 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org, Yongseok Koh Cc: Adrien Mazarguil , stable@dpdk.org Date: Thu, 12 Apr 2018 16:31:46 +0200 Message-Id: <6ca95f37bf3d000532e57536149619cd9544f096.1523543393.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-stable] [PATCH 2/2] net/mlx5: fix flow director mask X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Apr 2018 14:31:35 -0000 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 Acked-by: Adrien Mazarguil --- 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