leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vdpa: change the type of nvqs to u32

Browse Source 
Change vdpa_device.nvqs and vhost_vdpa.nvqs to use u32

Signed-off-by: Longpeng <longpeng2@huawei.com>
Link: https://lore.kernel.org/r/20220315032553.455-3-longpeng2@huawei.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Longpeng &lt;<a href="mailto:longpeng2@huawei.com" target="_blank">longpeng2@huawei.com</a>&gt;<br></blockquote><div><br></div><div>Acked-by: Jason Wang &lt;<a href="mailto:jasowang@redhat.com">jasowang@redhat.com</a>&gt;</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
This commit is contained in:
Longpeng
2022-03-15 11:25:52 +08:00
committed by Michael S. Tsirkin
parent a61280dddd
commit 81d46d6931
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/vdpa/vdpa.c
View File

@@ -232,7 +232,7 @@ static int vdpa_name_match(struct device *dev, const void *data)
return (strcmp(dev_name(&vdev->dev), data) == 0); return (strcmp(dev_name(&vdev->dev), data) == 0);
} }
static int __vdpa_register_device(struct vdpa_device *vdev, int nvqs) static int __vdpa_register_device(struct vdpa_device *vdev, u32 nvqs)
{ {
struct device *dev; struct device *dev;
@@ -257,7 +257,7 @@ static int __vdpa_register_device(struct vdpa_device *vdev, int nvqs)
* *
* Return: Returns an error when fail to add device to vDPA bus * Return: Returns an error when fail to add device to vDPA bus
*/ */
int _vdpa_register_device(struct vdpa_device *vdev, int nvqs) int _vdpa_register_device(struct vdpa_device *vdev, u32 nvqs)
{ {
if (!vdev->mdev) if (!vdev->mdev)
return -EINVAL; return -EINVAL;
@@ -274,7 +274,7 @@ EXPORT_SYMBOL_GPL(_vdpa_register_device);
* *
* Return: Returns an error when fail to add to vDPA bus * Return: Returns an error when fail to add to vDPA bus
*/ */
int vdpa_register_device(struct vdpa_device *vdev, int nvqs) int vdpa_register_device(struct vdpa_device *vdev, u32 nvqs)
{ {
int err; int err;

10
drivers/vhost/vdpa.c
View File

@@ -42,7 +42,7 @@ struct vhost_vdpa {
struct device dev; struct device dev;
struct cdev cdev; struct cdev cdev;
atomic_t opened; atomic_t opened;
int nvqs; u32 nvqs;
int virtio_id; int virtio_id;
int minor; int minor;
struct eventfd_ctx *config_ctx; struct eventfd_ctx *config_ctx;
@@ -161,7 +161,8 @@ static long vhost_vdpa_set_status(struct vhost_vdpa *v, u8 __user *statusp)
struct vdpa_device *vdpa = v->vdpa; struct vdpa_device *vdpa = v->vdpa;
const struct vdpa_config_ops *ops = vdpa->config; const struct vdpa_config_ops *ops = vdpa->config;
u8 status, status_old; u8 status, status_old;
int ret, nvqs = v->nvqs; u32 nvqs = v->nvqs;
int ret;
u16 i; u16 i;
if (copy_from_user(&status, statusp, sizeof(status))) if (copy_from_user(&status, statusp, sizeof(status)))
@@ -968,7 +969,8 @@ static int vhost_vdpa_open(struct inode *inode, struct file *filep)
struct vhost_vdpa *v; struct vhost_vdpa *v;
struct vhost_dev *dev; struct vhost_dev *dev;
struct vhost_virtqueue **vqs; struct vhost_virtqueue **vqs;
int nvqs, i, r, opened; int r, opened;
u32 i, nvqs;
v = container_of(inode->i_cdev, struct vhost_vdpa, cdev); v = container_of(inode->i_cdev, struct vhost_vdpa, cdev);
@@ -1021,7 +1023,7 @@ err:
static void vhost_vdpa_clean_irq(struct vhost_vdpa *v) static void vhost_vdpa_clean_irq(struct vhost_vdpa *v)
{ {
int i; u32 i;
for (i = 0; i < v->nvqs; i++) for (i = 0; i < v->nvqs; i++)
vhost_vdpa_unsetup_vq_irq(v, i); vhost_vdpa_unsetup_vq_irq(v, i);

6
include/linux/vdpa.h
View File

@@ -83,7 +83,7 @@ struct vdpa_device {
unsigned int index; unsigned int index;
bool features_valid; bool features_valid;
bool use_va; bool use_va;
int nvqs; u32 nvqs;
struct vdpa_mgmt_dev *mdev; struct vdpa_mgmt_dev *mdev;
}; };
@@ -338,10 +338,10 @@ struct vdpa_device *__vdpa_alloc_device(struct device *parent,
dev_struct, member)), name, use_va), \ dev_struct, member)), name, use_va), \
dev_struct, member) dev_struct, member)
int vdpa_register_device(struct vdpa_device *vdev, int nvqs); int vdpa_register_device(struct vdpa_device *vdev, u32 nvqs);
void vdpa_unregister_device(struct vdpa_device *vdev); void vdpa_unregister_device(struct vdpa_device *vdev);
int _vdpa_register_device(struct vdpa_device *vdev, int nvqs); int _vdpa_register_device(struct vdpa_device *vdev, u32 nvqs);
void _vdpa_unregister_device(struct vdpa_device *vdev); void _vdpa_unregister_device(struct vdpa_device *vdev);
/** /**