net/mlx5: prepare Direct Verbs for Direct Rule

[dpdk.git] / drivers / net / mlx5 / meson.build

diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index 84f2006..a4c684e 100644 (file)
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -4,7 +4,7 @@
 
 pmd_dlopen = (get_option('ibverbs_link') == 'dlopen')
 LIB_GLUE_BASE = 'librte_pmd_mlx5_glue.so'
-LIB_GLUE_VERSION = '19.02.0'
+LIB_GLUE_VERSION = '19.05.0'
 LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
 if pmd_dlopen
        dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
@@ -14,9 +14,9 @@ if pmd_dlopen
        ]
 endif
 libs = [
-       cc.find_library('mnl', required:false),
-       cc.find_library('mlx5', required:false),
-       cc.find_library('ibverbs', required:false),
+       dependency('libmnl', required:false),
+       dependency('libmlx5', required:false),
+       dependency('libibverbs', required:false),
 ]
 build = true
 foreach lib:libs
@@ -41,7 +41,7 @@ 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',
@@ -103,12 +103,14 @@ if build
                '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_COUNTER_DEVX' ],
+               'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],
                [ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h',
                'SUPPORTED_40000baseKR4_Full' ],
                [ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h',
@@ -131,6 +133,10 @@ 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',
@@ -197,6 +203,14 @@ if build
                'TCA_FLOWER_KEY_TCP_FLAGS' ],
                [ 'HAVE_TCA_FLOWER_KEY_TCP_FLAGS_MASK', 'linux/pkt_cls.h',
                'TCA_FLOWER_KEY_TCP_FLAGS_MASK' ],
+               [ 'HAVE_TCA_FLOWER_KEY_IP_TOS', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_IP_TOS' ],
+               [ 'HAVE_TCA_FLOWER_KEY_IP_TOS_MASK', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_IP_TOS_MASK' ],
+               [ 'HAVE_TCA_FLOWER_KEY_IP_TTL', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_IP_TTL' ],
+               [ 'HAVE_TCA_FLOWER_KEY_IP_TTL_MASK', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_IP_TTL_MASK' ],
                [ 'HAVE_TC_ACT_GOTO_CHAIN', 'linux/pkt_cls.h',
                'TC_ACT_GOTO_CHAIN' ],
                [ 'HAVE_TC_ACT_VLAN', 'linux/tc_act/tc_vlan.h',
@@ -227,10 +241,22 @@ if build
                'TCA_FLOWER_KEY_ENC_UDP_DST_PORT' ],
                [ 'HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK', 'linux/pkt_cls.h',
                'TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK' ],
+               [ 'HAVE_TCA_FLOWER_KEY_ENC_IP_TOS', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_ENC_IP_TOS' ],
+               [ 'HAVE_TCA_FLOWER_KEY_ENC_IP_TOS_MASK', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_ENC_IP_TOS_MASK' ],
+               [ 'HAVE_TCA_FLOWER_KEY_ENC_IP_TTL', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_ENC_IP_TTL' ],
+               [ 'HAVE_TCA_FLOWER_KEY_ENC_IP_TTL_MASK', 'linux/pkt_cls.h',
+               'TCA_FLOWER_KEY_ENC_IP_TTL_MASK' ],
                [ 'HAVE_TC_ACT_TUNNEL_KEY', 'linux/tc_act/tc_tunnel_key.h',
                'TCA_ACT_TUNNEL_KEY' ],
                [ 'HAVE_TCA_TUNNEL_KEY_ENC_DST_PORT', 'linux/tc_act/tc_tunnel_key.h',
                'TCA_TUNNEL_KEY_ENC_DST_PORT' ],
+               [ 'HAVE_TCA_TUNNEL_KEY_ENC_TOS', 'linux/tc_act/tc_tunnel_key.h',
+               'TCA_TUNNEL_KEY_ENC_TOS' ],
+               [ 'HAVE_TCA_TUNNEL_KEY_ENC_TTL', 'linux/tc_act/tc_tunnel_key.h',
+               'TCA_TUNNEL_KEY_ENC_TTL' ],
                [ 'HAVE_TCA_TUNNEL_KEY_NO_CSUM', 'linux/tc_act/tc_tunnel_key.h',
                'TCA_TUNNEL_KEY_NO_CSUM' ],
                [ 'HAVE_TC_ACT_PEDIT', 'linux/tc_act/tc_pedit.h',