vfio/mtty: Enforce available_instances
Subsystems (2)
PATCH 1/1 vfio/mtty: Enforce available_instances
The sample mtty mdev driver doesn't actually enforce the number of device instances it claims are available. Implement this properly.
---
Applies to vfio next branch + Jason's atomic conversion
samples/vfio-mdev/mtty.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
samples/vfio-mdev/mtty.c +16 -6
@@ -144,7 +144,7 @@ struct mdev_state {int nr_ports; }; -static atomic_t mdev_used_ports; +static atomic_t mdev_avail_ports =ATOMIC_INIT (MAX_MTTYS );static const struct file_operations vd_fops = { .owner =THIS_MODULE ,
@@ -707,11 +707,20 @@ static int mtty_probe(struct mdev_device *mdev) {struct mdev_state *mdev_state;int nr_ports =mdev_get_type_group_id (mdev) +1 ; +int avail_ports =atomic_read (&mdev_avail_ports);int ret; +do { +if (avail_ports < nr_ports) +return -ENOSPC ; + }while (!atomic_try_cmpxchg (&mdev_avail_ports, + &avail_ports, avail_ports - nr_ports)); + mdev_state =kzalloc (sizeof (struct mdev_state ),GFP_KERNEL ); -if (mdev_state ==NULL ) +if (mdev_state ==NULL ) { +atomic_add (nr_ports, &mdev_avail_ports);return -ENOMEM ; + }vfio_init_group_dev (&mdev_state->vdev, &mdev->dev, &mtty_dev_ops);
@@ -724,6 +733,7 @@ static int mtty_probe(struct mdev_device *mdev)if (mdev_state->vconfig ==NULL ) {kfree (mdev_state); +atomic_add (nr_ports, &mdev_avail_ports);return -ENOMEM ; }
@@ -735,9 +745,9 @@ static int mtty_probe(struct mdev_device *mdev) ret =vfio_register_group_dev (&mdev_state->vdev);if (ret) {kfree (mdev_state); +atomic_add (nr_ports, &mdev_avail_ports);return ret; } -atomic_add (mdev_state->nr_ports, &mdev_used_ports);dev_set_drvdata (&mdev->dev, mdev_state);return 0 ;
@@ -746,12 +756,13 @@ static int mtty_probe(struct mdev_device *mdev)static void mtty_remove (struct mdev_device *mdev) {struct mdev_state *mdev_state =dev_get_drvdata (&mdev->dev); +int nr_ports = mdev_state->nr_ports; -atomic_sub (mdev_state->nr_ports, &mdev_used_ports);vfio_unregister_group_dev (&mdev_state->vdev);kfree (mdev_state->vconfig);kfree (mdev_state); +atomic_add (nr_ports, &mdev_avail_ports); }static int mtty_reset (struct mdev_state *mdev_state)
@@ -1271,8 +1282,7 @@ static ssize_t available_instances_show(struct mdev_type *mtype, {unsigned int ports =mtype_get_type_group_id (mtype) +1 ; -return sprintf (buf,"%d\n" , - (MAX_MTTYS -atomic_read (&mdev_used_ports)) / ports); +return sprintf (buf,"%d\n" ,atomic_read (&mdev_avail_ports) / ports); }static MDEV_TYPE_ATTR_RO (available_instances);
Quoted 10 lines · Alex Williamson
The sample mtty mdev driver doesn't actually enforce the number of device instances it claims are available. Implement this properly.
Signed-off-by Alex Williamson <[email protected]>---
Applies to vfio next branch + Jason's atomic conversion
samples/vfio-mdev/mtty.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
Jason
Quoted 11 lines · Alex Williamson
The sample mtty mdev driver doesn't actually enforce the number of device instances it claims are available. Implement this properly.
Signed-off-by Alex Williamson <[email protected]>---
Applies to vfio next branch + Jason's atomic conversion
samples/vfio-mdev/mtty.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
Kirti Wankhede
maintainerQuoted 8 lines · Alex Williamson
The sample mtty mdev driver doesn't actually enforce the number of device instances it claims are available. Implement this properly.
Signed-off-by Alex Williamson <[email protected]>---
Applies to vfio next branch + Jason's atomic conversion
Does this need to be on top of Jason's patch?
Patch to use mdev_used_ports is reverted here, can it be changed from mdev_devices_list to mdev_avail_ports atomic variable?
Change here to use atomic variable looks good to me.
Reviewed by: Kirti Wankhede <[email protected]>
Quoted 84 lines
samples/vfio-mdev/mtty.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)samples/vfio-mdev/mtty.c +16
-6@@ -144,7 +144,7 @@ struct mdev_state {int nr_ports; }; -static atomic_t mdev_used_ports; +static atomic_t mdev_avail_ports =ATOMIC_INIT (MAX_MTTYS );static const struct file_operations vd_fops = { .owner =THIS_MODULE ,@@ -707,11 +707,20 @@ static int mtty_probe(struct mdev_device *mdev) {struct mdev_state *mdev_state;int nr_ports =mdev_get_type_group_id (mdev) +1 ; +int avail_ports =atomic_read (&mdev_avail_ports);int ret; +do { +if (avail_ports < nr_ports) +return -ENOSPC ; + }while (!atomic_try_cmpxchg (&mdev_avail_ports, + &avail_ports, avail_ports - nr_ports)); + mdev_state =kzalloc (sizeof (struct mdev_state ),GFP_KERNEL ); -if (mdev_state ==NULL ) +if (mdev_state ==NULL ) { +atomic_add (nr_ports, &mdev_avail_ports);return -ENOMEM ; + }vfio_init_group_dev (&mdev_state->vdev, &mdev->dev, &mtty_dev_ops);@@ -724,6 +733,7 @@ static int mtty_probe(struct mdev_device *mdev)if (mdev_state->vconfig ==NULL ) {kfree (mdev_state); +atomic_add (nr_ports, &mdev_avail_ports);return -ENOMEM ; }@@ -735,9 +745,9 @@ static int mtty_probe(struct mdev_device *mdev) ret =vfio_register_group_dev (&mdev_state->vdev);if (ret) {kfree (mdev_state); +atomic_add (nr_ports, &mdev_avail_ports);return ret; } -atomic_add (mdev_state->nr_ports, &mdev_used_ports);dev_set_drvdata (&mdev->dev, mdev_state);return 0 ;@@ -746,12 +756,13 @@ static int mtty_probe(struct mdev_device *mdev)static void mtty_remove (struct mdev_device *mdev) {struct mdev_state *mdev_state =dev_get_drvdata (&mdev->dev); +int nr_ports = mdev_state->nr_ports; -atomic_sub (mdev_state->nr_ports, &mdev_used_ports);vfio_unregister_group_dev (&mdev_state->vdev);kfree (mdev_state->vconfig);kfree (mdev_state); +atomic_add (nr_ports, &mdev_avail_ports); }static int mtty_reset (struct mdev_state *mdev_state)@@ -1271,8 +1282,7 @@ static ssize_t available_instances_show(struct mdev_type *mtype, {unsigned int ports =mtype_get_type_group_id (mtype) +1 ; -return sprintf (buf,"%d\n" , - (MAX_MTTYS -atomic_read (&mdev_used_ports)) / ports); +return sprintf (buf,"%d\n" ,atomic_read (&mdev_avail_ports) / ports); }static MDEV_TYPE_ATTR_RO (available_instances);
Quoted 4 lines · On Mon, 28 Jun 2021 23:19:54 +0530 Kirti Wankhede <[email protected]> wrote:
Quoted 3 lines · Alex Williamson
The sample mtty mdev driver doesn't actually enforce the number of device instances it claims are available. Implement this properly.
Quoted 8 lines
Quoted 5 lines
Signed-off-by Alex Williamson <[email protected]>---
Applies to vfio next branch + Jason's atomic conversion
Does this need to be on top of Jason's patch?
Yes, see immediately above.
Quoted 2 lines
Patch to use
mdev_used_portsis reverted here, can it be changed frommdev_devices_listtomdev_avail_portsatomic variable?
It doesn't revert Jason's change, it builds on it. The patches could we squashed, but there's no bug in Jason's patch that we're trying to avoid exposing, so I don't see why we'd do that.
Quoted 3 lines
Change here to use atomic variable looks good to me.
Reviewed by: Kirti Wankhede <[email protected]>
Thanks! It was Jason's patch[1] that converted to use an atomic though, so I'm slightly confused if this R-b is for the patch below, Jason's patch, or both. Thanks,
Alex
[1]https://lore.kernel.org/kvm/[email protected]/
Quoted 85 lines
Quoted 84 lines
samples/vfio-mdev/mtty.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)samples/vfio-mdev/mtty.c +16
-6@@ -144,7 +144,7 @@ struct mdev_state {int nr_ports; }; -static atomic_t mdev_used_ports; +static atomic_t mdev_avail_ports =ATOMIC_INIT (MAX_MTTYS );static const struct file_operations vd_fops = { .owner =THIS_MODULE ,@@ -707,11 +707,20 @@ static int mtty_probe(struct mdev_device *mdev) {struct mdev_state *mdev_state;int nr_ports =mdev_get_type_group_id (mdev) +1 ; +int avail_ports =atomic_read (&mdev_avail_ports);int ret; +do { +if (avail_ports < nr_ports) +return -ENOSPC ; + }while (!atomic_try_cmpxchg (&mdev_avail_ports, + &avail_ports, avail_ports - nr_ports)); + mdev_state =kzalloc (sizeof (struct mdev_state ),GFP_KERNEL ); -if (mdev_state ==NULL ) +if (mdev_state ==NULL ) { +atomic_add (nr_ports, &mdev_avail_ports);return -ENOMEM ; + }vfio_init_group_dev (&mdev_state->vdev, &mdev->dev, &mtty_dev_ops);@@ -724,6 +733,7 @@ static int mtty_probe(struct mdev_device *mdev)if (mdev_state->vconfig ==NULL ) {kfree (mdev_state); +atomic_add (nr_ports, &mdev_avail_ports);return -ENOMEM ; }@@ -735,9 +745,9 @@ static int mtty_probe(struct mdev_device *mdev) ret =vfio_register_group_dev (&mdev_state->vdev);if (ret) {kfree (mdev_state); +atomic_add (nr_ports, &mdev_avail_ports);return ret; } -atomic_add (mdev_state->nr_ports, &mdev_used_ports);dev_set_drvdata (&mdev->dev, mdev_state);return 0 ;@@ -746,12 +756,13 @@ static int mtty_probe(struct mdev_device *mdev)static void mtty_remove (struct mdev_device *mdev) {struct mdev_state *mdev_state =dev_get_drvdata (&mdev->dev); +int nr_ports = mdev_state->nr_ports; -atomic_sub (mdev_state->nr_ports, &mdev_used_ports);vfio_unregister_group_dev (&mdev_state->vdev);kfree (mdev_state->vconfig);kfree (mdev_state); +atomic_add (nr_ports, &mdev_avail_ports); }static int mtty_reset (struct mdev_state *mdev_state)@@ -1271,8 +1282,7 @@ static ssize_t available_instances_show(struct mdev_type *mtype, {unsigned int ports =mtype_get_type_group_id (mtype) +1 ; -return sprintf (buf,"%d\n" , - (MAX_MTTYS -atomic_read (&mdev_used_ports)) / ports); +return sprintf (buf,"%d\n" ,atomic_read (&mdev_avail_ports) / ports); }static MDEV_TYPE_ATTR_RO (available_instances);
Kirti Wankhede
maintainerQuoted 16 lines · Alex Williamson
Quoted 4 lines · On Mon, 28 Jun 2021 23:19:54 +0530 Kirti Wankhede <[email protected]> wrote:
Quoted 3 lines · Alex Williamson
The sample mtty mdev driver doesn't actually enforce the number of device instances it claims are available. Implement this properly.
Quoted 8 lines
Quoted 5 lines
Signed-off-by Alex Williamson <[email protected]>---
Applies to vfio next branch + Jason's atomic conversion
Does this need to be on top of Jason's patch?
Quoted 9 lines
Yes, see immediately above.
Quoted 2 lines
Patch to use
mdev_used_portsis reverted here, can it be changed frommdev_devices_listtomdev_avail_portsatomic variable?It doesn't revert Jason's change, it builds on it. The patches could we squashed, but there's no bug in Jason's patch that we're trying to avoid exposing, so I don't see why we'd do that.
'Squashed' is the correct word that 'revert', my bad.
Quoted 7 lines
Quoted 3 lines
Change here to use atomic variable looks good to me.
Reviewed by: Kirti Wankhede <[email protected]>
Thanks! It was Jason's patch[1] that converted to use an atomic though, so I'm slightly confused if this R-b is for the patch below, Jason's patch, or both. Thanks,
I liked 'mdev_avail_ports' approach than 'mdev_used_ports' approach here. This R-b is for below patch.
Thanks,
Kirti
Quoted 91 lines
Alex
[1]https://lore.kernel.org/kvm/[email protected]/
Quoted 85 lines
Quoted 84 lines
samples/vfio-mdev/mtty.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)samples/vfio-mdev/mtty.c +16
-6@@ -144,7 +144,7 @@ struct mdev_state {int nr_ports; }; -static atomic_t mdev_used_ports; +static atomic_t mdev_avail_ports =ATOMIC_INIT (MAX_MTTYS );static const struct file_operations vd_fops = { .owner =THIS_MODULE ,@@ -707,11 +707,20 @@ static int mtty_probe(struct mdev_device *mdev) {struct mdev_state *mdev_state;int nr_ports =mdev_get_type_group_id (mdev) +1 ; +int avail_ports =atomic_read (&mdev_avail_ports);int ret; +do { +if (avail_ports < nr_ports) +return -ENOSPC ; + }while (!atomic_try_cmpxchg (&mdev_avail_ports, + &avail_ports, avail_ports - nr_ports)); + mdev_state =kzalloc (sizeof (struct mdev_state ),GFP_KERNEL ); -if (mdev_state ==NULL ) +if (mdev_state ==NULL ) { +atomic_add (nr_ports, &mdev_avail_ports);return -ENOMEM ; + }vfio_init_group_dev (&mdev_state->vdev, &mdev->dev, &mtty_dev_ops);@@ -724,6 +733,7 @@ static int mtty_probe(struct mdev_device *mdev)if (mdev_state->vconfig ==NULL ) {kfree (mdev_state); +atomic_add (nr_ports, &mdev_avail_ports);return -ENOMEM ; }@@ -735,9 +745,9 @@ static int mtty_probe(struct mdev_device *mdev) ret =vfio_register_group_dev (&mdev_state->vdev);if (ret) {kfree (mdev_state); +atomic_add (nr_ports, &mdev_avail_ports);return ret; } -atomic_add (mdev_state->nr_ports, &mdev_used_ports);dev_set_drvdata (&mdev->dev, mdev_state);return 0 ;@@ -746,12 +756,13 @@ static int mtty_probe(struct mdev_device *mdev)static void mtty_remove (struct mdev_device *mdev) {struct mdev_state *mdev_state =dev_get_drvdata (&mdev->dev); +int nr_ports = mdev_state->nr_ports; -atomic_sub (mdev_state->nr_ports, &mdev_used_ports);vfio_unregister_group_dev (&mdev_state->vdev);kfree (mdev_state->vconfig);kfree (mdev_state); +atomic_add (nr_ports, &mdev_avail_ports); }static int mtty_reset (struct mdev_state *mdev_state)@@ -1271,8 +1282,7 @@ static ssize_t available_instances_show(struct mdev_type *mtype, {unsigned int ports =mtype_get_type_group_id (mtype) +1 ; -return sprintf (buf,"%d\n" , - (MAX_MTTYS -atomic_read (&mdev_used_ports)) / ports); +return sprintf (buf,"%d\n" ,atomic_read (&mdev_avail_ports) / ports); }static MDEV_TYPE_ATTR_RO (available_instances);
Quoted 31 lines · On Tue, 29 Jun 2021 01:22:00 +0530 Kirti Wankhede <[email protected]> wrote:
Quoted 16 lines · Alex Williamson
Quoted 4 lines · On Mon, 28 Jun 2021 23:19:54 +0530 Kirti Wankhede <[email protected]> wrote:
Quoted 3 lines · Alex Williamson
The sample mtty mdev driver doesn't actually enforce the number of device instances it claims are available. Implement this properly.
Quoted 8 lines
Quoted 5 lines
Signed-off-by Alex Williamson <[email protected]>---
Applies to vfio next branch + Jason's atomic conversion
Does this need to be on top of Jason's patch?
Quoted 9 lines
Yes, see immediately above.
Quoted 2 lines
Patch to use
mdev_used_portsis reverted here, can it be changed frommdev_devices_listtomdev_avail_portsatomic variable?It doesn't revert Jason's change, it builds on it. The patches could we squashed, but there's no bug in Jason's patch that we're trying to avoid exposing, so I don't see why we'd do that.
'Squashed' is the correct word that 'revert', my bad.
Quoted 2 lines
Quoted 2 lines
Change here to use atomic variable looks good to me.
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Reviewed by: Kirti Wankhede <[email protected]>
Thanks! It was Jason's patch[1] that converted to use an atomic though, so I'm slightly confused if this R-b is for the patch below, Jason's patch, or both. Thanks,
I liked '
mdev_avail_ports' approach than 'mdev_used_ports' approach here. This R-b is for below patch.
Got it, added. Thanks Kirti!