X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fnet%2Fmlx5%2Fmeson.build;h=1cd7fbbd45ae6e751fad36733776b999aafdc8e5;hb=c67c8c5c1449128339ff6378d1737b7c2e91afc4;hp=e8cbe3eec1794d3f85fb55ec3705c2384c6c579d;hpb=9a945375a815bf704b0c7578e1a9085dc83c0ebd;p=dpdk.git diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index e8cbe3eec1..1cd7fbbd45 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -2,28 +2,40 @@ # Copyright 2018 6WIND S.A. # Copyright 2018 Mellanox Technologies, Ltd -pmd_dlopen = get_option('enable_driver_mlx_glue') +if not is_linux + build = false + reason = 'only supported on Linux' + subdir_done() +endif +build = true + +pmd_dlopen = (get_option('ibverbs_link') == 'dlopen') LIB_GLUE_BASE = 'librte_pmd_mlx5_glue.so' -LIB_GLUE_VERSION = '18.11.0' +LIB_GLUE_VERSION = '19.08.0' LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION if pmd_dlopen - dpdk_conf.set('RTE_LIBRTE_MLX5_DLOPEN_DEPS', 1) + dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1) cflags += [ '-DMLX5_GLUE="@0@"'.format(LIB_GLUE), '-DMLX5_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION), ] endif -libs = [ - cc.find_library('mnl', required:false), - cc.find_library('mlx5', required:false), - cc.find_library('ibverbs', required:false), -] -build = true -foreach lib:libs + +libnames = [ 'mlx5', 'ibverbs' ] +libs = [] +foreach libname:libnames + lib = dependency('lib' + libname, required:false) if not lib.found() + lib = cc.find_library(libname, required:false) + endif + if lib.found() + libs += [ lib ] + else build = false + reason = 'missing dependency, "' + libname + '"' endif endforeach + if build allow_experimental_apis = true ext_deps += libs @@ -32,7 +44,6 @@ if build 'mlx5_ethdev.c', 'mlx5_flow.c', 'mlx5_flow_dv.c', - 'mlx5_flow_tcf.c', 'mlx5_flow_verbs.c', 'mlx5_mac.c', 'mlx5_mr.c', @@ -41,11 +52,12 @@ if build 'mlx5_rxmode.c', 'mlx5_rxq.c', 'mlx5_rxtx.c', - 'mlx5_socket.c', + 'mlx5_mp.c', 'mlx5_stats.c', 'mlx5_trigger.c', 'mlx5_txq.c', 'mlx5_vlan.c', + 'mlx5_devx_cmds.c', ) if dpdk_conf.has('RTE_ARCH_X86_64') or dpdk_conf.has('RTE_ARCH_ARM64') sources += files('mlx5_rxtx_vec.c') @@ -96,12 +108,30 @@ if build 'MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED' ], [ 'HAVE_IBV_MLX5_MOD_CQE_128B_COMP', 'infiniband/mlx5dv.h', 'MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP' ], + [ 'HAVE_IBV_MLX5_MOD_CQE_128B_PAD', 'infiniband/mlx5dv.h', + 'MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD' ], [ 'HAVE_IBV_FLOW_DV_SUPPORT', 'infiniband/mlx5dv.h', - 'MLX5DV_FLOW_ACTION_TAG' ], + 'mlx5dv_create_flow_action_packet_reformat' ], [ 'HAVE_IBV_DEVICE_MPLS_SUPPORT', 'infiniband/verbs.h', 'IBV_FLOW_SPEC_MPLS' ], + [ 'HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING', 'infiniband/verbs.h', + 'IBV_WQ_FLAGS_PCI_WRITE_END_PADDING' ], [ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING', 'infiniband/verbs.h', 'IBV_WQ_FLAG_RX_END_PADDING' ], + [ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h', + 'mlx5dv_devx_obj_create' ], + [ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h', + 'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ], + [ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h', + 'mlx5dv_devx_obj_query_async' ], + [ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', 'infiniband/mlx5dv.h', + 'mlx5dv_dr_action_create_dest_devx_tir' ], + [ 'HAVE_MLX5DV_DR', 'infiniband/mlx5dv.h', + 'MLX5DV_DR_DOMAIN_TYPE_NIC_RX' ], + [ 'HAVE_MLX5DV_DR_ESWITCH', 'infiniband/mlx5dv.h', + 'MLX5DV_DR_DOMAIN_TYPE_FDB' ], + [ 'HAVE_MLX5DV_DR_VLAN', 'infiniband/mlx5dv.h', + 'mlx5dv_dr_action_create_push_vlan' ], [ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h', 'SUPPORTED_40000baseKR4_Full' ], [ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h', @@ -124,76 +154,14 @@ if build 'ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT' ], [ 'HAVE_ETHTOOL_LINK_MODE_100G', 'linux/ethtool.h', 'ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT' ], + [ 'HAVE_IFLA_NUM_VF', 'linux/if_link.h', + 'IFLA_NUM_VF' ], + [ 'HAVE_IFLA_EXT_MASK', 'linux/if_link.h', + 'IFLA_EXT_MASK' ], [ 'HAVE_IFLA_PHYS_SWITCH_ID', 'linux/if_link.h', 'IFLA_PHYS_SWITCH_ID' ], [ 'HAVE_IFLA_PHYS_PORT_NAME', 'linux/if_link.h', 'IFLA_PHYS_PORT_NAME' ], - [ 'HAVE_TCA_CHAIN', 'linux/rtnetlink.h', - 'TCA_CHAIN' ], - [ 'HAVE_TCA_FLOWER_ACT', 'linux/pkt_cls.h', - 'TCA_FLOWER_ACT' ], - [ 'HAVE_TCA_FLOWER_FLAGS', 'linux/pkt_cls.h', - 'TCA_FLOWER_FLAGS' ], - [ 'HAVE_TCA_FLOWER_KEY_ETH_TYPE', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_ETH_TYPE' ], - [ 'HAVE_TCA_FLOWER_KEY_ETH_DST', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_ETH_DST' ], - [ 'HAVE_TCA_FLOWER_KEY_ETH_DST_MASK', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_ETH_DST_MASK' ], - [ 'HAVE_TCA_FLOWER_KEY_ETH_SRC', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_ETH_SRC' ], - [ 'HAVE_TCA_FLOWER_KEY_ETH_SRC_MASK', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_ETH_SRC_MASK' ], - [ 'HAVE_TCA_FLOWER_KEY_IP_PROTO', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_IP_PROTO' ], - [ 'HAVE_TCA_FLOWER_KEY_IPV4_SRC', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_IPV4_SRC' ], - [ 'HAVE_TCA_FLOWER_KEY_IPV4_SRC_MASK', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_IPV4_SRC_MASK' ], - [ 'HAVE_TCA_FLOWER_KEY_IPV4_DST', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_IPV4_DST' ], - [ 'HAVE_TCA_FLOWER_KEY_IPV4_DST_MASK', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_IPV4_DST_MASK' ], - [ 'HAVE_TCA_FLOWER_KEY_IPV6_SRC', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_IPV6_SRC' ], - [ 'HAVE_TCA_FLOWER_KEY_IPV6_SRC_MASK', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_IPV6_SRC_MASK' ], - [ 'HAVE_TCA_FLOWER_KEY_IPV6_DST', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_IPV6_DST' ], - [ 'HAVE_TCA_FLOWER_KEY_IPV6_DST_MASK', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_IPV6_DST_MASK' ], - [ 'HAVE_TCA_FLOWER_KEY_TCP_SRC', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_TCP_SRC' ], - [ 'HAVE_TCA_FLOWER_KEY_TCP_SRC_MASK', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_TCP_SRC_MASK' ], - [ 'HAVE_TCA_FLOWER_KEY_TCP_DST', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_TCP_DST' ], - [ 'HAVE_TCA_FLOWER_KEY_TCP_DST_MASK', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_TCP_DST_MASK' ], - [ 'HAVE_TCA_FLOWER_KEY_UDP_SRC', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_UDP_SRC' ], - [ 'HAVE_TCA_FLOWER_KEY_UDP_SRC_MASK', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_UDP_SRC_MASK' ], - [ 'HAVE_TCA_FLOWER_KEY_UDP_DST', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_UDP_DST' ], - [ 'HAVE_TCA_FLOWER_KEY_UDP_DST_MASK', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_UDP_DST_MASK' ], - [ 'HAVE_TCA_FLOWER_KEY_VLAN_ID', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_VLAN_ID' ], - [ 'HAVE_TCA_FLOWER_KEY_VLAN_PRIO', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_VLAN_PRIO' ], - [ 'HAVE_TCA_FLOWER_KEY_VLAN_ETH_TYPE', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_VLAN_ETH_TYPE' ], - [ 'HAVE_TCA_FLOWER_KEY_TCP_FLAGS', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_TCP_FLAGS' ], - [ 'HAVE_TCA_FLOWER_KEY_TCP_FLAGS_MASK', 'linux/pkt_cls.h', - 'TCA_FLOWER_KEY_TCP_FLAGS_MASK' ], - [ 'HAVE_TC_ACT_GOTO_CHAIN', 'linux/pkt_cls.h', - 'TC_ACT_GOTO_CHAIN' ], - [ 'HAVE_TC_ACT_VLAN', 'linux/tc_act/tc_vlan.h', - 'TCA_VLAN_PUSH_VLAN_PRIORITY' ], - [ 'HAVE_TC_ACT_PEDIT', 'linux/tc_act/tc_pedit.h', - 'TCA_PEDIT_KEY_EX_HDR_TYPE_UDP' ], [ 'HAVE_RDMA_NL_NLDEV', 'rdma/rdma_netlink.h', 'RDMA_NL_NLDEV' ], [ 'HAVE_RDMA_NLDEV_CMD_GET', 'rdma/rdma_netlink.h', @@ -211,12 +179,13 @@ if build ] config = configuration_data() foreach arg:has_sym_args - config.set(arg[0], cc.has_header_symbol(arg[1], arg[2])) + config.set(arg[0], cc.has_header_symbol(arg[1], arg[2], + dependencies: libs)) endforeach foreach arg:has_member_args - file_prefix = '#include<' + arg[1] + '>' + file_prefix = '#include <' + arg[1] + '>' config.set(arg[0], cc.has_member(arg[2], arg[3], - prefix : file_prefix)) + prefix : file_prefix, dependencies: libs)) endforeach configure_file(output : 'mlx5_autoconf.h', configuration : config) endif