From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 10B1514EC for ; Mon, 23 Jul 2018 09:30:41 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from shahafs@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2018 10:33:51 +0300 Received: from unicorn02.mtl.labs.mlnx (unicorn02.mtl.labs.mlnx [10.7.12.63]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id w6N7UdOl016575; Mon, 23 Jul 2018 10:30:39 +0300 From: Shahaf Shuler To: stable@dpdk.org, christian.ehrhardt@canonical.com, bluca@debian.org, yskoh@mellanox.com Cc: orika@mellanox.com Date: Mon, 23 Jul 2018 10:30:35 +0300 Message-Id: <1532331035-152775-1-git-send-email-shahafs@mellanox.com> X-Mailer: git-send-email 2.7.4 Subject: [dpdk-stable] [PATCH] net/mlx5: fix compilation for rdma-core v19 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jul 2018 07:30:42 -0000 [ backported from upstream commit 06b1fe3f6d2121009b3b879e92b8cca25d4c0c42 ] The flow counter support introduced by commit 9a761de8ea14 ("net/mlx5: flow counter support") was intend to work only with MLNX_OFED_4.2 as the upstream rdma-core libraries were lack such support. On rdma-core v19 the support for the flow counters was added but with different user APIs, hence causing compilation issues on the PMD. This patch fix the compilation errors by forcing the flow counters to be enabled only with MLNX_OFED APIs. Once MLNX_OFED and rdma-core APIs will be aligned, a proper patch to support the new API will be submitted. Fixes: 9a761de8ea14 ("net/mlx5: flow counter support") Cc: stable@dpdk.org Cc: orika@mellanox.com Reported-by: Stephen Hemminger Reported-by: Ferruh Yigit Signed-off-by: Shahaf Shuler --- drivers/net/mlx5/Makefile | 2 +- drivers/net/mlx5/mlx5_flow.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index 201f6f0..b84a2a5 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -162,7 +162,7 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh $Q sh -- '$<' '$@' \ HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT \ infiniband/verbs.h \ - enum IBV_FLOW_SPEC_ACTION_COUNT \ + type 'struct ibv_counter_set_init_attr' \ $(AUTOCONF_OUTPUT) # Create mlx5_autoconf.h or update it in case it differs from the new one. diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index f48b689..33e64ad 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -35,12 +35,6 @@ #define MLX5_IPV4 4 #define MLX5_IPV6 6 -#ifndef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT -struct ibv_flow_spec_counter_action { - int dummy; -}; -#endif - /* Dev ops structure defined in mlx5.c */ extern const struct eth_dev_ops mlx5_dev_ops; extern const struct eth_dev_ops mlx5_dev_ops_isolate; @@ -837,10 +831,17 @@ mlx5_flow_convert_items_validate(const struct rte_flow_item items[], sizeof(struct ibv_flow_spec_action_tag); } if (parser->count) { +#ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT unsigned int size = sizeof(struct ibv_flow_spec_counter_action); for (i = 0; i != hash_rxq_init_n; ++i) parser->queue[i].offset += size; +#else + rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, + items, + "Count action supported only on " + "MLNX_OFED_4.2 and above"); +#endif } return 0; exit_item_not_supported: -- 2.7.4