From patchwork Tue Jan 31 16:02:46 2017 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: 20097 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id C19FE1023; Tue, 31 Jan 2017 17:03:40 +0100 (CET) Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by dpdk.org (Postfix) with ESMTP id 0AB5DDE3 for ; Tue, 31 Jan 2017 17:03:37 +0100 (CET) Received: by mail-wm0-f51.google.com with SMTP id b65so85306427wmf.0 for ; Tue, 31 Jan 2017 08:03:37 -0800 (PST) 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; bh=wQsuhsZpRtR2aloEaKXpn0akw9VlxIe6GVdtownliCk=; b=FyMkMMHGEXtASyrSuoxir/0oKnd6nxT7hbXKxXr6JVG475TKgvUYPn/b/vhnWYcn1w +zM2p6vDEF+3s2pz/YznZp06xpABRyLBa6Tex0aCYoj2sLhpeCui9tyE1auqrK7ZJgZ/ KFcj4NPfW/JT2gl+xrgDfdQ4agrE9HTw/rl67CmEH27mmvYeY//5Od6A0RqftibmAfge bptnBTCFYtc6wslEI5TnzwGSA//KviXZ7J7cRD8iT8tb80AZgbV70LrtXfEe9d0fQiYd qSjQlP04Tp48oNoCc0yN9FEl9nDR/eKa5yMOG0NqKpMYjhZEr41S/IVsRH1SDnomwbHb j1Sg== 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; bh=wQsuhsZpRtR2aloEaKXpn0akw9VlxIe6GVdtownliCk=; b=BDMBXIIvzcpeyNLi75sSDB6VhoANoajveSGYFhgu35bD5fIsKqYD0diOQQiI+mU8Hl 848fCGaY3nLtmSIL+3674+GzsrRSdaRphH5wqrSo6D0dG+6vElEeDSsAyHUQ10Z7ivxr saVIfFSzZgNyV23tRMyHXtmFi0EKIFRUlyfRutbbVtMbS6EdgifKK/p11QDDMZf5beww 2SzEHzNKFA2mq00dzW2ptmcX/OaqH0jRTnJ0WDylcWyG+h19uZYYMJnntAR0NUG/ZCrQ B+TbDuPeEa6+t+5SXOu1gTLfEJ6J6GPN+rM/tp4TfKQG9IXMjknKNbaMWcoLTGzqEd3E zD7A== X-Gm-Message-State: AIkVDXJH7IvLWsq+HKWhmQDrMYWlGCf7Au81iL+d7uSKN6+lFPqj2yldtR39WKvXtXaAKc+w X-Received: by 10.28.27.14 with SMTP id b14mr18130332wmb.82.1485878616251; Tue, 31 Jan 2017 08:03:36 -0800 (PST) Received: from ping.vm.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id 33sm29010127wrd.34.2017.01.31.08.03.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 Jan 2017 08:03:35 -0800 (PST) From: Nelio Laranjeiro To: dev@dpdk.org Cc: Adrien Mazarguil Date: Tue, 31 Jan 2017 17:02:46 +0100 Message-Id: <8772a5838ed3733da6749b333375e2a6aa6ea2ad.1485878361.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.1.4 Subject: [dpdk-dev] [PATCH 1/3] net/mlx5: use flow API default masks 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" Default masks were introduced in the API after its implementation in this PMD. Signed-off-by: Nelio Laranjeiro Acked-by: Adrien Mazarguil --- drivers/net/mlx5/mlx5_flow.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 42a12e8..4917f79 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -164,6 +164,7 @@ static const struct mlx5_flow_items mlx5_flow_items[] = { .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff", .src.addr_bytes = "\xff\xff\xff\xff\xff\xff", }, + .default_mask = &rte_flow_item_eth_mask, .mask_sz = sizeof(struct rte_flow_item_eth), .convert = mlx5_flow_create_eth, .dst_sz = sizeof(struct ibv_exp_flow_spec_eth), @@ -175,6 +176,7 @@ static const struct mlx5_flow_items mlx5_flow_items[] = { .mask = &(const struct rte_flow_item_vlan){ .tci = -1, }, + .default_mask = &rte_flow_item_vlan_mask, .mask_sz = sizeof(struct rte_flow_item_vlan), .convert = mlx5_flow_create_vlan, .dst_sz = 0, @@ -191,12 +193,7 @@ static const struct mlx5_flow_items mlx5_flow_items[] = { .next_proto_id = -1, }, }, - .default_mask = &(const struct rte_flow_item_ipv4){ - .hdr = { - .src_addr = -1, - .dst_addr = -1, - }, - }, + .default_mask = &rte_flow_item_ipv4_mask, .mask_sz = sizeof(struct rte_flow_item_ipv4), .convert = mlx5_flow_create_ipv4, .dst_sz = sizeof(struct ibv_exp_flow_spec_ipv4_ext), @@ -221,6 +218,7 @@ static const struct mlx5_flow_items mlx5_flow_items[] = { }, }, }, + .default_mask = &rte_flow_item_ipv6_mask, .mask_sz = sizeof(struct rte_flow_item_ipv6), .convert = mlx5_flow_create_ipv6, .dst_sz = sizeof(struct ibv_exp_flow_spec_ipv6), @@ -234,6 +232,7 @@ static const struct mlx5_flow_items mlx5_flow_items[] = { .dst_port = -1, }, }, + .default_mask = &rte_flow_item_udp_mask, .mask_sz = sizeof(struct rte_flow_item_udp), .convert = mlx5_flow_create_udp, .dst_sz = sizeof(struct ibv_exp_flow_spec_tcp_udp), @@ -246,6 +245,7 @@ static const struct mlx5_flow_items mlx5_flow_items[] = { .dst_port = -1, }, }, + .default_mask = &rte_flow_item_tcp_mask, .mask_sz = sizeof(struct rte_flow_item_tcp), .convert = mlx5_flow_create_tcp, .dst_sz = sizeof(struct ibv_exp_flow_spec_tcp_udp), @@ -256,6 +256,7 @@ static const struct mlx5_flow_items mlx5_flow_items[] = { .mask = &(const struct rte_flow_item_vxlan){ .vni = "\xff\xff\xff", }, + .default_mask = &rte_flow_item_vxlan_mask, .mask_sz = sizeof(struct rte_flow_item_vxlan), .convert = mlx5_flow_create_vxlan, .dst_sz = sizeof(struct ibv_exp_flow_spec_tunnel),