From patchwork Wed Jun 27 15:07:39 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: 41681 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 A002B1BFCE; Wed, 27 Jun 2018 17:07:50 +0200 (CEST) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by dpdk.org (Postfix) with ESMTP id A11661BFA1 for ; Wed, 27 Jun 2018 17:07:40 +0200 (CEST) Received: by mail-wm0-f67.google.com with SMTP id w137-v6so6257578wmw.1 for ; Wed, 27 Jun 2018 08:07:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=+5aEi82fusxWPB2LYF+Ru3mmCLox0k2PwawO5KC544Q=; b=KlHpyzYHfd6pVGhlnRXTk8lLp0zEXRrWDJPuNHwrjNzMXOzIMEm5GE8l2iiEYYYyXk LMhxBF2tBVr69tGc0G5igsSJlR5RiMnKaQnJzS64GIPClASXSDXukALHQi+e9wY3idM4 TLrNPoXbTKfLNSwqkYo+P9gKyXAbvPEOO8kQr5MyDYu16blJxlQpKR7BgAtAeyblVIcw LshGHwriv9lzqiLilbK9VpHLt8HVY9HPZRNRlZiTE5siv8DawJjxpxc9jNJk3oBiVk4r B1Pq/8Mcq/lxkDmK0t2fL3hTPPSw9VzXpqE+3wYI4oeuolCgyHcKZo9sJ+bBwpUuGQtg kpMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=+5aEi82fusxWPB2LYF+Ru3mmCLox0k2PwawO5KC544Q=; b=lcgBQW7tONbB5NRQFYejbwc+oGlHuNUpKvGdEIWQvMNDIVKitsd01Xq38Vmvnl/9sf aTQ5U4Pr3nG+Oy5BWnIVF/9nOQXZGjIq5riMZzjpcRpsqxcyhe8xDYQUsGyVfDCc/2OH Gh4xzwDC+u09ivBpUOr+SlStzBTliBHPwfS7kJfGcDMaxd49DTCNyXD+5QABYt68dP0P m9Gif1PbNAqnwf/NIHsTFsKbP/QpR0UKyOjm9FN1Yqq0yizmwROSbcYolAC81KTjVTXL GWFZnvfplcyF2z+b3iXXOa8+7eyurEb8pkog3T09uKR6zz6cEdF3t/0xlfynzyHS6Wja GZyw== X-Gm-Message-State: APt69E1vxG73EebKi3oHyvMxmecZO2t8MXYUJ+NZtLc/MSNJeuPXuUXb gJ6YmuIBR5fZNk6QPQU30qy7D1L5Bw== X-Google-Smtp-Source: AAOMgpcnm0xUQ3UnmOCJDjblllTBrPFDxvUFD24rrHPHrXVaPVveu5ETLtSz9d53Di8Y0glchdCQyQ== X-Received: by 2002:a1c:a88a:: with SMTP id r132-v6mr3632782wme.31.1530112060143; Wed, 27 Jun 2018 08:07:40 -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 k17-v6sm4872513wrp.19.2018.06.27.08.07.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jun 2018 08:07:39 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org, Adrien Mazarguil , Yongseok Koh Date: Wed, 27 Jun 2018 17:07:39 +0200 Message-Id: <39544c46ba7237c339e89f10480c3e24a3810754.1530111623.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 07/20] net/mlx5: add flow VLAN 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Nelio Laranjeiro --- drivers/net/mlx5/mlx5_flow.c | 123 +++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 6593eafa0..6a576ddd9 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -420,6 +420,126 @@ mlx5_flow_item_eth(const struct rte_flow_item *item, struct rte_flow *flow, return size; } +/** + * Update the VLAN tag in the Ethernet spec. + * + * @param attr[in, out] + * Pointer to Verbs attributes structure. + * @param eth[in] + * Verbs structure containing the VLAN information to copy. + */ +static void +mlx5_flow_item_vlan_update(struct ibv_flow_attr *attr, + struct ibv_flow_spec_eth *eth) +{ + unsigned int i; + enum ibv_flow_spec_type search = IBV_FLOW_SPEC_ETH; + struct ibv_spec_header *hdr = (struct ibv_spec_header *) + ((uint8_t *)attr + sizeof(struct ibv_flow_attr)); + + for (i = 0; i != attr->num_of_specs; ++i) { + if (hdr->type == search) { + struct ibv_flow_spec_eth *e = + (struct ibv_flow_spec_eth *)hdr; + + e->val.vlan_tag = eth->val.vlan_tag; + e->mask.vlan_tag = eth->mask.vlan_tag; + break; + } + hdr = (struct ibv_spec_header *)((uint8_t *)hdr + hdr->size); + } +} + +/** + * Validate VLAN layer and possibly create/modify the Verbs specification. + * + * @param item[in] + * Item specification. + * @param flow[in, out] + * Pointer to flow structure. + * @param flow_size[in] + * Size of the buffer to store the specification. + * @param error + * Pointer to error structure. + * + * @return + * size in bytes necessary for the conversion, a negative errno value + * otherwise and rte_errno is set. + */ +static int +mlx5_flow_item_vlan(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_vlan *spec = item->spec; + const struct rte_flow_item_vlan *mask = item->mask; + const struct rte_flow_item_vlan nic_mask = { + .tci = RTE_BE16(0x0fff), + }; + unsigned int size = sizeof(struct ibv_flow_spec_eth); + struct ibv_flow_spec_eth eth = { + .type = IBV_FLOW_SPEC_ETH, + .size = size, + }; + int ret; + const uint32_t lm = MLX5_FLOW_LAYER_OUTER_L3 | + MLX5_FLOW_LAYER_OUTER_L4; + const uint32_t vlanm = MLX5_FLOW_LAYER_OUTER_VLAN; + const uint32_t l2m = MLX5_FLOW_LAYER_OUTER_L2; + + if (flow->layers & vlanm) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "L2 layers already configured"); + else if ((flow->layers & lm) != 0) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, + item, + "L2 layer cannot follow L3/L4 layer"); + if (!mask) + mask = &rte_flow_item_vlan_mask; + ret = mlx5_flow_item_validate(item, (const uint8_t *)mask, + (const uint8_t *)&nic_mask, + sizeof(struct rte_flow_item_vlan), error); + if (ret) + return ret; + if (spec) { + eth.val.vlan_tag = spec->tci; + eth.mask.vlan_tag = mask->tci; + eth.val.vlan_tag &= eth.mask.vlan_tag; + eth.val.ether_type = spec->inner_type; + eth.mask.ether_type = mask->inner_type; + eth.val.ether_type &= eth.mask.ether_type; + } + /* + * From verbs perspective an empty VLAN is equivalent + * to a packet without VLAN layer. + */ + if (!eth.mask.vlan_tag) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM_SPEC, + item->spec, + "VLAN cannot be empty"); + /* Outer TPID cannot be matched. */ + if (eth.mask.ether_type) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM_SPEC, + item->spec, + "VLAN TPID matching is not" + " supported"); + if (!(flow->layers & l2m)) { + if (size <= flow_size) + mlx5_flow_spec_verbs_add(flow, ð, size); + } else { + if (flow->verbs.attr) + mlx5_flow_item_vlan_update(flow->verbs.attr, ð); + size = 0; /**< Only an update is done in eth specification. */ + } + flow->layers |= MLX5_FLOW_LAYER_OUTER_L2 | + MLX5_FLOW_LAYER_OUTER_VLAN; + return size; +} + /** * Validate items provided by the user. * @@ -453,6 +573,9 @@ mlx5_flow_items(const struct rte_flow_item items[], case RTE_FLOW_ITEM_TYPE_ETH: ret = mlx5_flow_item_eth(items, flow, remain, error); break; + case RTE_FLOW_ITEM_TYPE_VLAN: + ret = mlx5_flow_item_vlan(items, flow, remain, error); + break; default: return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM,