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

!12773 v4 add vdpa support for x86 and enable vdpa migration. 

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

Christoph Hellwig (1):
  virtio_blk: remove the broken zone revalidation support

jiangdongxu (1):
  vdpa: add support for x86 and open vdpa migration build config


-- 
2.27.0
 
https://gitee.com/openeuler/kernel/issues/IB0RL4 
 
Link:https://gitee.com/openeuler/kernel/pulls/12773

 

Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Reviewed-by: default avatarKevin Zhu <zhukeqian1@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 4cd9ac5b 8036fa74

arch/arm64/configs/openeuler_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -6476,7 +6476,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_VDPA_MIGRATION=y

# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set



#

arch/x86/configs/openeuler_defconfig

+11 −2
Original line number Diff line number Diff line
@@ -7128,6 +7128,7 @@ CONFIG_VIRTIO_PCI_LIB_LEGACY=y 
CONFIG_VIRTIO_MENU=y

CONFIG_VIRTIO_PCI=y

CONFIG_VIRTIO_PCI_LEGACY=y

# CONFIG_VIRTIO_VDPA is not set

# CONFIG_VIRTIO_PMEM is not set

CONFIG_VIRTIO_BALLOON=m

CONFIG_VIRTIO_MEM=m
@@ -7135,7 +7136,14 @@ CONFIG_VIRTIO_INPUT=m 
CONFIG_VIRTIO_MMIO=m

# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set

CONFIG_VIRTIO_DMA_SHARED_BUFFER=m

# CONFIG_VDPA is not set

CONFIG_VDPA=m

# CONFIG_VDPA_USER is not set

# CONFIG_IFCVF is not set

# CONFIG_MLX5_VDPA_NET is not set

# CONFIG_MLX5_VDPA_STEERING_DEBUG is not set

# CONFIG_VP_VDPA is not set

# CONFIG_ALIBABA_ENI_VDPA is not set

# CONFIG_SNET_VDPA is not set

CONFIG_VHOST_IOTLB=m

CONFIG_VHOST_TASK=y

CONFIG_VHOST=m
@@ -7143,7 +7151,8 @@ 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_VDPA=m

CONFIG_VHOST_VDPA_MIGRATION=y

# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set



#

drivers/block/virtio_blk.c

+0 −26
Original line number Diff line number Diff line
@@ -724,27 +724,6 @@ static int virtblk_report_zones(struct gendisk *disk, sector_t sector, 
	return ret;

}



static void virtblk_revalidate_zones(struct virtio_blk *vblk)

{

	u8 model;



	virtio_cread(vblk->vdev, struct virtio_blk_config,

		     zoned.model, &model);

	switch (model) {

	default:

		dev_err(&vblk->vdev->dev, "unknown zone model %d\n", model);

		fallthrough;

	case VIRTIO_BLK_Z_NONE:

	case VIRTIO_BLK_Z_HA:

		disk_set_zoned(vblk->disk, BLK_ZONED_NONE);

		return;

	case VIRTIO_BLK_Z_HM:

		WARN_ON_ONCE(!vblk->zone_sectors);

		if (!blk_revalidate_disk_zones(vblk->disk, NULL))

			set_capacity_and_notify(vblk->disk, 0);

	}

}



static int virtblk_probe_zoned_device(struct virtio_device *vdev,

				       struct virtio_blk *vblk,

				       struct request_queue *q)
@@ -841,10 +820,6 @@ static int virtblk_probe_zoned_device(struct virtio_device *vdev, 
 */

#define virtblk_report_zones       NULL



static inline void virtblk_revalidate_zones(struct virtio_blk *vblk)

{

}



static inline int virtblk_probe_zoned_device(struct virtio_device *vdev,

			struct virtio_blk *vblk, struct request_queue *q)

{
@@ -1007,7 +982,6 @@ static void virtblk_config_changed_work(struct work_struct *work) 
	struct virtio_blk *vblk =

		container_of(work, struct virtio_blk, config_work);



	virtblk_revalidate_zones(vblk);

	virtblk_update_capacity(vblk, true);

}