net/mlx5: fix meter policy creation assert

[dpdk.git] / drivers / net / mlx5 / mlx5.h

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index f523173..23a28f6 100644 (file)
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -340,8 +340,9 @@ enum {
 /* HW steering flow management job descriptor. */
 struct mlx5_hw_q_job {
        uint32_t type; /* Job type. */
-       struct rte_flow *flow; /* Flow attached to the job. */
+       struct rte_flow_hw *flow; /* Flow attached to the job. */
        void *user_data; /* Job user data. */
+       uint8_t *encap_data; /* Encap data. */
 };
 
 /* HW steering job descriptor LIFO pool. */
@@ -636,6 +637,7 @@ struct mlx5_age_info {
 struct mlx5_dev_shared_port {
        uint32_t ih_port_id;
        uint32_t devx_ih_port_id;
+       uint32_t nl_ih_port_id;
        /*
         * Interrupt handler port_id. Used by shared interrupt
         * handler to find the corresponding rte_eth device
@@ -777,6 +779,8 @@ struct mlx5_flow_meter_policy {
        /* If yellow color policy is skipped. */
        uint32_t skip_g:1;
        /* If green color policy is skipped. */
+       uint32_t mark:1;
+       /* If policy contains mark action. */
        rte_spinlock_t sl;
        uint32_t ref_cnt;
        /* Use count. */
@@ -991,7 +995,6 @@ union mlx5_flow_tbl_key {
 /* Table structure. */
 struct mlx5_flow_tbl_resource {
        void *obj; /**< Pointer to DR table object. */
-       uint32_t refcnt; /**< Reference counter. */
 };
 
 #define MLX5_MAX_TABLES UINT16_MAX
@@ -1185,6 +1188,7 @@ struct mlx5_dev_ctx_shared {
        uint32_t meter_aso_en:1; /* Flow Meter ASO is supported. */
        uint32_t ct_aso_en:1; /* Connection Tracking ASO is supported. */
        uint32_t tunnel_header_0_1:1; /* tunnel_header_0_1 is supported. */
+       uint32_t tunnel_header_2_3:1; /* tunnel_header_2_3 is supported. */
        uint32_t misc5_cap:1; /* misc5 matcher parameter is supported. */
        uint32_t dr_drop_action_en:1; /* Use DR drop action. */
        uint32_t drop_action_check_flag:1; /* Check Flag for drop action. */
@@ -1237,6 +1241,7 @@ struct mlx5_dev_ctx_shared {
        /* Shared interrupt handler section. */
        struct rte_intr_handle *intr_handle; /* Interrupt handler for device. */
        struct rte_intr_handle *intr_handle_devx; /* DEVX interrupt handler. */
+       struct rte_intr_handle *intr_handle_nl; /* Netlink interrupt handler. */
        void *devx_comp; /* DEVX async comp obj. */
        struct mlx5_devx_obj *tis[16]; /* TIS object. */
        struct mlx5_devx_obj *td; /* Transport domain. */
@@ -1287,6 +1292,7 @@ struct mlx5_flow_rss_desc {
        uint64_t hash_fields; /* Verbs Hash fields. */
        uint8_t key[MLX5_RSS_HASH_KEY_LEN]; /**< RSS hash key. */
        uint32_t key_len; /**< RSS hash key len. */
+       uint32_t hws_flags; /**< HW steering action. */
        uint32_t tunnel; /**< Queue in tunnel. */
        uint32_t shared_rss; /**< Shared RSS index. */
        struct mlx5_ind_table_obj *ind_tbl;
@@ -1348,6 +1354,7 @@ struct mlx5_hrxq {
 #if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H)
        void *action; /* DV QP action pointer. */
 #endif
+       uint32_t hws_flags; /* Hw steering flags. */
        uint64_t hash_fields; /* Verbs Hash fields. */
        uint32_t rss_key_len; /* Hash key length in bytes. */
        uint32_t idx; /* Hash Rx queue index. */
@@ -1458,6 +1465,7 @@ struct mlx5_priv {
        /* RX/TX queues. */
        unsigned int rxqs_n; /* RX queues array size. */
        unsigned int txqs_n; /* TX queues array size. */
+       struct mlx5_external_rxq *ext_rxqs; /* External RX queues array. */
        struct mlx5_rxq_priv *(*rxq_privs)[]; /* RX queue non-shared data. */
        struct mlx5_txq_data *(*txqs)[]; /* TX queues. */
        struct rte_mempool *mprq_mp; /* Mempool for Multi-Packet RQ. */
@@ -1478,6 +1486,8 @@ struct mlx5_priv {
        LIST_HEAD(txqobj, mlx5_txq_obj) txqsobj; /* Verbs/DevX Tx queues. */
        /* Indirection tables. */
        LIST_HEAD(ind_tables, mlx5_ind_table_obj) ind_tbls;
+       /* Standalone indirect tables. */
+       LIST_HEAD(stdl_ind_tables, mlx5_ind_table_obj) standalone_ind_tbls;
        /* Pointer to next element. */
        rte_rwlock_t ind_tbls_lock;
        uint32_t refcnt; /**< Reference counter. */
@@ -1527,6 +1537,9 @@ struct mlx5_priv {
        /* HW steering global drop action. */
        struct mlx5dr_action *hw_drop[MLX5_HW_ACTION_FLAG_MAX]
                                     [MLX5DR_TABLE_TYPE_MAX];
+       /* HW steering global drop action. */
+       struct mlx5dr_action *hw_tag[MLX5_HW_ACTION_FLAG_MAX];
+       struct mlx5_indexed_pool *acts_ipool; /* Action data indexed pool. */
 #endif
 };
 
@@ -1656,6 +1669,7 @@ int mlx5_dev_set_flow_ctrl(struct rte_eth_dev *dev,
                           struct rte_eth_fc_conf *fc_conf);
 void mlx5_dev_interrupt_handler(void *arg);
 void mlx5_dev_interrupt_handler_devx(void *arg);
+void mlx5_dev_interrupt_handler_nl(void *arg);
 int mlx5_set_link_down(struct rte_eth_dev *dev);
 int mlx5_set_link_up(struct rte_eth_dev *dev);
 int mlx5_is_removed(struct rte_eth_dev *dev);