* [PATCH] virtio-pci: fix leaks of msix_affinity_masks
@ 2013-06-19 15:59 Andrew Vagin
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Vagin @ 2013-06-19 15:59 UTC (permalink / raw)
To: virtualization; +Cc: linux-kernel, Andrew Vagin, Michael S. Tsirkin
vp_dev->msix_vectors should be initialized before allocating
msix_affinity_masks, otherwise vp_free_vectors will not free these
objects.
unreferenced object 0xffff88010f969d88 (size 512):
comm "systemd-udevd", pid 158, jiffies 4294673645 (age 80.545s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff816e455e>] kmemleak_alloc+0x5e/0xc0
[<ffffffff811aa7f1>] kmem_cache_alloc_node_trace+0x141/0x2c0
[<ffffffff8133ba23>] alloc_cpumask_var_node+0x23/0x80
[<ffffffff8133ba8e>] alloc_cpumask_var+0xe/0x10
[<ffffffff813fdb3d>] vp_try_to_find_vqs+0x25d/0x810
[<ffffffff813fe171>] vp_find_vqs+0x81/0xb0
[<ffffffffa00d2a05>] init_vqs+0x85/0x120 [virtio_balloon]
[<ffffffffa00d2c29>] virtballoon_probe+0xf9/0x1a0 [virtio_balloon]
[<ffffffff813fb61e>] virtio_dev_probe+0xde/0x140
[<ffffffff814452b8>] driver_probe_device+0x98/0x3a0
[<ffffffff8144566b>] __driver_attach+0xab/0xb0
[<ffffffff814432f4>] bus_for_each_dev+0x94/0xb0
[<ffffffff81444f4e>] driver_attach+0x1e/0x20
[<ffffffff81444910>] bus_add_driver+0x200/0x280
[<ffffffff81445c14>] driver_register+0x74/0x160
[<ffffffff813fb7d0>] register_virtio_driver+0x20/0x40
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: Andrew Vagin <avagin@openvz.org>
---
drivers/virtio/virtio_pci.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index a7ce730..3c0a6ef 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -309,6 +309,8 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
unsigned i, v;
int err = -ENOMEM;
+ vp_dev->msix_vectors = nvectors;
+
vp_dev->msix_entries = kmalloc(nvectors * sizeof *vp_dev->msix_entries,
GFP_KERNEL);
if (!vp_dev->msix_entries)
@@ -336,7 +338,6 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
err = -ENOSPC;
if (err)
goto error;
- vp_dev->msix_vectors = nvectors;
vp_dev->msix_enabled = 1;
/* Set the vector used for configuration */
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] virtio-pci: fix leaks of msix_affinity_masks
[not found] <1371657588-2782922-1-git-send-email-avagin@openvz.org>
@ 2013-06-19 18:28 ` Michael S. Tsirkin
2013-06-20 5:36 ` Andrey Vagin
0 siblings, 1 reply; 6+ messages in thread
From: Michael S. Tsirkin @ 2013-06-19 18:28 UTC (permalink / raw)
To: Andrew Vagin; +Cc: linux-kernel, virtualization
On Wed, Jun 19, 2013 at 07:59:48PM +0400, Andrew Vagin wrote:
> vp_dev->msix_vectors should be initialized before allocating
> msix_affinity_masks, otherwise vp_free_vectors will not free these
> objects.
>
> unreferenced object 0xffff88010f969d88 (size 512):
> comm "systemd-udevd", pid 158, jiffies 4294673645 (age 80.545s)
> hex dump (first 32 bytes):
> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
> backtrace:
> [<ffffffff816e455e>] kmemleak_alloc+0x5e/0xc0
> [<ffffffff811aa7f1>] kmem_cache_alloc_node_trace+0x141/0x2c0
> [<ffffffff8133ba23>] alloc_cpumask_var_node+0x23/0x80
> [<ffffffff8133ba8e>] alloc_cpumask_var+0xe/0x10
> [<ffffffff813fdb3d>] vp_try_to_find_vqs+0x25d/0x810
> [<ffffffff813fe171>] vp_find_vqs+0x81/0xb0
> [<ffffffffa00d2a05>] init_vqs+0x85/0x120 [virtio_balloon]
> [<ffffffffa00d2c29>] virtballoon_probe+0xf9/0x1a0 [virtio_balloon]
> [<ffffffff813fb61e>] virtio_dev_probe+0xde/0x140
> [<ffffffff814452b8>] driver_probe_device+0x98/0x3a0
> [<ffffffff8144566b>] __driver_attach+0xab/0xb0
> [<ffffffff814432f4>] bus_for_each_dev+0x94/0xb0
> [<ffffffff81444f4e>] driver_attach+0x1e/0x20
> [<ffffffff81444910>] bus_add_driver+0x200/0x280
> [<ffffffff81445c14>] driver_register+0x74/0x160
> [<ffffffff813fb7d0>] register_virtio_driver+0x20/0x40
>
> Cc: Rusty Russell <rusty@rustcorp.com.au>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Signed-off-by: Andrew Vagin <avagin@openvz.org>
> ---
> drivers/virtio/virtio_pci.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
> index a7ce730..3c0a6ef 100644
> --- a/drivers/virtio/virtio_pci.c
> +++ b/drivers/virtio/virtio_pci.c
> @@ -309,6 +309,8 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
> unsigned i, v;
> int err = -ENOMEM;
>
> + vp_dev->msix_vectors = nvectors;
> +
> vp_dev->msix_entries = kmalloc(nvectors * sizeof *vp_dev->msix_entries,
> GFP_KERNEL);
> if (!vp_dev->msix_entries)
> @@ -336,7 +338,6 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
> err = -ENOSPC;
> if (err)
> goto error;
> - vp_dev->msix_vectors = nvectors;
> vp_dev->msix_enabled = 1;
>
> /* Set the vector used for configuration */
This introduces a bug.
The assumption was that vp_free_vectors is only set if
msix is successfully enabled, so it's not cleared
by vp_free_vectors.
So there are places like vp_synchronize_vectors
that assume that msix_vectors is only set if msix works
fine.
If you change the assumption, and assign msix_vectors even
if msix can later fail, need too clear it unconditionally.
Like this (untested)
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 03564fe..4236d92 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -289,9 +289,9 @@ static void vp_free_vectors(struct virtio_device *vdev)
pci_disable_msix(vp_dev->pci_dev);
vp_dev->msix_enabled = 0;
- vp_dev->msix_vectors = 0;
}
+ vp_dev->msix_vectors = 0;
vp_dev->msix_used_vectors = 0;
kfree(vp_dev->msix_names);
vp_dev->msix_names = NULL;
> --
> 1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] virtio-pci: fix leaks of msix_affinity_masks
2013-06-19 18:28 ` [PATCH] virtio-pci: fix leaks of msix_affinity_masks Michael S. Tsirkin
@ 2013-06-20 5:36 ` Andrey Vagin
2013-06-20 7:59 ` Michael S. Tsirkin
2013-06-21 6:25 ` Jason Wang
0 siblings, 2 replies; 6+ messages in thread
From: Andrey Vagin @ 2013-06-20 5:36 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: linux-kernel, Andrew Vagin, virtualization
From: Andrew Vagin <avagin@openvz.org>
vp_dev->msix_vectors should be initialized before allocating
msix_affinity_masks, otherwise vp_free_vectors will not free these
objects.
unreferenced object 0xffff88010f969d88 (size 512):
comm "systemd-udevd", pid 158, jiffies 4294673645 (age 80.545s)
hex dump (first 32 bytes):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff816e455e>] kmemleak_alloc+0x5e/0xc0
[<ffffffff811aa7f1>] kmem_cache_alloc_node_trace+0x141/0x2c0
[<ffffffff8133ba23>] alloc_cpumask_var_node+0x23/0x80
[<ffffffff8133ba8e>] alloc_cpumask_var+0xe/0x10
[<ffffffff813fdb3d>] vp_try_to_find_vqs+0x25d/0x810
[<ffffffff813fe171>] vp_find_vqs+0x81/0xb0
[<ffffffffa00d2a05>] init_vqs+0x85/0x120 [virtio_balloon]
[<ffffffffa00d2c29>] virtballoon_probe+0xf9/0x1a0 [virtio_balloon]
[<ffffffff813fb61e>] virtio_dev_probe+0xde/0x140
[<ffffffff814452b8>] driver_probe_device+0x98/0x3a0
[<ffffffff8144566b>] __driver_attach+0xab/0xb0
[<ffffffff814432f4>] bus_for_each_dev+0x94/0xb0
[<ffffffff81444f4e>] driver_attach+0x1e/0x20
[<ffffffff81444910>] bus_add_driver+0x200/0x280
[<ffffffff81445c14>] driver_register+0x74/0x160
[<ffffffff813fb7d0>] register_virtio_driver+0x20/0x40
v2: change msix_vectors uncoditionaly in vp_free_vectors
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Signed-off-by: Andrew Vagin <avagin@openvz.org>
Signed-off-by: Andrey Vagin <avagin@openvz.org>
---
drivers/virtio/virtio_pci.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index a7ce730..1aba255 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -289,9 +289,9 @@ static void vp_free_vectors(struct virtio_device *vdev)
pci_disable_msix(vp_dev->pci_dev);
vp_dev->msix_enabled = 0;
- vp_dev->msix_vectors = 0;
}
+ vp_dev->msix_vectors = 0;
vp_dev->msix_used_vectors = 0;
kfree(vp_dev->msix_names);
vp_dev->msix_names = NULL;
@@ -309,6 +309,8 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
unsigned i, v;
int err = -ENOMEM;
+ vp_dev->msix_vectors = nvectors;
+
vp_dev->msix_entries = kmalloc(nvectors * sizeof *vp_dev->msix_entries,
GFP_KERNEL);
if (!vp_dev->msix_entries)
@@ -336,7 +338,6 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
err = -ENOSPC;
if (err)
goto error;
- vp_dev->msix_vectors = nvectors;
vp_dev->msix_enabled = 1;
/* Set the vector used for configuration */
--
1.8.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] virtio-pci: fix leaks of msix_affinity_masks
2013-06-20 5:36 ` Andrey Vagin
@ 2013-06-20 7:59 ` Michael S. Tsirkin
2013-06-21 6:25 ` Jason Wang
1 sibling, 0 replies; 6+ messages in thread
From: Michael S. Tsirkin @ 2013-06-20 7:59 UTC (permalink / raw)
To: Andrey Vagin; +Cc: linux-kernel, virtualization
On Thu, Jun 20, 2013 at 09:36:50AM +0400, Andrey Vagin wrote:
> From: Andrew Vagin <avagin@openvz.org>
>
> vp_dev->msix_vectors should be initialized before allocating
> msix_affinity_masks, otherwise vp_free_vectors will not free these
> objects.
>
> unreferenced object 0xffff88010f969d88 (size 512):
> comm "systemd-udevd", pid 158, jiffies 4294673645 (age 80.545s)
> hex dump (first 32 bytes):
> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
> backtrace:
> [<ffffffff816e455e>] kmemleak_alloc+0x5e/0xc0
> [<ffffffff811aa7f1>] kmem_cache_alloc_node_trace+0x141/0x2c0
> [<ffffffff8133ba23>] alloc_cpumask_var_node+0x23/0x80
> [<ffffffff8133ba8e>] alloc_cpumask_var+0xe/0x10
> [<ffffffff813fdb3d>] vp_try_to_find_vqs+0x25d/0x810
> [<ffffffff813fe171>] vp_find_vqs+0x81/0xb0
> [<ffffffffa00d2a05>] init_vqs+0x85/0x120 [virtio_balloon]
> [<ffffffffa00d2c29>] virtballoon_probe+0xf9/0x1a0 [virtio_balloon]
> [<ffffffff813fb61e>] virtio_dev_probe+0xde/0x140
> [<ffffffff814452b8>] driver_probe_device+0x98/0x3a0
> [<ffffffff8144566b>] __driver_attach+0xab/0xb0
> [<ffffffff814432f4>] bus_for_each_dev+0x94/0xb0
> [<ffffffff81444f4e>] driver_attach+0x1e/0x20
> [<ffffffff81444910>] bus_add_driver+0x200/0x280
> [<ffffffff81445c14>] driver_register+0x74/0x160
> [<ffffffff813fb7d0>] register_virtio_driver+0x20/0x40
>
> v2: change msix_vectors uncoditionaly in vp_free_vectors
>
> Cc: Rusty Russell <rusty@rustcorp.com.au>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Jason Wang <jasowang@redhat.com>
> Signed-off-by: Andrew Vagin <avagin@openvz.org>
> Signed-off-by: Andrey Vagin <avagin@openvz.org>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> drivers/virtio/virtio_pci.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
> index a7ce730..1aba255 100644
> --- a/drivers/virtio/virtio_pci.c
> +++ b/drivers/virtio/virtio_pci.c
> @@ -289,9 +289,9 @@ static void vp_free_vectors(struct virtio_device *vdev)
>
> pci_disable_msix(vp_dev->pci_dev);
> vp_dev->msix_enabled = 0;
> - vp_dev->msix_vectors = 0;
> }
>
> + vp_dev->msix_vectors = 0;
> vp_dev->msix_used_vectors = 0;
> kfree(vp_dev->msix_names);
> vp_dev->msix_names = NULL;
> @@ -309,6 +309,8 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
> unsigned i, v;
> int err = -ENOMEM;
>
> + vp_dev->msix_vectors = nvectors;
> +
> vp_dev->msix_entries = kmalloc(nvectors * sizeof *vp_dev->msix_entries,
> GFP_KERNEL);
> if (!vp_dev->msix_entries)
> @@ -336,7 +338,6 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
> err = -ENOSPC;
> if (err)
> goto error;
> - vp_dev->msix_vectors = nvectors;
> vp_dev->msix_enabled = 1;
>
> /* Set the vector used for configuration */
> --
> 1.8.1.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] virtio-pci: fix leaks of msix_affinity_masks
2013-06-20 5:36 ` Andrey Vagin
2013-06-20 7:59 ` Michael S. Tsirkin
@ 2013-06-21 6:25 ` Jason Wang
2013-06-30 23:43 ` Rusty Russell
1 sibling, 1 reply; 6+ messages in thread
From: Jason Wang @ 2013-06-21 6:25 UTC (permalink / raw)
To: Andrey Vagin; +Cc: virtualization, linux-kernel, Michael S. Tsirkin
On 06/20/2013 01:36 PM, Andrey Vagin wrote:
> From: Andrew Vagin <avagin@openvz.org>
>
> vp_dev->msix_vectors should be initialized before allocating
> msix_affinity_masks, otherwise vp_free_vectors will not free these
> objects.
>
> unreferenced object 0xffff88010f969d88 (size 512):
> comm "systemd-udevd", pid 158, jiffies 4294673645 (age 80.545s)
> hex dump (first 32 bytes):
> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
> backtrace:
> [<ffffffff816e455e>] kmemleak_alloc+0x5e/0xc0
> [<ffffffff811aa7f1>] kmem_cache_alloc_node_trace+0x141/0x2c0
> [<ffffffff8133ba23>] alloc_cpumask_var_node+0x23/0x80
> [<ffffffff8133ba8e>] alloc_cpumask_var+0xe/0x10
> [<ffffffff813fdb3d>] vp_try_to_find_vqs+0x25d/0x810
> [<ffffffff813fe171>] vp_find_vqs+0x81/0xb0
> [<ffffffffa00d2a05>] init_vqs+0x85/0x120 [virtio_balloon]
> [<ffffffffa00d2c29>] virtballoon_probe+0xf9/0x1a0 [virtio_balloon]
> [<ffffffff813fb61e>] virtio_dev_probe+0xde/0x140
> [<ffffffff814452b8>] driver_probe_device+0x98/0x3a0
> [<ffffffff8144566b>] __driver_attach+0xab/0xb0
> [<ffffffff814432f4>] bus_for_each_dev+0x94/0xb0
> [<ffffffff81444f4e>] driver_attach+0x1e/0x20
> [<ffffffff81444910>] bus_add_driver+0x200/0x280
> [<ffffffff81445c14>] driver_register+0x74/0x160
> [<ffffffff813fb7d0>] register_virtio_driver+0x20/0x40
>
> v2: change msix_vectors uncoditionaly in vp_free_vectors
>
> Cc: Rusty Russell <rusty@rustcorp.com.au>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Jason Wang <jasowang@redhat.com>
> Signed-off-by: Andrew Vagin <avagin@openvz.org>
> Signed-off-by: Andrey Vagin <avagin@openvz.org>
> ---
> drivers/virtio/virtio_pci.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
> index a7ce730..1aba255 100644
> --- a/drivers/virtio/virtio_pci.c
> +++ b/drivers/virtio/virtio_pci.c
> @@ -289,9 +289,9 @@ static void vp_free_vectors(struct virtio_device *vdev)
>
> pci_disable_msix(vp_dev->pci_dev);
> vp_dev->msix_enabled = 0;
> - vp_dev->msix_vectors = 0;
> }
>
> + vp_dev->msix_vectors = 0;
> vp_dev->msix_used_vectors = 0;
> kfree(vp_dev->msix_names);
> vp_dev->msix_names = NULL;
> @@ -309,6 +309,8 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
> unsigned i, v;
> int err = -ENOMEM;
>
> + vp_dev->msix_vectors = nvectors;
> +
> vp_dev->msix_entries = kmalloc(nvectors * sizeof *vp_dev->msix_entries,
> GFP_KERNEL);
> if (!vp_dev->msix_entries)
> @@ -336,7 +338,6 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
> err = -ENOSPC;
> if (err)
> goto error;
> - vp_dev->msix_vectors = nvectors;
> vp_dev->msix_enabled = 1;
>
> /* Set the vector used for configuration */
Acked-by: Jason Wang <jasowang@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] virtio-pci: fix leaks of msix_affinity_masks
2013-06-21 6:25 ` Jason Wang
@ 2013-06-30 23:43 ` Rusty Russell
0 siblings, 0 replies; 6+ messages in thread
From: Rusty Russell @ 2013-06-30 23:43 UTC (permalink / raw)
To: Jason Wang, Andrey Vagin; +Cc: virtualization, linux-kernel, Michael S. Tsirkin
Jason Wang <jasowang@redhat.com> writes:
> On 06/20/2013 01:36 PM, Andrey Vagin wrote:
>> From: Andrew Vagin <avagin@openvz.org>
>>
>> vp_dev->msix_vectors should be initialized before allocating
>> msix_affinity_masks, otherwise vp_free_vectors will not free these
>> objects.
>>
>> unreferenced object 0xffff88010f969d88 (size 512):
>> comm "systemd-udevd", pid 158, jiffies 4294673645 (age 80.545s)
>> hex dump (first 32 bytes):
>> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
>> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
>> backtrace:
>> [<ffffffff816e455e>] kmemleak_alloc+0x5e/0xc0
>> [<ffffffff811aa7f1>] kmem_cache_alloc_node_trace+0x141/0x2c0
>> [<ffffffff8133ba23>] alloc_cpumask_var_node+0x23/0x80
>> [<ffffffff8133ba8e>] alloc_cpumask_var+0xe/0x10
>> [<ffffffff813fdb3d>] vp_try_to_find_vqs+0x25d/0x810
>> [<ffffffff813fe171>] vp_find_vqs+0x81/0xb0
>> [<ffffffffa00d2a05>] init_vqs+0x85/0x120 [virtio_balloon]
>> [<ffffffffa00d2c29>] virtballoon_probe+0xf9/0x1a0 [virtio_balloon]
>> [<ffffffff813fb61e>] virtio_dev_probe+0xde/0x140
>> [<ffffffff814452b8>] driver_probe_device+0x98/0x3a0
>> [<ffffffff8144566b>] __driver_attach+0xab/0xb0
>> [<ffffffff814432f4>] bus_for_each_dev+0x94/0xb0
>> [<ffffffff81444f4e>] driver_attach+0x1e/0x20
>> [<ffffffff81444910>] bus_add_driver+0x200/0x280
>> [<ffffffff81445c14>] driver_register+0x74/0x160
>> [<ffffffff813fb7d0>] register_virtio_driver+0x20/0x40
>>
>> v2: change msix_vectors uncoditionaly in vp_free_vectors
>>
>> Cc: Rusty Russell <rusty@rustcorp.com.au>
>> Cc: "Michael S. Tsirkin" <mst@redhat.com>
>> Cc: Jason Wang <jasowang@redhat.com>
>> Signed-off-by: Andrew Vagin <avagin@openvz.org>
>> Signed-off-by: Andrey Vagin <avagin@openvz.org>
>> ---
>> drivers/virtio/virtio_pci.c | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
Thanks, applied.
Cheers,
Rusty.
>>
>> diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
>> index a7ce730..1aba255 100644
>> --- a/drivers/virtio/virtio_pci.c
>> +++ b/drivers/virtio/virtio_pci.c
>> @@ -289,9 +289,9 @@ static void vp_free_vectors(struct virtio_device *vdev)
>>
>> pci_disable_msix(vp_dev->pci_dev);
>> vp_dev->msix_enabled = 0;
>> - vp_dev->msix_vectors = 0;
>> }
>>
>> + vp_dev->msix_vectors = 0;
>> vp_dev->msix_used_vectors = 0;
>> kfree(vp_dev->msix_names);
>> vp_dev->msix_names = NULL;
>> @@ -309,6 +309,8 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
>> unsigned i, v;
>> int err = -ENOMEM;
>>
>> + vp_dev->msix_vectors = nvectors;
>> +
>> vp_dev->msix_entries = kmalloc(nvectors * sizeof *vp_dev->msix_entries,
>> GFP_KERNEL);
>> if (!vp_dev->msix_entries)
>> @@ -336,7 +338,6 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
>> err = -ENOSPC;
>> if (err)
>> goto error;
>> - vp_dev->msix_vectors = nvectors;
>> vp_dev->msix_enabled = 1;
>>
>> /* Set the vector used for configuration */
> Acked-by: Jason Wang <jasowang@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-06-30 23:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1371657588-2782922-1-git-send-email-avagin@openvz.org>
2013-06-19 18:28 ` [PATCH] virtio-pci: fix leaks of msix_affinity_masks Michael S. Tsirkin
2013-06-20 5:36 ` Andrey Vagin
2013-06-20 7:59 ` Michael S. Tsirkin
2013-06-21 6:25 ` Jason Wang
2013-06-30 23:43 ` Rusty Russell
2013-06-19 15:59 Andrew Vagin
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).