From 2edad65d0a0479fa2ee544c03a2f10032287162a Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Tue, 17 Jul 2018 15:54:34 +0200 Subject: fix Build against rdma-core v19 Change-Id: Ie5b5694fc286afe5332af1369df6ed4473fb13a7 Signed-off-by: Christian Ehrhardt --- .../net-mlx5-fix-build-with-rdma-core-v19.patch | 45 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 46 insertions(+) create mode 100644 debian/patches/net-mlx5-fix-build-with-rdma-core-v19.patch (limited to 'debian/patches') diff --git a/debian/patches/net-mlx5-fix-build-with-rdma-core-v19.patch b/debian/patches/net-mlx5-fix-build-with-rdma-core-v19.patch new file mode 100644 index 00000000..ebb058e4 --- /dev/null +++ b/debian/patches/net-mlx5-fix-build-with-rdma-core-v19.patch @@ -0,0 +1,45 @@ +From 06b1fe3f6d2121009b3b879e92b8cca25d4c0c42 Mon Sep 17 00:00:00 2001 +From: Shahaf Shuler +Date: Thu, 12 Jul 2018 09:40:32 +0300 +Subject: [PATCH] net/mlx5: fix build with rdma-core v19 + +The flow counter support introduced by +commit 9a761de8ea14 ("net/mlx5: flow counter support") was intend to +work only with MLNX_OFED_4.3 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 + +Reported-by: Stephen Hemminger +Reported-by: Ferruh Yigit +Signed-off-by: Shahaf Shuler +Acked-by: Ori Kam + +Author: Christian Ehrhardt +Original-Author: Shahaf Shuler +Origin: backport, http://git.dpdk.org/dpdk/commit/?id=06b1fe3f6d2121009b3b879e92b8cca25d4c0c42 +Last-Update: 2018-06-17 +--- + drivers/net/mlx5/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/mlx5/Makefile ++++ b/drivers/net/mlx5/Makefile +@@ -145,7 +145,7 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtoo + $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/debian/patches/series b/debian/patches/series index 9aaf349c..4969a43a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ fix-vhost-user-socket-permission.patch testpmd-link-virtio.patch app-testpmd-add-ethernet-peer-command.patch +net-mlx5-fix-build-with-rdma-core-v19.patch -- cgit 1.2.3-korg