vdpa/mlx5: manage virtqs by array

[dpdk.git] / drivers / vdpa / mlx5 / mlx5_vdpa_steer.c

diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_steer.c b/drivers/vdpa/mlx5/mlx5_vdpa_steer.c
index f365c10..96ffc21 100644 (file)
--- a/drivers/vdpa/mlx5/mlx5_vdpa_steer.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa_steer.c
@@ -73,16 +73,16 @@ is_virtq_recvq(int virtq_index, int nr_vring)
 }
 
 #define MLX5_VDPA_DEFAULT_RQT_SIZE 512
-static int __rte_unused
+static int
 mlx5_vdpa_rqt_prepare(struct mlx5_vdpa_priv *priv)
 {
-       struct mlx5_vdpa_virtq *virtq;
+       int i;
        uint32_t rqt_n = RTE_MIN(MLX5_VDPA_DEFAULT_RQT_SIZE,
                                 1 << priv->log_max_rqt_size);
        struct mlx5_devx_rqt_attr *attr = rte_zmalloc(__func__, sizeof(*attr)
                                                      + rqt_n *
                                                      sizeof(uint32_t), 0);
-       uint32_t i = 0, j;
+       uint32_t k = 0, j;
        int ret = 0;
 
        if (!attr) {
@@ -90,14 +90,15 @@ mlx5_vdpa_rqt_prepare(struct mlx5_vdpa_priv *priv)
                rte_errno = ENOMEM;
                return -ENOMEM;
        }
-       SLIST_FOREACH(virtq, &priv->virtq_list, next) {
-               if (is_virtq_recvq(virtq->index, priv->nr_virtqs)) {
-                       attr->rq_list[i] = virtq->virtq->id;
-                       i++;
+       for (i = 0; i < priv->nr_virtqs; i++) {
+               if (is_virtq_recvq(i, priv->nr_virtqs) &&
+                   priv->virtqs[i].enable) {
+                       attr->rq_list[k] = priv->virtqs[i].virtq->id;
+                       k++;
                }
        }
-       for (j = 0; i != rqt_n; ++i, ++j)
-               attr->rq_list[i] = attr->rq_list[j];
+       for (j = 0; k != rqt_n; ++k, ++j)
+               attr->rq_list[k] = attr->rq_list[j];
        attr->rq_type = MLX5_INLINE_Q_TYPE_VIRTQ;
        attr->rqt_max_size = rqt_n;
        attr->rqt_actual_size = rqt_n;
@@ -116,6 +117,25 @@ mlx5_vdpa_rqt_prepare(struct mlx5_vdpa_priv *priv)
        return ret;
 }
 
+int
+mlx5_vdpa_virtq_enable(struct mlx5_vdpa_virtq *virtq, int enable)
+{
+       struct mlx5_vdpa_priv *priv = virtq->priv;
+       int ret = 0;
+
+       DRV_LOG(INFO, "Update virtq %d status %sable -> %sable.", virtq->index,
+               virtq->enable ? "en" : "dis", enable ? "en" : "dis");
+       if (virtq->enable == !!enable)
+               return 0;
+       virtq->enable = !!enable;
+       if (is_virtq_recvq(virtq->index, priv->nr_virtqs)) {
+               ret = mlx5_vdpa_rqt_prepare(priv);
+               if (ret)
+                       virtq->enable = !enable;
+       }
+       return ret;
+}
+
 static int __rte_unused
 mlx5_vdpa_rss_flows_create(struct mlx5_vdpa_priv *priv)
 {
@@ -126,10 +146,16 @@ mlx5_vdpa_rss_flows_create(struct mlx5_vdpa_priv *priv)
                .transport_domain = priv->td->id,
                .indirect_table = priv->steer.rqt->id,
                .rx_hash_symmetric = 1,
-               .rx_hash_toeplitz_key = { 0x2cc681d1, 0x5bdbf4f7, 0xfca28319,
-                                         0xdb1a3e94, 0x6b9e38d9, 0x2c9c03d1,
-                                         0xad9944a7, 0xd9563d59, 0x063c25f3,
-                                         0xfc1fdc2a },
+               .rx_hash_toeplitz_key = { 0x2c, 0xc6, 0x81, 0xd1,
+                                         0x5b, 0xdb, 0xf4, 0xf7,
+                                         0xfc, 0xa2, 0x83, 0x19,
+                                         0xdb, 0x1a, 0x3e, 0x94,
+                                         0x6b, 0x9e, 0x38, 0xd9,
+                                         0x2c, 0x9c, 0x03, 0xd1,
+                                         0xad, 0x99, 0x44, 0xa7,
+                                         0xd9, 0x56, 0x3d, 0x59,
+                                         0x06, 0x3c, 0x25, 0xf3,
+                                         0xfc, 0x1f, 0xdc, 0x2a },
        };
        struct {
                size_t size;