From patchwork Wed Jun 27 18:08:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 41727 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 8132D1C3B3; Wed, 27 Jun 2018 20:08:41 +0200 (CEST) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by dpdk.org (Postfix) with ESMTP id 8C8991C3A9 for ; Wed, 27 Jun 2018 20:08:37 +0200 (CEST) Received: by mail-wr0-f196.google.com with SMTP id h10-v6so2938493wrq.8 for ; Wed, 27 Jun 2018 11:08:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=xCuhasRte+d2yL53R27rf/D9tYfbWjgCZ9wuVC8rtkQ=; b=CX0oxoXyeiolrzaosWfX2H3/Mi3gFI6CTj78qeSA6EBzxbLjdJNDqwm9VJpQUNi2W4 ovh/3n5qn6XobZ15LwTKMdIlOLmL6zjlOlLJKm0CUo00UUzsQHxzc16yiVx6K0fhwuEZ Gyf0+hnlgDsfo3mjbN76qB3sflLK3iaTpQ27wRcWhPMKExhapiV0uyYbb4kYi6M9bBYB UBA0vKIHCVgFfYNXBmKAzu+xZxFm2sUFv5GFxtjmhTKWDdZxG94QC/GwriQ2vPMl4eGX ZK7wvpbF/5oCfL1dYOSsUfXlRBDY1aae+kL2UX9LWnfvnb2+CTd+LZdjcS8OhXGzNHFj WK8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=xCuhasRte+d2yL53R27rf/D9tYfbWjgCZ9wuVC8rtkQ=; b=UbT1QMT9ik/7TTXRyurWnMIrANjl7aMNew7bmaAzr4+6DGDbaMgIn/4fw6YvsTf48v DEzZXnHeGj9HwkRElUDpR2MbritBSLK71vuF4cRyPlNuQ8PgpwXi2z/PUTU3IuCeYZay 1PSEuyUxMkm5b6yETVpV/RtYvqDWUi6F6YkeiTkM/K9Ldi9hjpDoX9Brj66LZAu/7gEU 5Vf3QyJuCLHJZW08dU9NwVsll7ZVU0L9IPoIFk60FanlCM9tsM+UniVXff1py7uMGfQT FAGJ7zcPd6E5B7e2EmL2hK512Rj+3XAAHekmadogiMEV2yOn/aN6ZQuf4FUbiV13FRLh MrAg== X-Gm-Message-State: APt69E28BxMRCWACKfl6NejXxVGbenjbnAj/V/X9La6dQ1VF6QBafWF5 hNvAvzPGGSVRoWPSDISq91QCyu/p X-Google-Smtp-Source: AAOMgpdj/lCn4YSy/K9g3K2OJuaijFc5KhMr+6XuooiEaPJCPD9g8G8cTEMj8F/I+QjcL/g/pr86Aw== X-Received: by 2002:adf:bbc9:: with SMTP id z9-v6mr5680604wrg.183.1530122917296; Wed, 27 Jun 2018 11:08:37 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id 132-v6sm8585086wmr.33.2018.06.27.11.08.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jun 2018 11:08:36 -0700 (PDT) Date: Wed, 27 Jun 2018 20:08:20 +0200 From: Adrien Mazarguil To: Shahaf Shuler Cc: Nelio Laranjeiro , Yongseok Koh , dev@dpdk.org Message-ID: <20180627173355.4718-7-adrien.mazarguil@6wind.com> References: <20180627173355.4718-1-adrien.mazarguil@6wind.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180627173355.4718-1-adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.11.0 Subject: [dpdk-dev] [PATCH 6/6] net/mlx5: add port ID pattern item to switch flow rules 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" This enables flow rules to match traffic coming from a different DPDK port ID associated with the device (PORT_ID pattern item), mainly for the convenience of applications that want to deal with a single port ID for all flow rules associated with some physical device. Testpmd example: - Creating a flow rule on port ID 1 to consume all traffic from port ID 0 and direct it to port ID 2: flow create 1 ingress transfer pattern port_id id is 0 / end actions port_id id 2 / end Signed-off-by: Adrien Mazarguil Acked-by: Yongseok Koh --- drivers/net/mlx5/mlx5_nl_flow.c | 57 +++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_nl_flow.c b/drivers/net/mlx5/mlx5_nl_flow.c index a45d94fae..ad7a53d36 100644 --- a/drivers/net/mlx5/mlx5_nl_flow.c +++ b/drivers/net/mlx5/mlx5_nl_flow.c @@ -36,6 +36,7 @@ enum mlx5_nl_flow_trans { ATTR, PATTERN, ITEM_VOID, + ITEM_PORT_ID, ITEM_ETH, ITEM_VLAN, ITEM_IPV4, @@ -56,7 +57,7 @@ enum mlx5_nl_flow_trans { #define TRANS(...) (const enum mlx5_nl_flow_trans []){ __VA_ARGS__, INVALID, } #define PATTERN_COMMON \ - ITEM_VOID, ACTIONS + ITEM_VOID, ITEM_PORT_ID, ACTIONS #define ACTIONS_COMMON \ ACTION_VOID, ACTION_OF_POP_VLAN, ACTION_OF_PUSH_VLAN, \ ACTION_OF_SET_VLAN_VID, ACTION_OF_SET_VLAN_PCP @@ -70,6 +71,7 @@ static const enum mlx5_nl_flow_trans *const mlx5_nl_flow_trans[] = { [ATTR] = TRANS(PATTERN), [PATTERN] = TRANS(ITEM_ETH, PATTERN_COMMON), [ITEM_VOID] = TRANS(BACK), + [ITEM_PORT_ID] = TRANS(BACK), [ITEM_ETH] = TRANS(ITEM_IPV4, ITEM_IPV6, ITEM_VLAN, PATTERN_COMMON), [ITEM_VLAN] = TRANS(ITEM_IPV4, ITEM_IPV6, PATTERN_COMMON), [ITEM_IPV4] = TRANS(ITEM_TCP, ITEM_UDP, PATTERN_COMMON), @@ -89,6 +91,7 @@ static const enum mlx5_nl_flow_trans *const mlx5_nl_flow_trans[] = { /** Empty masks for known item types. */ static const union { + struct rte_flow_item_port_id port_id; struct rte_flow_item_eth eth; struct rte_flow_item_vlan vlan; struct rte_flow_item_ipv4 ipv4; @@ -99,6 +102,7 @@ static const union { /** Supported masks for known item types. */ static const struct { + struct rte_flow_item_port_id port_id; struct rte_flow_item_eth eth; struct rte_flow_item_vlan vlan; struct rte_flow_item_ipv4 ipv4; @@ -106,6 +110,9 @@ static const struct { struct rte_flow_item_tcp tcp; struct rte_flow_item_udp udp; } mlx5_nl_flow_mask_supported = { + .port_id = { + .id = 0xffffffff, + }, .eth = { .type = RTE_BE16(0xffff), .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff", @@ -260,6 +267,7 @@ mlx5_nl_flow_transpose(void *buf, const struct rte_flow_action *action; unsigned int n; uint32_t act_index_cur; + bool in_port_id_set; bool eth_type_set; bool vlan_present; bool vlan_eth_type_set; @@ -278,6 +286,7 @@ mlx5_nl_flow_transpose(void *buf, action = actions; n = 0; act_index_cur = 0; + in_port_id_set = false; eth_type_set = false; vlan_present = false; vlan_eth_type_set = false; @@ -291,6 +300,7 @@ mlx5_nl_flow_transpose(void *buf, trans: switch (trans[n++]) { union { + const struct rte_flow_item_port_id *port_id; const struct rte_flow_item_eth *eth; const struct rte_flow_item_vlan *vlan; const struct rte_flow_item_ipv4 *ipv4; @@ -392,6 +402,51 @@ mlx5_nl_flow_transpose(void *buf, goto trans; ++item; break; + case ITEM_PORT_ID: + if (item->type != RTE_FLOW_ITEM_TYPE_PORT_ID) + goto trans; + mask.port_id = mlx5_nl_flow_item_mask + (item, &rte_flow_item_port_id_mask, + &mlx5_nl_flow_mask_supported.port_id, + &mlx5_nl_flow_mask_empty.port_id, + sizeof(mlx5_nl_flow_mask_supported.port_id), error); + if (!mask.port_id) + return -rte_errno; + if (mask.port_id == &mlx5_nl_flow_mask_empty.port_id) { + in_port_id_set = 1; + ++item; + break; + } + spec.port_id = item->spec; + if (mask.port_id->id && mask.port_id->id != 0xffffffff) + return rte_flow_error_set + (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM_MASK, + mask.port_id, + "no support for partial mask on" + " \"id\" field"); + if (!mask.port_id->id) + i = 0; + else + for (i = 0; ptoi[i].ifindex; ++i) + if (ptoi[i].port_id == spec.port_id->id) + break; + if (!ptoi[i].ifindex) + return rte_flow_error_set + (error, ENODEV, RTE_FLOW_ERROR_TYPE_ITEM_SPEC, + spec.port_id, + "missing data to convert port ID to ifindex"); + tcm = mnl_nlmsg_get_payload(buf); + if (in_port_id_set && + ptoi[i].ifindex != (unsigned int)tcm->tcm_ifindex) + return rte_flow_error_set + (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM_SPEC, + spec.port_id, + "cannot match traffic for several port IDs" + " through a single flow rule"); + tcm->tcm_ifindex = ptoi[i].ifindex; + in_port_id_set = 1; + ++item; + break; case ITEM_ETH: if (item->type != RTE_FLOW_ITEM_TYPE_ETH) goto trans;