virtualization.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: Stefano Garzarella <sgarzare@redhat.com>,
	virtualization@lists.linux-foundation.org
Cc: Laurent Vivier <lvivier@redhat.com>,
	Max Gurtovoy <mgurtovoy@nvidia.com>,
	kvm@vger.kernel.org, "Michael S. Tsirkin" <mst@redhat.com>,
	linux-kernel@vger.kernel.org,
	Xie Yongji <xieyongji@bytedance.com>,
	Stefan Hajnoczi <stefanha@redhat.com>
Subject: Re: [PATCH v3 08/13] vdpa: add return value to get_config/set_config callbacks
Date: Fri, 5 Feb 2021 11:20:11 +0800	[thread overview]
Message-ID: <fe6d02be-b6f9-b07f-a86b-97912dddffdc@redhat.com> (raw)
In-Reply-To: <20210204172230.85853-9-sgarzare@redhat.com>


On 2021/2/5 上午1:22, Stefano Garzarella wrote:
> All implementations of these callbacks already validate inputs.
>
> Let's return an error from these callbacks, so the caller doesn't
> need to validate the input anymore.
>
> We update all implementations to return -EINVAL in case of invalid
> input.
>
> Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
> ---
>   include/linux/vdpa.h              | 18 ++++++++++--------
>   drivers/vdpa/ifcvf/ifcvf_main.c   | 24 ++++++++++++++++--------
>   drivers/vdpa/mlx5/net/mlx5_vnet.c | 17 +++++++++++------
>   drivers/vdpa/vdpa_sim/vdpa_sim.c  | 16 ++++++++++------
>   4 files changed, 47 insertions(+), 28 deletions(-)
>
> diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h
> index 4ab5494503a8..0e0cbd5fb41b 100644
> --- a/include/linux/vdpa.h
> +++ b/include/linux/vdpa.h
> @@ -157,6 +157,7 @@ struct vdpa_iova_range {
>    *				@buf: buffer used to read to
>    *				@len: the length to read from
>    *				configuration space
> + *				Returns integer: success (0) or error (< 0)
>    * @set_config:			Write to device specific configuration space
>    *				@vdev: vdpa device
>    *				@offset: offset from the beginning of
> @@ -164,6 +165,7 @@ struct vdpa_iova_range {
>    *				@buf: buffer used to write from
>    *				@len: the length to write to
>    *				configuration space
> + *				Returns integer: success (0) or error (< 0)
>    * @get_generation:		Get device config generation (optional)
>    *				@vdev: vdpa device
>    *				Returns u32: device generation
> @@ -231,10 +233,10 @@ 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);
> -	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,
> -			   const void *buf, unsigned int len);
> +	int (*get_config)(struct vdpa_device *vdev, unsigned int offset,
> +			  void *buf, unsigned int len);
> +	int (*set_config)(struct vdpa_device *vdev, unsigned int offset,
> +			  const void *buf, unsigned int len);
>   	u32 (*get_generation)(struct vdpa_device *vdev);
>   	struct vdpa_iova_range (*get_iova_range)(struct vdpa_device *vdev);
>   
> @@ -329,8 +331,8 @@ static inline int vdpa_set_features(struct vdpa_device *vdev, u64 features)
>   }
>   
>   
> -static inline void vdpa_get_config(struct vdpa_device *vdev, unsigned offset,
> -				   void *buf, unsigned int len)
> +static inline int vdpa_get_config(struct vdpa_device *vdev, unsigned offset,
> +				  void *buf, unsigned int len)
>   {
>           const struct vdpa_config_ops *ops = vdev->config;
>   
> @@ -339,8 +341,8 @@ static inline void vdpa_get_config(struct vdpa_device *vdev, unsigned offset,
>   	 * If it does happen we assume a legacy guest.
>   	 */
>   	if (!vdev->features_valid)
> -		vdpa_set_features(vdev, 0);
> -	ops->get_config(vdev, offset, buf, len);
> +		return vdpa_set_features(vdev, 0);
> +	return ops->get_config(vdev, offset, buf, len);
>   }
>   
>   /**
> diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c
> index 7c8bbfcf6c3e..f5e6a90d8114 100644
> --- a/drivers/vdpa/ifcvf/ifcvf_main.c
> +++ b/drivers/vdpa/ifcvf/ifcvf_main.c
> @@ -332,24 +332,32 @@ static u32 ifcvf_vdpa_get_vq_align(struct vdpa_device *vdpa_dev)
>   	return IFCVF_QUEUE_ALIGNMENT;
>   }
>   
> -static void ifcvf_vdpa_get_config(struct vdpa_device *vdpa_dev,
> -				  unsigned int offset,
> -				  void *buf, unsigned int len)
> +static int ifcvf_vdpa_get_config(struct vdpa_device *vdpa_dev,
> +				 unsigned int offset,
> +				 void *buf, unsigned int len)
>   {
>   	struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev);
>   
> -	WARN_ON(offset + len > sizeof(struct virtio_net_config));
> +	if (offset + len > sizeof(struct virtio_net_config))
> +		return -EINVAL;
> +
>   	ifcvf_read_net_config(vf, offset, buf, len);
> +
> +	return 0;
>   }
>   
> -static void ifcvf_vdpa_set_config(struct vdpa_device *vdpa_dev,
> -				  unsigned int offset, const void *buf,
> -				  unsigned int len)
> +static int ifcvf_vdpa_set_config(struct vdpa_device *vdpa_dev,
> +				 unsigned int offset, const void *buf,
> +				 unsigned int len)
>   {
>   	struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev);
>   
> -	WARN_ON(offset + len > sizeof(struct virtio_net_config));
> +	if (offset + len > sizeof(struct virtio_net_config))
> +		return -EINVAL;
> +
>   	ifcvf_write_net_config(vf, offset, buf, len);
> +
> +	return 0;
>   }
>   
>   static void ifcvf_vdpa_set_config_cb(struct vdpa_device *vdpa_dev,
> diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> index 029822060017..9323b5ff7988 100644
> --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> @@ -1796,20 +1796,25 @@ static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status)
>   	ndev->mvdev.status |= VIRTIO_CONFIG_S_FAILED;
>   }
>   
> -static void mlx5_vdpa_get_config(struct vdpa_device *vdev, unsigned int offset, void *buf,
> -				 unsigned int len)
> +static int mlx5_vdpa_get_config(struct vdpa_device *vdev, unsigned int offset, void *buf,
> +				unsigned int len)
>   {
>   	struct mlx5_vdpa_dev *mvdev = to_mvdev(vdev);
>   	struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
>   
> -	if (offset + len < sizeof(struct virtio_net_config))
> -		memcpy(buf, (u8 *)&ndev->config + offset, len);
> +	if (offset + len > sizeof(struct virtio_net_config))
> +		return -EINVAL;


It looks to me we should use ">=" here?

Thanks


> +
> +	memcpy(buf, (u8 *)&ndev->config + offset, len);
> +
> +	return 0
>   }
>   
> -static void mlx5_vdpa_set_config(struct vdpa_device *vdev, unsigned int offset, const void *buf,
> -				 unsigned int len)
> +static int mlx5_vdpa_set_config(struct vdpa_device *vdev, unsigned int offset, const void *buf,
> +				unsigned int len)
>   {
>   	/* not supported */
> +	return 0;
>   }
>   
>   static u32 mlx5_vdpa_get_generation(struct vdpa_device *vdev)
> diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c
> index a7aeb5d01c3e..3808b01ac703 100644
> --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
> +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
> @@ -462,32 +462,36 @@ static void vdpasim_set_status(struct vdpa_device *vdpa, u8 status)
>   	spin_unlock(&vdpasim->lock);
>   }
>   
> -static void vdpasim_get_config(struct vdpa_device *vdpa, unsigned int offset,
> -			     void *buf, unsigned int len)
> +static int vdpasim_get_config(struct vdpa_device *vdpa, unsigned int offset,
> +			      void *buf, unsigned int len)
>   {
>   	struct vdpasim *vdpasim = vdpa_to_sim(vdpa);
>   
>   	if (offset + len > vdpasim->dev_attr.config_size)
> -		return;
> +		return -EINVAL;
>   
>   	if (vdpasim->dev_attr.get_config)
>   		vdpasim->dev_attr.get_config(vdpasim, vdpasim->config);
>   
>   	memcpy(buf, vdpasim->config + offset, len);
> +
> +	return 0;
>   }
>   
> -static void vdpasim_set_config(struct vdpa_device *vdpa, unsigned int offset,
> -			     const void *buf, unsigned int len)
> +static int vdpasim_set_config(struct vdpa_device *vdpa, unsigned int offset,
> +			      const void *buf, unsigned int len)
>   {
>   	struct vdpasim *vdpasim = vdpa_to_sim(vdpa);
>   
>   	if (offset + len > vdpasim->dev_attr.config_size)
> -		return;
> +		return -EINVAL;
>   
>   	memcpy(vdpasim->config + offset, buf, len);
>   
>   	if (vdpasim->dev_attr.set_config)
>   		vdpasim->dev_attr.set_config(vdpasim, vdpasim->config);
> +
> +	return 0;
>   }
>   
>   static u32 vdpasim_get_generation(struct vdpa_device *vdpa)

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

  parent reply	other threads:[~2021-02-05  3:20 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-04 17:22 [PATCH v3 00/13] vdpa: add vdpa simulator for block device Stefano Garzarella
2021-02-04 17:22 ` [PATCH v3 01/13] vdpa_sim: use iova module to allocate IOVA addresses Stefano Garzarella
2021-02-04 17:22 ` [PATCH v3 02/13] vringh: add 'iotlb_lock' to synchronize iotlb accesses Stefano Garzarella
2021-02-04 17:22 ` [PATCH v3 03/13] vringh: reset kiov 'consumed' field in __vringh_iov() Stefano Garzarella
2021-02-05  3:18   ` Jason Wang
2021-02-04 17:22 ` [PATCH v3 04/13] vringh: explain more about cleaning riov and wiov Stefano Garzarella
2021-02-05  3:18   ` Jason Wang
2021-02-04 17:22 ` [PATCH v3 05/13] vringh: implement vringh_kiov_advance() Stefano Garzarella
2021-02-04 17:22 ` [PATCH v3 06/13] vringh: add vringh_kiov_length() helper Stefano Garzarella
2021-02-04 17:22 ` [PATCH v3 07/13] vdpa_sim: cleanup kiovs in vdpasim_free() Stefano Garzarella
2021-02-04 17:22 ` [PATCH v3 08/13] vdpa: add return value to get_config/set_config callbacks Stefano Garzarella
2021-02-04 22:31   ` kernel test robot
2021-02-04 22:39     ` Stefano Garzarella
2021-02-05  3:20   ` Jason Wang [this message]
2021-02-05  8:48     ` Stefano Garzarella
2021-02-05 14:11       ` Michael S. Tsirkin
2021-02-05 14:17         ` Stefano Garzarella
2021-02-04 17:22 ` [PATCH v3 09/13] vhost/vdpa: remove vhost_vdpa_config_validate() Stefano Garzarella
2021-02-05  3:27   ` Jason Wang
2021-02-05  9:16     ` Stefano Garzarella
2021-02-05 13:32       ` Michael S. Tsirkin
2021-02-05 14:17         ` Stefano Garzarella
2021-02-08  4:13           ` Jason Wang
2021-02-04 17:22 ` [PATCH v3 10/13] vhost/vdpa: Remove the restriction that only supports virtio-net devices Stefano Garzarella
2021-02-04 17:22 ` [PATCH v3 11/13] vdpa: add vdpa simulator for block device Stefano Garzarella
2021-02-04 17:22 ` [PATCH v3 12/13] vdpa_sim_blk: implement ramdisk behaviour Stefano Garzarella
2021-02-04 17:22 ` [PATCH v3 13/13] vdpa_sim_blk: handle VIRTIO_BLK_T_GET_ID Stefano Garzarella

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=fe6d02be-b6f9-b07f-a86b-97912dddffdc@redhat.com \
    --to=jasowang@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lvivier@redhat.com \
    --cc=mgurtovoy@nvidia.com \
    --cc=mst@redhat.com \
    --cc=sgarzare@redhat.com \
    --cc=stefanha@redhat.com \
    --cc=virtualization@lists.linux-foundation.org \
    --cc=xieyongji@bytedance.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).