Re: [PATCH 2/2] vdpa/mlx5: Restore the hardware used index after change map

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 2021/2/1 上午2:55, Eli Cohen wrote:
On Fri, Jan 29, 2021 at 11:49:45AM +0800, Jason Wang wrote:
On 2021/1/28 下午9:41, Eli Cohen wrote:
When a change of memory map occurs, the hardware resources are destroyed
and then re-created again with the new memory map. In such case, we need
to restore the hardware available and used indices. The driver failed to
restore the used index which is added here.

Fixes 1a86b377aa21 ("vdpa/mlx5: Add VDPA driver for supported mlx5 devices")
Signed-off-by: Eli Cohen <elic@xxxxxxxxxx>

A question. Does this mean after a vq is suspended, the hw used index is not
equal to vq used index?
Surely there is just one "Used index" for a VQ. What I was trying to say
is that after the VQ is suspended, I read the used index by querying the
hardware. The read result is the used index that the hardware wrote to
memory.


Just to make sure I understand here. So it looks to me we had two index. The first is the used index which is stored in the memory/virtqueue, the second is the one that is stored by the device.


  After the I create the new hardware object, I need to tell it
what is the used index (and the available index) as a way to sync it
with the existing VQ.


For avail index I understand that the hardware index is not synced with the avail index stored in the memory/virtqueue. The question is used index, if the hardware one is not synced with the one in the virtqueue. It means after vq is suspended,  some requests is not completed by the hardware (e.g the buffer were not put to used ring).

This may have implications to live migration, it means those unaccomplished requests needs to be migrated to the destination and resubmitted to the device. This looks not easy.

Thanks



This sync is especially important when a change of map occurs while the
VQ was already used (hence the indices are likely to be non zero). This
can be triggered by hot adding memory after the VQs have been used.

Thanks


---
   drivers/vdpa/mlx5/net/mlx5_vnet.c | 7 +++++++
   1 file changed, 7 insertions(+)

diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
index 549ded074ff3..3fc8588cecae 100644
--- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
+++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
@@ -87,6 +87,7 @@ struct mlx5_vq_restore_info {
   	u64 device_addr;
   	u64 driver_addr;
   	u16 avail_index;
+	u16 used_index;
   	bool ready;
   	struct vdpa_callback cb;
   	bool restore;
@@ -121,6 +122,7 @@ struct mlx5_vdpa_virtqueue {
   	u32 virtq_id;
   	struct mlx5_vdpa_net *ndev;
   	u16 avail_idx;
+	u16 used_idx;
   	int fw_state;
   	/* keep last in the struct */
@@ -804,6 +806,7 @@ static int create_virtqueue(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtque
   	obj_context = MLX5_ADDR_OF(create_virtio_net_q_in, in, obj_context);
   	MLX5_SET(virtio_net_q_object, obj_context, hw_available_index, mvq->avail_idx);
+	MLX5_SET(virtio_net_q_object, obj_context, hw_used_index, mvq->used_idx);
   	MLX5_SET(virtio_net_q_object, obj_context, queue_feature_bit_mask_12_3,
   		 get_features_12_3(ndev->mvdev.actual_features));
   	vq_ctx = MLX5_ADDR_OF(virtio_net_q_object, obj_context, virtio_q_context);
@@ -1022,6 +1025,7 @@ static int connect_qps(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *m
   struct mlx5_virtq_attr {
   	u8 state;
   	u16 available_index;
+	u16 used_index;
   };
   static int query_virtqueue(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *mvq,
@@ -1052,6 +1056,7 @@ static int query_virtqueue(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueu
   	memset(attr, 0, sizeof(*attr));
   	attr->state = MLX5_GET(virtio_net_q_object, obj_context, state);
   	attr->available_index = MLX5_GET(virtio_net_q_object, obj_context, hw_available_index);
+	attr->used_index = MLX5_GET(virtio_net_q_object, obj_context, hw_used_index);
   	kfree(out);
   	return 0;
@@ -1602,6 +1607,7 @@ static int save_channel_info(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqu
   		return err;
   	ri->avail_index = attr.available_index;
+	ri->used_index = attr.used_index;
   	ri->ready = mvq->ready;
   	ri->num_ent = mvq->num_ent;
   	ri->desc_addr = mvq->desc_addr;
@@ -1646,6 +1652,7 @@ static void restore_channels_info(struct mlx5_vdpa_net *ndev)
   			continue;
   		mvq->avail_idx = ri->avail_index;
+		mvq->used_idx = ri->used_index;
   		mvq->ready = ri->ready;
   		mvq->num_ent = ri->num_ent;
   		mvq->desc_addr = ri->desc_addr;

_______________________________________________
Virtualization mailing list
Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linuxfoundation.org/mailman/listinfo/virtualization




[Index of Archives]     [KVM Development]     [Libvirt Development]     [Libvirt Users]     [CentOS Virtualization]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite Forum]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux