From patchwork Fri Apr 13 15:28:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?N=C3=A9lio_Laranjeiro?= X-Patchwork-Id: 38055 X-Patchwork-Delegate: shahafs@mellanox.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BA8F51C687; Fri, 13 Apr 2018 17:28:43 +0200 (CEST) Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by dpdk.org (Postfix) with ESMTP id DBC9F1C679 for ; Fri, 13 Apr 2018 17:28:38 +0200 (CEST) Received: by mail-wr0-f194.google.com with SMTP id u11so9138291wri.12 for ; Fri, 13 Apr 2018 08:28:38 -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=C7FJ9Yj5DX5b1ZK3FqrcqzHOLbW68xll9O8DOdu1m6U=; b=ISvmFZ3YioyBcdhSxElLHd5+HoQk9kT0BTzI3VtPM8IZxGfffs77gQ3XmHU/f1iXYE GcOpoc/SQaWx2wsX9OgKtLTvdH1+r3dFcsx9IiBNzSMP0dTy+YI5Nqo4+tgyCWmmvSwC zHXusk1C4Bh6gEiczCOuvaECf51ZVYYXu/pyXgXfEatt2D04ubAVMlKZx57zkOmdUeWt MmW7ZAjPrgcnd+pMECXLf5F2rwR5Z86uksY75PU4U/NLD8YP/+wYvQmYgZhgSC6xtKoH GRHb7q1cEnxc+zhTPffTe9UOTWFwxxf8HSzD6DHMvkNsy+/uUP6NdxcuR6pcFat06uau aMCg== 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=C7FJ9Yj5DX5b1ZK3FqrcqzHOLbW68xll9O8DOdu1m6U=; b=R+3CgcUS/iueh3AuIEbAaMlshx6BoWLeo+0z75/c3mN8Y68fLNnJy5WS+HNCzhqyvB Kx3fxJGUnxVYyYDO9GPd9FLYuQJja4MxXIjQJxyGd1sp1aml/WIIRUKuZtt8uphFLwNF J3/co41csgzP4yl+VQRlqVVGAbV8SJ0Pe/YMfnQcOvLziU8jmpnD7awKWppuuPfsLqql IFU6i7w8zVbjSIFFPlHZMs+PQt1k0chyNdX6X5cdgw4TwEPsSX+ozm7vpaSZ1D1UGkMX osLdkBMrQLddmJKPrc6THSPBrmZXwPmmvu5uBNxcAygCsseT9HWLHOh8xvEIRSuCbF4r V/Sg== X-Gm-Message-State: ALQs6tA40hap778DjXrruhkTksUzKM9ycDlv5aBbD/JjYZFGBqPN4TMP CzyI6B1uMqW/lEqLlCbnY4n43kKEOg== X-Google-Smtp-Source: AIpwx4+IbEDsl+24Fgn8w71pmBG2LFAUHwa/Zodr+gt+IEM50Jrt8k92WhhlDl7LzG0UwQLnfR7MqA== X-Received: by 10.28.53.194 with SMTP id c185mr4336343wma.27.1523633318316; Fri, 13 Apr 2018 08:28:38 -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 g75sm3002957wmc.47.2018.04.13.08.28.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Apr 2018 08:28:37 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org, Yongseok Koh Cc: Adrien Mazarguil , stable@dpdk.org Date: Fri, 13 Apr 2018 17:28:50 +0200 Message-Id: <0e9761c7f93ee6277f2b4fbcd2260470d9c7d3fc.1523632978.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 2/2] net/mlx5: fix flow director mask X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 | 63 ++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index acaa5f318..8f3234084 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.ip4_flow.src_ip, - .dst_addr = input->flow.ip4_flow.dst_ip, - .time_to_live = input->flow.ip4_flow.ttl, - .type_of_service = input->flow.ip4_flow.tos, - .next_proto_id = input->flow.ip4_flow.proto, + .src_addr = input->flow.ip4_flow.src_ip & + mask->ipv4_mask.src_ip, + .dst_addr = input->flow.ip4_flow.dst_ip & + mask->ipv4_mask.dst_ip, + .time_to_live = input->flow.ip4_flow.ttl & + mask->ipv4_mask.ttl, + .type_of_service = input->flow.ip4_flow.tos & + mask->ipv4_mask.ttl, + .next_proto_id = input->flow.ip4_flow.proto & + mask->ipv4_mask.proto, }; attributes->items[1] = (struct rte_flow_item){ .type = RTE_FLOW_ITEM_TYPE_IPV4, @@ -2717,15 +2725,20 @@ mlx5_fdir_filter_convert(struct rte_eth_dev *dev, case RTE_ETH_FLOW_NONFRAG_IPV6_TCP: case RTE_ETH_FLOW_NONFRAG_IPV6_OTHER: attributes->l3.ipv6.hdr = (struct ipv6_hdr){ - .hop_limits = input->flow.udp6_flow.ip.hop_limits, - .proto = input->flow.udp6_flow.ip.proto, + .hop_limits = input->flow.ipv6_flow.hop_limits, + .proto = input->flow.ipv6_flow.proto, }; - memcpy(attributes->l3.ipv6.hdr.src_addr, - input->flow.ipv6_flow.src_ip, - RTE_DIM(attributes->l3.ipv6.hdr.src_addr)); - memcpy(attributes->l3.ipv6.hdr.dst_addr, - input->flow.ipv6_flow.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.ipv6_flow.src_ip[i] & + mask->ipv6_mask.src_ip[i]; + attributes->l3.ipv6.hdr.dst_addr[i] = + input->flow.ipv6_flow.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,