| Message ID | 7d53e413f7444481bf69e4926c5db3c05e962e14.1578487334.git.tredaelli@redhat.com |
|---|---|
| State | Accepted |
| Commit | b926f577aaf137ad072d8ef3c915ace7cb4bc82d |
| Headers | show |
| Series | [ovs-dev] acinclude: Use RTE_IBVERBS_LINK_DLOPEN | expand |
On Wed, Jan 8, 2020 at 1:42 PM Timothy Redaelli <tredaelli@redhat.com> wrote: > On DPDK 19.11 RTE_IBVERBS_LINK_DLOPEN is used by Mellanox PMDs (mlx4 and > mlx5) instead of RTE_LIBRTE_MLX{4,5}_DLOPEN_DEPS. > > Without this commit is not possible to statically link OVS with DPDK when MLX4 > or MLX5 PMDs are enabled. > > Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> > --- > acinclude.m4 | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/acinclude.m4 b/acinclude.m4 > index 18264c43b..1c8791d53 100644 > --- a/acinclude.m4 > +++ b/acinclude.m4 > @@ -378,14 +378,14 @@ AC_DEFUN([OVS_CHECK_DPDK], [ > > AC_CHECK_DECL([RTE_LIBRTE_MLX5_PMD], [dnl found > OVS_FIND_DEPENDENCY([mnl_attr_put], [mnl], [libmnl]) > - AC_CHECK_DECL([RTE_LIBRTE_MLX5_DLOPEN_DEPS], [], [dnl not found > + AC_CHECK_DECL([RTE_IBVERBS_LINK_DLOPEN], [], [dnl not found > OVS_FIND_DEPENDENCY([mlx5dv_create_wq], [mlx5], [libmlx5]) > OVS_FIND_DEPENDENCY([verbs_init_cq], [ibverbs], [libibverbs]) > ], [[#include <rte_config.h>]]) > ], [], [[#include <rte_config.h>]]) > > AC_CHECK_DECL([RTE_LIBRTE_MLX4_PMD], [dnl found > - AC_CHECK_DECL([RTE_LIBRTE_MLX4_DLOPEN_DEPS], [], [dnl not found > + AC_CHECK_DECL([RTE_IBVERBS_LINK_DLOPEN], [], [dnl not found > OVS_FIND_DEPENDENCY([mlx4dv_init_obj], [mlx4], [libmlx4]) > OVS_FIND_DEPENDENCY([verbs_init_cq], [ibverbs], [libibverbs]) > ], [[#include <rte_config.h>]]) LGTM. Acked-by: David Marchand <david.marchand@redhat.com>
Timothy Redaelli <tredaelli@redhat.com> writes: > On DPDK 19.11 RTE_IBVERBS_LINK_DLOPEN is used by Mellanox PMDs (mlx4 and > mlx5) instead of RTE_LIBRTE_MLX{4,5}_DLOPEN_DEPS. > > Without this commit is not possible to statically link OVS with DPDK when MLX4 > or MLX5 PMDs are enabled. > > Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> > --- Acked-by: Aaron Conole <aconole@redhat.com>
On 1/8/2020 3:13 PM, Aaron Conole wrote: > Timothy Redaelli <tredaelli@redhat.com> writes: > >> On DPDK 19.11 RTE_IBVERBS_LINK_DLOPEN is used by Mellanox PMDs (mlx4 and >> mlx5) instead of RTE_LIBRTE_MLX{4,5}_DLOPEN_DEPS. >> >> Without this commit is not possible to statically link OVS with DPDK when MLX4 >> or MLX5 PMDs are enabled. >> >> Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> >> --- > > Acked-by: Aaron Conole <aconole@redhat.com> > Thanks for the patch Timothy, push to master. Regards Ian > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
diff --git a/acinclude.m4 b/acinclude.m4 index 18264c43b..1c8791d53 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -378,14 +378,14 @@ AC_DEFUN([OVS_CHECK_DPDK], [ AC_CHECK_DECL([RTE_LIBRTE_MLX5_PMD], [dnl found OVS_FIND_DEPENDENCY([mnl_attr_put], [mnl], [libmnl]) - AC_CHECK_DECL([RTE_LIBRTE_MLX5_DLOPEN_DEPS], [], [dnl not found + AC_CHECK_DECL([RTE_IBVERBS_LINK_DLOPEN], [], [dnl not found OVS_FIND_DEPENDENCY([mlx5dv_create_wq], [mlx5], [libmlx5]) OVS_FIND_DEPENDENCY([verbs_init_cq], [ibverbs], [libibverbs]) ], [[#include <rte_config.h>]]) ], [], [[#include <rte_config.h>]]) AC_CHECK_DECL([RTE_LIBRTE_MLX4_PMD], [dnl found - AC_CHECK_DECL([RTE_LIBRTE_MLX4_DLOPEN_DEPS], [], [dnl not found + AC_CHECK_DECL([RTE_IBVERBS_LINK_DLOPEN], [], [dnl not found OVS_FIND_DEPENDENCY([mlx4dv_init_obj], [mlx4], [libmlx4]) OVS_FIND_DEPENDENCY([verbs_init_cq], [ibverbs], [libibverbs]) ], [[#include <rte_config.h>]])
On DPDK 19.11 RTE_IBVERBS_LINK_DLOPEN is used by Mellanox PMDs (mlx4 and mlx5) instead of RTE_LIBRTE_MLX{4,5}_DLOPEN_DEPS. Without this commit is not possible to statically link OVS with DPDK when MLX4 or MLX5 PMDs are enabled. Signed-off-by: Timothy Redaelli <tredaelli@redhat.com> --- acinclude.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)