Commit d4821902 authored by Gautam Dawar's avatar Gautam Dawar Committed by Michael S. Tsirkin
Browse files

vdpa: introduce virtqueue groups 



This patch introduces virtqueue groups to vDPA device. The virtqueue
group is the minimal set of virtqueues that must share an address
space. And the address space identifier could only be attached to
a specific virtqueue group.

Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarGautam Dawar <gdawar@xilinx.com>
Message-Id: <20220330180436.24644-6-gdawar@xilinx.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 0b7ee47c

drivers/vdpa/alibaba/eni_vdpa.c

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static int eni_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		return ret;



	eni_vdpa = vdpa_alloc_device(struct eni_vdpa, vdpa,

				     dev, &eni_vdpa_ops, NULL, false);

				     dev, &eni_vdpa_ops, 1, NULL, false);

	if (IS_ERR(eni_vdpa)) {

		ENI_ERR(pdev, "failed to allocate vDPA structure\n");

		return PTR_ERR(eni_vdpa);

drivers/vdpa/ifcvf/ifcvf_main.c

+7 −1
Original line number Diff line number Diff line
@@ -626,6 +626,11 @@ static size_t ifcvf_vdpa_get_config_size(struct vdpa_device *vdpa_dev) 
	return  vf->config_size;

}



static u32 ifcvf_vdpa_get_vq_group(struct vdpa_device *vdpa, u16 idx)

{

	return 0;

}



static void ifcvf_vdpa_get_config(struct vdpa_device *vdpa_dev,

				  unsigned int offset,

				  void *buf, unsigned int len)
@@ -704,6 +709,7 @@ static const struct vdpa_config_ops ifc_vdpa_ops = { 
	.get_device_id	= ifcvf_vdpa_get_device_id,

	.get_vendor_id	= ifcvf_vdpa_get_vendor_id,

	.get_vq_align	= ifcvf_vdpa_get_vq_align,

	.get_vq_group	= ifcvf_vdpa_get_vq_group,

	.get_config_size	= ifcvf_vdpa_get_config_size,

	.get_config	= ifcvf_vdpa_get_config,

	.set_config	= ifcvf_vdpa_set_config,
@@ -758,7 +764,7 @@ static int ifcvf_vdpa_dev_add(struct vdpa_mgmt_dev *mdev, const char *name, 
	pdev = ifcvf_mgmt_dev->pdev;

	dev = &pdev->dev;

	adapter = vdpa_alloc_device(struct ifcvf_adapter, vdpa,

				    dev, &ifc_vdpa_ops, name, false);

				    dev, &ifc_vdpa_ops, 1, name, false);

	if (IS_ERR(adapter)) {

		IFCVF_ERR(pdev, "Failed to allocate vDPA structure");

		return PTR_ERR(adapter);

drivers/vdpa/mlx5/net/mlx5_vnet.c

+7 −1
Original line number Diff line number Diff line
@@ -1947,6 +1947,11 @@ static u32 mlx5_vdpa_get_vq_align(struct vdpa_device *vdev) 
	return PAGE_SIZE;

}



static u32 mlx5_vdpa_get_vq_group(struct vdpa_device *vdpa, u16 idx)

{

	return 0;

}



enum { MLX5_VIRTIO_NET_F_GUEST_CSUM = 1 << 9,

	MLX5_VIRTIO_NET_F_CSUM = 1 << 10,

	MLX5_VIRTIO_NET_F_HOST_TSO6 = 1 << 11,
@@ -2582,6 +2587,7 @@ static const struct vdpa_config_ops mlx5_vdpa_ops = { 
	.get_vq_notification = mlx5_get_vq_notification,

	.get_vq_irq = mlx5_get_vq_irq,

	.get_vq_align = mlx5_vdpa_get_vq_align,

	.get_vq_group = mlx5_vdpa_get_vq_group,

	.get_device_features = mlx5_vdpa_get_device_features,

	.set_driver_features = mlx5_vdpa_set_driver_features,

	.get_driver_features = mlx5_vdpa_get_driver_features,
@@ -2817,7 +2823,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name, 
	}



	ndev = vdpa_alloc_device(struct mlx5_vdpa_net, mvdev.vdev, mdev->device, &mlx5_vdpa_ops,

				 name, false);

				 1, name, false);

	if (IS_ERR(ndev))

		return PTR_ERR(ndev);

drivers/vdpa/vdpa.c

+3 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ static void vdpa_release_dev(struct device *d) 
 * initialized but before registered.

 * @parent: the parent device

 * @config: the bus operations that is supported by this device

 * @ngroups: number of groups supported by this device

 * @size: size of the parent structure that contains private data

 * @name: name of the vdpa device; optional.

 * @use_va: indicate whether virtual address must be used by this device
@@ -170,6 +171,7 @@ static void vdpa_release_dev(struct device *d) 
 */

struct vdpa_device *__vdpa_alloc_device(struct device *parent,

					const struct vdpa_config_ops *config,

					unsigned int ngroups,

					size_t size, const char *name,

					bool use_va)

{
@@ -202,6 +204,7 @@ struct vdpa_device *__vdpa_alloc_device(struct device *parent, 
	vdev->config = config;

	vdev->features_valid = false;

	vdev->use_va = use_va;

	vdev->ngroups = ngroups;



	if (name)

		err = dev_set_name(&vdev->dev, "%s", name);

drivers/vdpa/vdpa_sim/vdpa_sim.c

+8 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr) 
	else

		ops = &vdpasim_config_ops;



	vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops,

	vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops, 1,

				    dev_attr->name, false);

	if (IS_ERR(vdpasim)) {

		ret = PTR_ERR(vdpasim);
@@ -399,6 +399,11 @@ static u32 vdpasim_get_vq_align(struct vdpa_device *vdpa) 
	return VDPASIM_QUEUE_ALIGN;

}



static u32 vdpasim_get_vq_group(struct vdpa_device *vdpa, u16 idx)

{

	return 0;

}



static u64 vdpasim_get_device_features(struct vdpa_device *vdpa)

{

	struct vdpasim *vdpasim = vdpa_to_sim(vdpa);
@@ -620,6 +625,7 @@ static const struct vdpa_config_ops vdpasim_config_ops = { 
	.set_vq_state           = vdpasim_set_vq_state,

	.get_vq_state           = vdpasim_get_vq_state,

	.get_vq_align           = vdpasim_get_vq_align,

	.get_vq_group           = vdpasim_get_vq_group,

	.get_device_features    = vdpasim_get_device_features,

	.set_driver_features    = vdpasim_set_driver_features,

	.get_driver_features    = vdpasim_get_driver_features,
@@ -650,6 +656,7 @@ static const struct vdpa_config_ops vdpasim_batch_config_ops = { 
	.set_vq_state           = vdpasim_set_vq_state,

	.get_vq_state           = vdpasim_get_vq_state,

	.get_vq_align           = vdpasim_get_vq_align,

	.get_vq_group           = vdpasim_get_vq_group,

	.get_device_features    = vdpasim_get_device_features,

	.set_driver_features    = vdpasim_set_driver_features,

	.get_driver_features    = vdpasim_get_driver_features,