From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by dpdk.org (Postfix) with ESMTP id 477C91B569 for ; Thu, 12 Jul 2018 11:31:32 +0200 (CEST) Received: by mail-wm0-f68.google.com with SMTP id v128-v6so4942245wme.5 for ; Thu, 12 Jul 2018 02:31:32 -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; bh=cKaXDoHr9FbGYEvyIH1bvNtIzTHW/cUuZCkYUi2cv1M=; b=tWF1PkpTcNdbu5cFaFhetkbCX86zYC9Xp8Im3UHR8L/kBBDHu9H+NZuExKpRZN4OVO KHQsUwofpfl6HIkTfGM5uCU0tjFwduxJlQVA9cocKPQpIsCIn2IVpp68/xmkh8zxdFrs CN124oZiYtDCxFLI6sX+vuHg2YV90RB3LJOY8AsAKmWNEzPBjVvYyFhylLCEVF0DwNAp TfY53SvFu1aAUWG12giIKATVaZMWcIcJFApyGV6A+z/tSq7l2fgoUHXHdb4hhc87tnMC Z2ap04YEaroWQMKAnUOSPwq0yvzVk4sVmeTz6EsHmjb7X2Xrb/Uvth/dKHzzHjT5ixHT 7ZOQ== 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; bh=cKaXDoHr9FbGYEvyIH1bvNtIzTHW/cUuZCkYUi2cv1M=; b=Gs/9yvHWxUJPfpGrSGG/67seH7a4QX84K3d3iSJsqunVzmPIsLR8gQoPNWfXzG7qNE grbeodf4p3hd7PUXHkakzCXM94DOcrgM9im8hVW5eTrR3/B/cTEXByIqWyOV68/W0KwY T0UZobPGqwC9iBx50+eWFxiC1Y8Hape9YpOJRwJgowknLKVOq2eacuUOPOdB2GRgfD2a o1PAO5RTMf3LQoXjY68W8Mt7Feps85GPcbj7tRWvFuBCBdpanKx9DAVDZeGPPVnlMywo Rr4PQVcupn0vpq/Rx5svZavJVLgSZdUQ0ahOBmU/6RV/2Qq7EWy/3szI3/XlhpvMsvh5 t1Ig== X-Gm-Message-State: AOUpUlEK1Z4i3+wA4pe0Xd+9rMwVS5PBgXfFtpAJNgELzZmvdv3TZffL UM9vkUc8HDmWzcZ4hlekC43wbRouLA== X-Google-Smtp-Source: AAOMgpfQyKU3IPQRgfW0QfdSoWtQ5fa7MP2tZLoaNdZhjfk/pllodNFhlkfB40ZK/vXWwc+OzdL2nw== X-Received: by 2002:a1c:b6d6:: with SMTP id g205-v6mr925293wmf.17.1531387891707; Thu, 12 Jul 2018 02:31:31 -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 s2-v6sm18717603wrn.75.2018.07.12.02.31.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jul 2018 02:31:31 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org, Yongseok Koh Cc: Adrien Mazarguil Date: Thu, 12 Jul 2018 11:30:54 +0200 Message-Id: X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v4 08/21] net/mlx5: add flow IPv4 item 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: , X-List-Received-Date: Thu, 12 Jul 2018 09:31:32 -0000 Signed-off-by: Nelio Laranjeiro Acked-by: Yongseok Koh --- drivers/net/mlx5/mlx5_flow.c | 90 ++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 659979283..c05b8498d 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -506,6 +506,93 @@ mlx5_flow_item_vlan(const struct rte_flow_item *item, struct rte_flow *flow, return size; } +/** + * Convert the @p item into a Verbs specification after ensuring the NIC + * will understand and process it correctly. + * If the necessary size for the conversion is greater than the @p flow_size, + * nothing is written in @p flow, the validation is still performed. + * + * @param[in] item + * Item specification. + * @param[in, out] flow + * Pointer to flow structure. + * @param[in] flow_size + * Size in bytes of the available space in @p flow, if too small, nothing is + * written. + * @param[out] error + * Pointer to error structure. + * + * @return + * On success the number of bytes consumed/necessary, if the returned value + * is lesser or equal to @p flow_size, the @p item has fully been converted, + * otherwise another call with this returned memory size should be done. + * On error, a negative errno value is returned and rte_errno is set. + */ +static int +mlx5_flow_item_ipv4(const struct rte_flow_item *item, struct rte_flow *flow, + const size_t flow_size, struct rte_flow_error *error) +{ + const struct rte_flow_item_ipv4 *spec = item->spec; + const struct rte_flow_item_ipv4 *mask = item->mask; + const struct rte_flow_item_ipv4 nic_mask = { + .hdr = { + .src_addr = RTE_BE32(0xffffffff), + .dst_addr = RTE_BE32(0xffffffff), + .type_of_service = 0xff, + .next_proto_id = 0xff, + }, + }; + unsigned int size = sizeof(struct ibv_flow_spec_ipv4_ext); + struct ibv_flow_spec_ipv4_ext ipv4 = { + .type = IBV_FLOW_SPEC_IPV4_EXT, + .size = size, + }; + int ret; + + if (flow->layers & MLX5_FLOW_LAYER_OUTER_L3) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "multiple L3 layers not supported"); + else if (flow->layers & MLX5_FLOW_LAYER_OUTER_L4) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "L3 cannot follow an L4 layer."); + if (!mask) + mask = &rte_flow_item_ipv4_mask; + ret = mlx5_flow_item_acceptable + (item, (const uint8_t *)mask, + (const uint8_t *)&nic_mask, + sizeof(struct rte_flow_item_ipv4), error); + if (ret < 0) + return ret; + flow->layers |= MLX5_FLOW_LAYER_OUTER_L3_IPV4; + if (size > flow_size) + return size; + if (spec) { + ipv4.val = (struct ibv_flow_ipv4_ext_filter){ + .src_ip = spec->hdr.src_addr, + .dst_ip = spec->hdr.dst_addr, + .proto = spec->hdr.next_proto_id, + .tos = spec->hdr.type_of_service, + }; + ipv4.mask = (struct ibv_flow_ipv4_ext_filter){ + .src_ip = mask->hdr.src_addr, + .dst_ip = mask->hdr.dst_addr, + .proto = mask->hdr.next_proto_id, + .tos = mask->hdr.type_of_service, + }; + /* Remove unwanted bits from values. */ + ipv4.val.src_ip &= ipv4.mask.src_ip; + ipv4.val.dst_ip &= ipv4.mask.dst_ip; + ipv4.val.proto &= ipv4.mask.proto; + ipv4.val.tos &= ipv4.mask.tos; + } + mlx5_flow_spec_verbs_add(flow, &ipv4, size); + return size; +} + /** * Convert the @p pattern into a Verbs specifications after ensuring the NIC * will understand and process it correctly. @@ -551,6 +638,9 @@ mlx5_flow_items(const struct rte_flow_item pattern[], case RTE_FLOW_ITEM_TYPE_VLAN: ret = mlx5_flow_item_vlan(pattern, flow, remain, error); break; + case RTE_FLOW_ITEM_TYPE_IPV4: + ret = mlx5_flow_item_ipv4(pattern, flow, remain, error); + break; default: return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, -- 2.18.0