vdpa/mlx5: fix maximum number of virtqs

[dpdk.git] / drivers / vdpa / mlx5 / mlx5_vdpa.h

diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.h b/drivers/vdpa/mlx5/mlx5_vdpa.h
index cf6b90e..e7f3319 100644 (file)
--- a/drivers/vdpa/mlx5/mlx5_vdpa.h
+++ b/drivers/vdpa/mlx5/mlx5_vdpa.h
@@ -12,7 +12,7 @@
 #pragma GCC diagnostic ignored "-Wpedantic"
 #endif
 #include <rte_vdpa.h>
-#include <rte_vdpa_dev.h>
+#include <vdpa_driver.h>
 #include <rte_vhost.h>
 #ifdef PEDANTIC
 #pragma GCC diagnostic error "-Wpedantic"
@@ -22,6 +22,7 @@
 
 #include <mlx5_glue.h>
 #include <mlx5_devx_cmds.h>
+#include <mlx5_common_devx.h>
 #include <mlx5_prm.h>
 
 
@@ -46,31 +47,22 @@ struct mlx5_vdpa_cq {
        uint32_t armed:1;
        int callfd;
        rte_spinlock_t sl;
-       struct mlx5_devx_obj *cq;
-       struct mlx5dv_devx_umem *umem_obj;
-       union {
-               volatile void *umem_buf;
-               volatile struct mlx5_cqe *cqes;
-       };
-       volatile uint32_t *db_rec;
+       struct mlx5_devx_cq cq_obj;
        uint64_t errors;
 };
 
 struct mlx5_vdpa_event_qp {
        struct mlx5_vdpa_cq cq;
        struct mlx5_devx_obj *fw_qp;
-       struct mlx5_devx_obj *sw_qp;
-       struct mlx5dv_devx_umem *umem_obj;
-       void *umem_buf;
-       volatile uint32_t *db_rec;
+       struct mlx5_devx_qp sw_qp;
 };
 
 struct mlx5_vdpa_query_mr {
        SLIST_ENTRY(mlx5_vdpa_query_mr) next;
-       void *addr;
-       uint64_t length;
-       struct mlx5dv_devx_umem *umem;
-       struct mlx5_devx_obj *mkey;
+       union {
+               struct ibv_mr *mr;
+               struct mlx5_devx_obj *mkey;
+       };
        int is_indirect;
 };
 
@@ -97,9 +89,10 @@ struct mlx5_vdpa_virtq {
                void *buf;
                uint32_t size;
        } umems[3];
-       struct rte_intr_handle intr_handle;
+       struct rte_intr_handle *intr_handle;
        uint64_t err_time[3]; /* RDTSC time of recent errors. */
        uint32_t n_retry;
+       struct mlx5_devx_virtio_q_couners_attr stats;
        struct mlx5_devx_virtio_q_couners_attr reset;
 };
 
@@ -121,39 +114,38 @@ enum {
        MLX5_VDPA_EVENT_MODE_ONLY_INTERRUPT
 };
 
+enum mlx5_dev_state {
+       MLX5_VDPA_STATE_PROBED = 0,
+       MLX5_VDPA_STATE_CONFIGURED,
+       MLX5_VDPA_STATE_IN_PROGRESS /* Shutting down. */
+};
+
 struct mlx5_vdpa_priv {
        TAILQ_ENTRY(mlx5_vdpa_priv) next;
-       uint8_t configured;
+       bool connected;
+       enum mlx5_dev_state state;
        pthread_mutex_t vq_config_lock;
-       uint64_t last_traffic_tic;
+       uint64_t no_traffic_counter;
        pthread_t timer_tid;
-       pthread_mutex_t timer_lock;
-       pthread_cond_t timer_cond;
-       volatile uint8_t timer_on;
        int event_mode;
        int event_core; /* Event thread cpu affinity core. */
        uint32_t event_us;
        uint32_t timer_delay_us;
-       uint32_t no_traffic_time_s;
+       uint32_t no_traffic_max;
        uint8_t hw_latency_mode; /* Hardware CQ moderation mode. */
        uint16_t hw_max_latency_us; /* Hardware CQ moderation period in usec. */
        uint16_t hw_max_pending_comp; /* Hardware CQ moderation counter. */
        struct rte_vdpa_device *vdev; /* vDPA device. */
+       struct mlx5_common_device *cdev; /* Backend mlx5 device. */
        int vid; /* vhost device id. */
-       struct ibv_context *ctx; /* Device context. */
-       struct rte_pci_device *pci_dev;
        struct mlx5_hca_vdpa_attr caps;
-       uint32_t pdn; /* Protection Domain number. */
-       struct ibv_pd *pd;
        uint32_t gpa_mkey_index;
        struct ibv_mr *null_mr;
        struct rte_vhost_memory *vmem;
-       uint32_t eqn;
        struct mlx5dv_devx_event_channel *eventc;
        struct mlx5dv_devx_event_channel *err_chnl;
-       struct mlx5dv_devx_uar *uar;
-       struct rte_intr_handle intr_handle;
-       struct rte_intr_handle err_intr_handle;
+       struct mlx5_uar uar;
+       struct rte_intr_handle *err_intr_handle;
        struct mlx5_devx_obj *td;
        struct mlx5_devx_obj *tiss[16]; /* TIS list for each LAG port. */
        uint16_t nr_virtqs;
@@ -163,6 +155,7 @@ struct mlx5_vdpa_priv {
        struct mlx5_vdpa_steer steer;
        struct mlx5dv_var *var;
        void *virtq_db_addr;
+       struct mlx5_pmd_wrapped_mr lm_mr;
        SLIST_HEAD(mr_list, mlx5_vdpa_query_mr) mr_list;
        struct mlx5_vdpa_virtq virtqs[];
 };
@@ -242,6 +235,15 @@ int mlx5_vdpa_event_qp_create(struct mlx5_vdpa_priv *priv, uint16_t desc_n,
  */
 void mlx5_vdpa_event_qp_destroy(struct mlx5_vdpa_event_qp *eqp);
 
+/**
+ * Create all the event global resources.
+ *
+ * @param[in] priv
+ *   The vdpa driver private structure.
+ */
+int
+mlx5_vdpa_event_qp_global_prepare(struct mlx5_vdpa_priv *priv);
+
 /**
  * Release all the event global resources.
  *
@@ -289,13 +291,21 @@ int mlx5_vdpa_err_event_setup(struct mlx5_vdpa_priv *priv);
 void mlx5_vdpa_err_event_unset(struct mlx5_vdpa_priv *priv);
 
 /**
- * Release a virtq and all its related resources.
+ * Release virtqs and resources except that to be reused.
  *
  * @param[in] priv
  *   The vdpa driver private structure.
  */
 void mlx5_vdpa_virtqs_release(struct mlx5_vdpa_priv *priv);
 
+/**
+ * Cleanup cached resources of all virtqs.
+ *
+ * @param[in] priv
+ *   The vdpa driver private structure.
+ */
+void mlx5_vdpa_virtqs_cleanup(struct mlx5_vdpa_priv *priv);
+
 /**
  * Create all the HW virtqs resources and all their related resources.
  *
@@ -323,7 +333,7 @@ int mlx5_vdpa_virtqs_prepare(struct mlx5_vdpa_priv *priv);
 int mlx5_vdpa_virtq_enable(struct mlx5_vdpa_priv *priv, int index, int enable);
 
 /**
- * Unset steering and release all its related resources- stop traffic.
+ * Unset steering - stop traffic.
  *
  * @param[in] priv
  *   The vdpa driver private structure.