Re: [PATCH v4 08/14] vdpa: add get_config_size callback in vdpa_config_ops

Jason Wang <jasowang@xxxxxxxxxx> · Thu, 18 Mar 2021 11:21:37 +0800

在 2021/3/16 上午12:34, Stefano Garzarella 写道:
This new callback is used to get the size of the configuration space
of vDPA devices.

Signed-off-by: Stefano Garzarella <sgarzare@xxxxxxxxxx>


Acked-by: Jason Wang <jasowang@xxxxxxxxxx>


---
  include/linux/vdpa.h              | 4 ++++
  drivers/vdpa/ifcvf/ifcvf_main.c   | 6 ++++++
  drivers/vdpa/mlx5/net/mlx5_vnet.c | 6 ++++++
  drivers/vdpa/vdpa_sim/vdpa_sim.c  | 9 +++++++++
  drivers/vdpa/virtio_pci/vp_vdpa.c | 8 ++++++++
  5 files changed, 33 insertions(+)

diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h
index 15fa085fab05..1b094c1531f2 100644
--- a/include/linux/vdpa.h
+++ b/include/linux/vdpa.h
@@ -150,6 +150,9 @@ struct vdpa_iova_range {
   * @set_status:			Set the device status
   *				@vdev: vdpa device
   *				@status: virtio device status
+ * @get_config_size:		Get the size of the configuration space
+ *				@vdev: vdpa device
+ *				Returns size_t: configuration size
   * @get_config:			Read from device specific configuration space
   *				@vdev: vdpa device
   *				@offset: offset from the beginning of
@@ -231,6 +234,7 @@ struct vdpa_config_ops {
  	u32 (*get_vendor_id)(struct vdpa_device *vdev);
  	u8 (*get_status)(struct vdpa_device *vdev);
  	void (*set_status)(struct vdpa_device *vdev, u8 status);
+	size_t (*get_config_size)(struct vdpa_device *vdev);
  	void (*get_config)(struct vdpa_device *vdev, unsigned int offset,
  			   void *buf, unsigned int len);
  	void (*set_config)(struct vdpa_device *vdev, unsigned int offset,
diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c
index d555a6a5d1ba..017ab07040c7 100644
--- a/drivers/vdpa/ifcvf/ifcvf_main.c
+++ b/drivers/vdpa/ifcvf/ifcvf_main.c
@@ -332,6 +332,11 @@ static u32 ifcvf_vdpa_get_vq_align(struct vdpa_device *vdpa_dev)
  	return IFCVF_QUEUE_ALIGNMENT;
  }
  
+static size_t ifcvf_vdpa_get_config_size(struct vdpa_device *vdpa_dev)
+{
+	return sizeof(struct virtio_net_config);
+}
+
  static void ifcvf_vdpa_get_config(struct vdpa_device *vdpa_dev,
  				  unsigned int offset,
  				  void *buf, unsigned int len)
@@ -392,6 +397,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_config_size	= ifcvf_vdpa_get_config_size,
  	.get_config	= ifcvf_vdpa_get_config,
  	.set_config	= ifcvf_vdpa_set_config,
  	.set_config_cb  = ifcvf_vdpa_set_config_cb,
diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
index 71397fdafa6a..f6e03bf49e3e 100644
--- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
+++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
@@ -1814,6 +1814,11 @@ static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status)
  	ndev->mvdev.status |= VIRTIO_CONFIG_S_FAILED;
  }
  
+static size_t mlx5_vdpa_get_config_size(struct vdpa_device *vdev)
+{
+	return sizeof(struct virtio_net_config);
+}
+
  static void mlx5_vdpa_get_config(struct vdpa_device *vdev, unsigned int offset, void *buf,
  				 unsigned int len)
  {
@@ -1900,6 +1905,7 @@ static const struct vdpa_config_ops mlx5_vdpa_ops = {
  	.get_vendor_id = mlx5_vdpa_get_vendor_id,
  	.get_status = mlx5_vdpa_get_status,
  	.set_status = mlx5_vdpa_set_status,
+	.get_config_size = mlx5_vdpa_get_config_size,
  	.get_config = mlx5_vdpa_get_config,
  	.set_config = mlx5_vdpa_set_config,
  	.get_generation = mlx5_vdpa_get_generation,
diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c
index 14dc2d3d983e..98f793bc9376 100644
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
@@ -462,6 +462,13 @@ static void vdpasim_set_status(struct vdpa_device *vdpa, u8 status)
  	spin_unlock(&vdpasim->lock);
  }
  
+static size_t vdpasim_get_config_size(struct vdpa_device *vdpa)
+{
+	struct vdpasim *vdpasim = vdpa_to_sim(vdpa);
+
+	return vdpasim->dev_attr.config_size;
+}
+
  static void vdpasim_get_config(struct vdpa_device *vdpa, unsigned int offset,
  			     void *buf, unsigned int len)
  {
@@ -598,6 +605,7 @@ static const struct vdpa_config_ops vdpasim_config_ops = {
  	.get_vendor_id          = vdpasim_get_vendor_id,
  	.get_status             = vdpasim_get_status,
  	.set_status             = vdpasim_set_status,
+	.get_config_size        = vdpasim_get_config_size,
  	.get_config             = vdpasim_get_config,
  	.set_config             = vdpasim_set_config,
  	.get_generation         = vdpasim_get_generation,
@@ -625,6 +633,7 @@ static const struct vdpa_config_ops vdpasim_batch_config_ops = {
  	.get_vendor_id          = vdpasim_get_vendor_id,
  	.get_status             = vdpasim_get_status,
  	.set_status             = vdpasim_set_status,
+	.get_config_size        = vdpasim_get_config_size,
  	.get_config             = vdpasim_get_config,
  	.set_config             = vdpasim_set_config,
  	.get_generation         = vdpasim_get_generation,
diff --git a/drivers/vdpa/virtio_pci/vp_vdpa.c b/drivers/vdpa/virtio_pci/vp_vdpa.c
index 1321a2fcd088..dc27ec970884 100644
--- a/drivers/vdpa/virtio_pci/vp_vdpa.c
+++ b/drivers/vdpa/virtio_pci/vp_vdpa.c
@@ -295,6 +295,13 @@ static u32 vp_vdpa_get_vq_align(struct vdpa_device *vdpa)
  	return PAGE_SIZE;
  }
  
+static size_t vp_vdpa_get_config_size(struct vdpa_device *vdpa)
+{
+	struct virtio_pci_modern_device *mdev = vdpa_to_mdev(vdpa);
+
+	return mdev->device_len;
+}
+
  static void vp_vdpa_get_config(struct vdpa_device *vdpa,
  			       unsigned int offset,
  			       void *buf, unsigned int len)
@@ -354,6 +361,7 @@ static const struct vdpa_config_ops vp_vdpa_ops = {
  	.get_device_id	= vp_vdpa_get_device_id,
  	.get_vendor_id	= vp_vdpa_get_vendor_id,
  	.get_vq_align	= vp_vdpa_get_vq_align,
+	.get_config_size = vp_vdpa_get_config_size,
  	.get_config	= vp_vdpa_get_config,
  	.set_config	= vp_vdpa_set_config,
  	.set_config_cb  = vp_vdpa_set_config_cb,







