import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / dpdk / drivers / net / mlx5 / Makefile

diff --git a/ceph/src/spdk/dpdk/drivers/net/mlx5/Makefile b/ceph/src/spdk/dpdk/drivers/net/mlx5/Makefile
index 2e70dec5ba97d94b9ad90508955aa2c657702666..2694916c6104ce2e8121baa5610f6fb830f62e16 100644 (file)
--- a/ceph/src/spdk/dpdk/drivers/net/mlx5/Makefile
+++ b/ceph/src/spdk/dpdk/drivers/net/mlx5/Makefile
@@ -8,11 +8,11 @@ include $(RTE_SDK)/mk/rte.vars.mk
 LIB = librte_pmd_mlx5.a
 LIB_GLUE = $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION)
 LIB_GLUE_BASE = librte_pmd_mlx5_glue.so
-LIB_GLUE_VERSION = 18.05.0
+LIB_GLUE_VERSION = 19.05.0
 
 # Sources.
 SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5.c
-ifneq ($(CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS),y)
+ifneq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y)
 SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_glue.c
 endif
 SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxq.c
@@ -31,11 +31,14 @@ SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_stats.c
 SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rss.c
 SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_mr.c
 SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_socket.c
+SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_dv.c
+SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_tcf.c
+SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_verbs.c
+SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_mp.c
 SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_nl.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_nl_flow.c
+SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_devx_cmds.c
 
-ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS),y)
+ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y)
 INSTALL-$(CONFIG_RTE_LIBRTE_MLX5_PMD)-lib += $(LIB_GLUE)
 endif
 
@@ -49,15 +52,18 @@ CFLAGS += -D_DEFAULT_SOURCE
 CFLAGS += -D_XOPEN_SOURCE=600
 CFLAGS += $(WERROR_FLAGS)
 CFLAGS += -Wno-strict-prototypes
-ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS),y)
+CFLAGS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --cflags libmnl)
+ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y)
 CFLAGS += -DMLX5_GLUE='"$(LIB_GLUE)"'
 CFLAGS += -DMLX5_GLUE_VERSION='"$(LIB_GLUE_VERSION)"'
 CFLAGS_mlx5_glue.o += -fPIC
 LDLIBS += -ldl
+else ifeq ($(CONFIG_RTE_IBVERBS_LINK_STATIC),y)
+LDLIBS += $(shell $(RTE_SDK)/buildtools/options-ibverbs-static.sh)
 else
 LDLIBS += -libverbs -lmlx5
 endif
-LDLIBS += -lmnl
+LDLIBS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs libmnl || echo "-lmnl")
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
 LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
 LDLIBS += -lrte_bus_pci
@@ -114,6 +120,11 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
                infiniband/verbs.h \
                enum IBV_FLOW_SPEC_MPLS \
                $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING \
+               infiniband/verbs.h \
+               enum IBV_WQ_FLAGS_PCI_WRITE_END_PADDING \
+               $(AUTOCONF_OUTPUT)
        $Q sh -- '$<' '$@' \
                HAVE_IBV_WQ_FLAG_RX_END_PADDING \
                infiniband/verbs.h \
@@ -134,6 +145,36 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
                infiniband/mlx5dv.h \
                enum MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP \
                $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_IBV_MLX5_MOD_CQE_128B_PAD \
+               infiniband/mlx5dv.h \
+               enum MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_IBV_FLOW_DV_SUPPORT \
+               infiniband/mlx5dv.h \
+               func mlx5dv_create_flow_action_packet_reformat \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_MLX5DV_DR \
+               infiniband/mlx5dv.h \
+               enum MLX5DV_DR_DOMAIN_TYPE_NIC_RX \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_MLX5DV_DR_ESWITCH \
+               infiniband/mlx5dv.h \
+               enum MLX5DV_DR_DOMAIN_TYPE_FDB \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_IBV_DEVX_OBJ \
+               infiniband/mlx5dv.h \
+               func mlx5dv_devx_obj_create \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_IBV_FLOW_DEVX_COUNTERS \
+               infiniband/mlx5dv.h \
+               enum MLX5DV_FLOW_ACTION_COUNTERS_DEVX \
+               $(AUTOCONF_OUTPUT)
        $Q sh -- '$<' '$@' \
                HAVE_ETHTOOL_LINK_MODE_25G \
                /usr/include/linux/ethtool.h \
@@ -150,10 +191,15 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
                enum ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT \
                $(AUTOCONF_OUTPUT)
        $Q sh -- '$<' '$@' \
-               HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT \
+               HAVE_IBV_DEVICE_COUNTERS_SET_V42 \
                infiniband/verbs.h \
                type 'struct ibv_counter_set_init_attr' \
                $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_IBV_DEVICE_COUNTERS_SET_V45 \
+               infiniband/verbs.h \
+               type 'struct ibv_counters_init_attr' \
+               $(AUTOCONF_OUTPUT)
        $Q sh -- '$<' '$@' \
                HAVE_RDMA_NL_NLDEV \
                rdma/rdma_netlink.h \
