common/mlx5: extend virtq modifiable fields

A virtq configuration can be modified after the virtq creation.
Added the following modifiable fields:
1.address fields: desc_addr/used_addr/available_addr
2.hw_available_index
3.hw_used_index
4.virtio_q_type
5.version type
6.queue mkey
7.feature bit mask: tso_ipv4/tso_ipv6/tx_csum/rx_csum
8.event mode: event_mode/event_qpn_or_msix

Signed-off-by: Li Zhang <lizh@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c b/drivers/common/mlx5/mlx5_devx_cmds.c
index 1d6d6578d6c3b078a9fa6d8699cfd86ac3319668..1b68c370923a42c8e5678ed03b029cfd25b210d1 100644 (file)
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -545,6 +545,15 @@ mlx5_devx_cmd_query_hca_vdpa_attr(void *ctx,
                vdpa_attr->log_doorbell_stride =
                        MLX5_GET(virtio_emulation_cap, hcattr,
                                 log_doorbell_stride);
+               vdpa_attr->vnet_modify_ext =
+                       MLX5_GET(virtio_emulation_cap, hcattr,
+                                vnet_modify_ext);
+               vdpa_attr->virtio_net_q_addr_modify =
+                       MLX5_GET(virtio_emulation_cap, hcattr,
+                                virtio_net_q_addr_modify);
+               vdpa_attr->virtio_q_index_modify =
+                       MLX5_GET(virtio_emulation_cap, hcattr,
+                                virtio_q_index_modify);
                vdpa_attr->log_doorbell_bar_size =
                        MLX5_GET(virtio_emulation_cap, hcattr,
                                 log_doorbell_bar_size);
@@ -2074,27 +2083,66 @@ mlx5_devx_cmd_modify_virtq(struct mlx5_devx_obj *virtq_obj,
        MLX5_SET(general_obj_in_cmd_hdr, hdr, obj_type,
                 MLX5_GENERAL_OBJ_TYPE_VIRTQ);
        MLX5_SET(general_obj_in_cmd_hdr, hdr, obj_id, virtq_obj->id);
-       MLX5_SET64(virtio_net_q, virtq, modify_field_select, attr->type);
+       MLX5_SET64(virtio_net_q, virtq, modify_field_select,
+               attr->mod_fields_bitmap);
        MLX5_SET16(virtio_q, virtctx, queue_index, attr->queue_index);
-       switch (attr->type) {
-       case MLX5_VIRTQ_MODIFY_TYPE_STATE:
+       if (!attr->mod_fields_bitmap) {
+               DRV_LOG(ERR, "Failed to modify VIRTQ for no type set.");
+               rte_errno = EINVAL;
+               return -rte_errno;
+       }
+       if (attr->mod_fields_bitmap & MLX5_VIRTQ_MODIFY_TYPE_STATE)
                MLX5_SET16(virtio_net_q, virtq, state, attr->state);
-               break;
-       case MLX5_VIRTQ_MODIFY_TYPE_DIRTY_BITMAP_PARAMS:
+       if (attr->mod_fields_bitmap &
+           MLX5_VIRTQ_MODIFY_TYPE_DIRTY_BITMAP_PARAMS) {
                MLX5_SET(virtio_net_q, virtq, dirty_bitmap_mkey,
                         attr->dirty_bitmap_mkey);
                MLX5_SET64(virtio_net_q, virtq, dirty_bitmap_addr,
                         attr->dirty_bitmap_addr);
                MLX5_SET(virtio_net_q, virtq, dirty_bitmap_size,
                         attr->dirty_bitmap_size);
-               break;
-       case MLX5_VIRTQ_MODIFY_TYPE_DIRTY_BITMAP_DUMP_ENABLE:
+       }
+       if (attr->mod_fields_bitmap &
+           MLX5_VIRTQ_MODIFY_TYPE_DIRTY_BITMAP_DUMP_ENABLE)
                MLX5_SET(virtio_net_q, virtq, dirty_bitmap_dump_enable,
                         attr->dirty_bitmap_dump_enable);
-               break;
-       default:
-               rte_errno = EINVAL;
-               return -rte_errno;
+       if (attr->mod_fields_bitmap & MLX5_VIRTQ_MODIFY_TYPE_QUEUE_PERIOD) {
+               MLX5_SET(virtio_q, virtctx, queue_period_mode,
+                       attr->hw_latency_mode);
+               MLX5_SET(virtio_q, virtctx, queue_period_us,
+                       attr->hw_max_latency_us);
+               MLX5_SET(virtio_q, virtctx, queue_max_count,
+                       attr->hw_max_pending_comp);
+       }
+       if (attr->mod_fields_bitmap & MLX5_VIRTQ_MODIFY_TYPE_ADDR) {
+               MLX5_SET64(virtio_q, virtctx, desc_addr, attr->desc_addr);
+               MLX5_SET64(virtio_q, virtctx, used_addr, attr->used_addr);
+               MLX5_SET64(virtio_q, virtctx, available_addr,
+                       attr->available_addr);
+       }
+       if (attr->mod_fields_bitmap & MLX5_VIRTQ_MODIFY_TYPE_HW_AVAILABLE_INDEX)
+               MLX5_SET16(virtio_net_q, virtq, hw_available_index,
+                  attr->hw_available_index);
+       if (attr->mod_fields_bitmap & MLX5_VIRTQ_MODIFY_TYPE_HW_USED_INDEX)
+               MLX5_SET16(virtio_net_q, virtq, hw_used_index,
+                       attr->hw_used_index);
+       if (attr->mod_fields_bitmap & MLX5_VIRTQ_MODIFY_TYPE_Q_TYPE)
+               MLX5_SET16(virtio_q, virtctx, virtio_q_type, attr->q_type);
+       if (attr->mod_fields_bitmap & MLX5_VIRTQ_MODIFY_TYPE_VERSION_1_0)
+               MLX5_SET16(virtio_q, virtctx, virtio_version_1_0,
+                  attr->virtio_version_1_0);
+       if (attr->mod_fields_bitmap & MLX5_VIRTQ_MODIFY_TYPE_Q_MKEY)
+               MLX5_SET(virtio_q, virtctx, virtio_q_mkey, attr->mkey);
+       if (attr->mod_fields_bitmap &
+               MLX5_VIRTQ_MODIFY_TYPE_QUEUE_FEATURE_BIT_MASK) {
+               MLX5_SET16(virtio_net_q, virtq, tso_ipv4, attr->tso_ipv4);
+               MLX5_SET16(virtio_net_q, virtq, tso_ipv6, attr->tso_ipv6);
+               MLX5_SET16(virtio_net_q, virtq, tx_csum, attr->tx_csum);
+               MLX5_SET16(virtio_net_q, virtq, rx_csum, attr->rx_csum);
+       }
+       if (attr->mod_fields_bitmap & MLX5_VIRTQ_MODIFY_TYPE_EVENT_MODE) {
+               MLX5_SET16(virtio_q, virtctx, event_mode, attr->event_mode);
+               MLX5_SET(virtio_q, virtctx, event_qpn_or_msix, attr->qp_id);
        }
        ret = mlx5_glue->devx_obj_modify(virtq_obj->obj, in, sizeof(in),
                                         out, sizeof(out));

diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h b/drivers/common/mlx5/mlx5_devx_cmds.h
index 3747ef9e3305fc2ae1c19a94086f63d2a4d588cb..ec6467d9270afd5c524a0553db330ee89360cd22 100644 (file)
--- a/drivers/common/mlx5/mlx5_devx_cmds.h
+++ b/drivers/common/mlx5/mlx5_devx_cmds.h
@@ -74,6 +74,9 @@ struct mlx5_hca_vdpa_attr {
        uint32_t log_doorbell_stride:5;
        uint32_t log_doorbell_bar_size:5;
        uint32_t queue_counters_valid:1;
+       uint32_t vnet_modify_ext:1;
+       uint32_t virtio_net_q_addr_modify:1;
+       uint32_t virtio_q_index_modify:1;
        uint32_t max_num_virtio_queues;
        struct {
                uint32_t a;
@@ -465,7 +468,7 @@ struct mlx5_devx_virtq_attr {
        uint32_t tis_id;
        uint32_t counters_obj_id;
        uint64_t dirty_bitmap_addr;
-       uint64_t type;
+       uint64_t mod_fields_bitmap;
        uint64_t desc_addr;
        uint64_t used_addr;
        uint64_t available_addr;
@@ -475,6 +478,7 @@ struct mlx5_devx_virtq_attr {
                uint64_t offset;
        } umems[3];
        uint8_t error_type;
+       uint8_t q_type;
 };
 
 

diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index ed7d515af3cea4794b1af3950e702263cb8c74b4..29a440c95d930aac9ed4cb1e951ba9093c7b2435 100644 (file)
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -1802,7 +1802,9 @@ struct mlx5_ifc_virtio_emulation_cap_bits {
        u8 virtio_queue_type[0x8];
        u8 reserved_at_20[0x13];
        u8 log_doorbell_stride[0x5];
-       u8 reserved_at_3b[0x3];
+       u8 vnet_modify_ext[0x1];
+       u8 virtio_net_q_addr_modify[0x1];
+       u8 virtio_q_index_modify[0x1];
        u8 log_doorbell_bar_size[0x5];
        u8 doorbell_bar_offset[0x40];
        u8 reserved_at_80[0x8];
@@ -3024,6 +3026,15 @@ enum {
        MLX5_VIRTQ_MODIFY_TYPE_STATE = (1UL << 0),
        MLX5_VIRTQ_MODIFY_TYPE_DIRTY_BITMAP_PARAMS = (1UL << 3),
        MLX5_VIRTQ_MODIFY_TYPE_DIRTY_BITMAP_DUMP_ENABLE = (1UL << 4),
+       MLX5_VIRTQ_MODIFY_TYPE_QUEUE_PERIOD = (1UL << 5),
+       MLX5_VIRTQ_MODIFY_TYPE_ADDR = (1UL << 6),
+       MLX5_VIRTQ_MODIFY_TYPE_HW_AVAILABLE_INDEX = (1UL << 7),
+       MLX5_VIRTQ_MODIFY_TYPE_HW_USED_INDEX = (1UL << 8),
+       MLX5_VIRTQ_MODIFY_TYPE_Q_TYPE = (1UL << 9),
+       MLX5_VIRTQ_MODIFY_TYPE_VERSION_1_0 = (1UL << 10),
+       MLX5_VIRTQ_MODIFY_TYPE_Q_MKEY = (1UL << 11),
+       MLX5_VIRTQ_MODIFY_TYPE_QUEUE_FEATURE_BIT_MASK = (1UL << 12),
+       MLX5_VIRTQ_MODIFY_TYPE_EVENT_MODE = (1UL << 13),
 };
 
 struct mlx5_ifc_virtio_q_bits {