Unverified Commit 346b21bf authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4675 v5 Backport vDPA migration support patches 

Merge Pull Request from: @ci-robot 
 
PR sync from: Jiang Dongxu <jiangdongxu1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/P4CCEL6ZJG6IDXQ25NGOYLTVD5FUYVSI/ 
From: shaodenghui <shaodenghui@huawei.com>

Backport vDPA migration support patches merged on branch OLK-5.10

V5:
fix compile error of kernel-6.6 new vdpa driver eni_vdpa

V4:
add CONFIG_VHOST_VDPA_MIGRATION to control vdpa migration code compile
or not.

V3:
fix compile error of kernel-6.6 new vdpa driver pds_vdpa

V2:
fix compile error of kernel-6.6 new vdpa driver vduse and snet_vdpa

jiangdongxu (13):
  vdpa: add log operations
  vhost-vdpa: add uAPI for logging
  vdpa: add device state operations
  vhost-vdpa: add uAPI for device buffer
  vdpa: add vdpa device migration status ops
  vhost-vdpa: add uAPI for device migration status
  vhost: add VHOST feature VHOST_BACKEND_F_BYTEMAPLOG
  vhost-vdpa: Allow transparent MSI IOV
  vhost-vdpa: fix msi irq request err
  vhost-vdpa: allow set feature VHOST_F_LOG_ALL when been negotiated.
  vhost-vdpa: add reset state params to indicate reset level
  vdpa: add vmstate header file
  vdpa: add CONFIG_VHOST_VDPA_MIGRATION


-- 
2.27.0
 
https://gitee.com/openeuler/kernel/issues/I8TP8X 
 
Link:https://gitee.com/openeuler/kernel/pulls/4675

 

Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Reviewed-by: default avatarKevin Zhu <zhukeqian1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 038c00b1 3b326b4a

arch/arm64/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -6400,6 +6400,7 @@ CONFIG_VHOST_NET=m 
CONFIG_VHOST_SCSI=m

CONFIG_VHOST_VSOCK=m

CONFIG_VHOST_VDPA=m

# CONFIG_VHOST_VDPA_MIGRATION is not set

# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set



#

arch/x86/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -7074,6 +7074,7 @@ CONFIG_VHOST_MENU=y 
CONFIG_VHOST_NET=m

# CONFIG_VHOST_SCSI is not set

CONFIG_VHOST_VSOCK=m

# CONFIG_VHOST_VDPA_MIGRATION is not set

# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set



#

drivers/vdpa/alibaba/eni_vdpa.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static void eni_vdpa_set_status(struct vdpa_device *vdpa, u8 status) 
		eni_vdpa_free_irq(eni_vdpa);

}



static int eni_vdpa_reset(struct vdpa_device *vdpa)

static int eni_vdpa_reset(struct vdpa_device *vdpa, int state)

{

	struct eni_vdpa *eni_vdpa = vdpa_to_eni(vdpa);

	struct virtio_pci_legacy_device *ldev = &eni_vdpa->ldev;

drivers/vdpa/ifcvf/ifcvf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static void ifcvf_vdpa_set_status(struct vdpa_device *vdpa_dev, u8 status) 
	ifcvf_set_status(vf, status);

}



static int ifcvf_vdpa_reset(struct vdpa_device *vdpa_dev)

static int ifcvf_vdpa_reset(struct vdpa_device *vdpa_dev, int state)

{

	struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev);

	u8 status = ifcvf_get_status(vf);

drivers/vdpa/mlx5/net/mlx5_vnet.c

+1 −1
Original line number Diff line number Diff line
@@ -2861,7 +2861,7 @@ static void init_group_to_asid_map(struct mlx5_vdpa_dev *mvdev) 
		mvdev->group2asid[i] = 0;

}



static int mlx5_vdpa_reset(struct vdpa_device *vdev)

static int mlx5_vdpa_reset(struct vdpa_device *vdev, int state)

{

	struct mlx5_vdpa_dev *mvdev = to_mvdev(vdev);

	struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);