@@ -189,6 +235,16 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
                rdma/rdma_netlink.h \
                enum RDMA_NLDEV_ATTR_NDEV_INDEX \
                $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_IFLA_NUM_VF \
+               linux/if_link.h \
+               enum IFLA_NUM_VF \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_IFLA_EXT_MASK \
+               linux/if_link.h \
+               enum IFLA_EXT_MASK \
+               $(AUTOCONF_OUTPUT)
        $Q sh -- '$<' '$@' \
                HAVE_IFLA_PHYS_SWITCH_ID \
                linux/if_link.h \
@@ -199,6 +255,16 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
                linux/if_link.h \
                enum IFLA_PHYS_PORT_NAME \
                $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_IFLA_VXLAN_COLLECT_METADATA \
+               linux/if_link.h \
+               enum IFLA_VXLAN_COLLECT_METADATA \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_CHAIN \
+               linux/rtnetlink.h \
+               enum TCA_CHAIN \
+               $(AUTOCONF_OUTPUT)
        $Q sh -- '$<' '$@' \
                HAVE_TCA_FLOWER_ACT \
                linux/pkt_cls.h \
@@ -334,11 +400,161 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
                linux/pkt_cls.h \
                enum TCA_FLOWER_KEY_VLAN_ETH_TYPE \
                $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_TCP_FLAGS \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_TCP_FLAGS \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_TCP_FLAGS_MASK \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_TCP_FLAGS_MASK \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_IP_TOS \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_IP_TOS \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_IP_TOS_MASK \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_IP_TOS_MASK \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_IP_TTL \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_IP_TTL \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_IP_TTL_MASK \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_IP_TTL_MASK \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TC_ACT_GOTO_CHAIN \
+               linux/pkt_cls.h \
+               define TC_ACT_GOTO_CHAIN \
+               $(AUTOCONF_OUTPUT)
        $Q sh -- '$<' '$@' \
                HAVE_TC_ACT_VLAN \
                linux/tc_act/tc_vlan.h \
                enum TCA_VLAN_PUSH_VLAN_PRIORITY \
                $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_ENC_KEY_ID \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_ENC_KEY_ID \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_ENC_IPV4_SRC \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_ENC_IPV4_SRC \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_ENC_IPV4_DST \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_ENC_IPV4_DST \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_ENC_IPV4_DST_MASK \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_ENC_IPV4_DST_MASK \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_ENC_IPV6_SRC \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_ENC_IPV6_SRC \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_ENC_IPV6_DST \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_ENC_IPV6_DST \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_ENC_IPV6_DST_MASK \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_ENC_IPV6_DST_MASK \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_ENC_UDP_SRC_PORT \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_ENC_UDP_SRC_PORT \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_ENC_UDP_DST_PORT \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_ENC_IP_TOS \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_ENC_IP_TOS \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_ENC_IP_TOS_MASK \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_ENC_IP_TOS_MASK \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_ENC_IP_TTL \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_ENC_IP_TTL \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_FLOWER_KEY_ENC_IP_TTL_MASK \
+               linux/pkt_cls.h \
+               enum TCA_FLOWER_KEY_ENC_IP_TTL_MASK \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TC_ACT_TUNNEL_KEY \
+               linux/tc_act/tc_tunnel_key.h \
+               define TCA_ACT_TUNNEL_KEY \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_TUNNEL_KEY_ENC_DST_PORT \
+               linux/tc_act/tc_tunnel_key.h \
+               enum TCA_TUNNEL_KEY_ENC_DST_PORT \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_TUNNEL_KEY_ENC_TOS \
+               linux/tc_act/tc_tunnel_key.h \
+               enum TCA_TUNNEL_KEY_ENC_TOS \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_TUNNEL_KEY_ENC_TTL \
+               linux/tc_act/tc_tunnel_key.h \
+               enum TCA_TUNNEL_KEY_ENC_TTL \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TCA_TUNNEL_KEY_NO_CSUM \
+               linux/tc_act/tc_tunnel_key.h \
+               enum TCA_TUNNEL_KEY_NO_CSUM \
+               $(AUTOCONF_OUTPUT)
+       $Q sh -- '$<' '$@' \
+               HAVE_TC_ACT_PEDIT \
+               linux/tc_act/tc_pedit.h \
+               enum TCA_PEDIT_KEY_EX_HDR_TYPE_UDP \
+               $(AUTOCONF_OUTPUT)
        $Q sh -- '$<' '$@' \
                HAVE_SUPPORTED_40000baseKR4_Full \
                /usr/include/linux/ethtool.h \
@@ -397,7 +613,7 @@ $(SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD):.c=.o): mlx5_autoconf.h
 # Generate dependency plug-in for rdma-core when the PMD must not be linked
 # directly, so that applications do not inherit this dependency.
 
-ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS),y)
+ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y)
 
 $(LIB): $(LIB_GLUE)