Skip to content

Commit

Permalink
virtio: Use ida to allocate virtio index
Browse files Browse the repository at this point in the history
Current index allocation in virtio is based on a monotonically
increasing variable "index". This means we'll run out of numbers
after a while. E.g. someone crazy doing this in host side.

while(1) {
	hot-plug a virtio device
	hot-unplug the virito devcie
}

Signed-off-by: Asias He <asias@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  • Loading branch information
Asias He authored and Rusty Russell committed May 22, 2012
1 parent c877bab commit 90e0320
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions drivers/virtio/virtio.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
#include <linux/spinlock.h>
#include <linux/virtio_config.h>
#include <linux/module.h>
#include <linux/idr.h>

/* Unique numbering for virtio devices. */
static unsigned int dev_index;
static DEFINE_IDA(virtio_index_ida);

static ssize_t device_show(struct device *_d,
struct device_attribute *attr, char *buf)
Expand Down Expand Up @@ -193,7 +194,11 @@ int register_virtio_device(struct virtio_device *dev)
dev->dev.bus = &virtio_bus;

/* Assign a unique device index and hence name. */
dev->index = dev_index++;
err = ida_simple_get(&virtio_index_ida, 0, 0, GFP_KERNEL);
if (err < 0)
goto out;

dev->index = err;
dev_set_name(&dev->dev, "virtio%u", dev->index);

/* We always start by resetting the device, in case a previous
Expand All @@ -208,6 +213,7 @@ int register_virtio_device(struct virtio_device *dev)
/* device_register() causes the bus infrastructure to look for a
* matching driver. */
err = device_register(&dev->dev);
out:
if (err)
add_status(dev, VIRTIO_CONFIG_S_FAILED);
return err;
Expand All @@ -217,6 +223,7 @@ EXPORT_SYMBOL_GPL(register_virtio_device);
void unregister_virtio_device(struct virtio_device *dev)
{
device_unregister(&dev->dev);
ida_simple_remove(&virtio_index_ida, dev->index);
}
EXPORT_SYMBOL_GPL(unregister_virtio_device);

Expand Down

0 comments on commit 90e0320

Please sign in to comment.