2014-02-19 10:14:05

by Alexander Gordeev

Subject: [PATCH] virtio: Use pci_enable_msix_range() instead of pci_enable_msix()

As result deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() and pci_enable_msix_range()
interfaces.

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: Rusty Russell <[email protected]>
Cc: "Michael S. Tsirkin" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
drivers/virtio/virtio_pci.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index a416f9b..dea042c 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -333,11 +333,9 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
for (i = 0; i < nvectors; ++i)
vp_dev->msix_entries[i].entry = i;

- /* pci_enable_msix returns positive if we can't get this many. */
- err = pci_enable_msix(vp_dev->pci_dev, vp_dev->msix_entries, nvectors);
- if (err > 0)
- err = -ENOSPC;
- if (err)
+ err = pci_enable_msix_range(vp_dev->pci_dev,
+ vp_dev->msix_entries, nvectors, nvectors);
+ if (err < 0)
goto error;
vp_dev->msix_enabled = 1;

--
1.7.7.6

2014-02-20 04:24:52

by Rusty Russell

Subject: Re: [PATCH] virtio: Use pci_enable_msix_range() instead of pci_enable_msix()

Alexander Gordeev <[email protected]> writes:
> As result deprecation of MSI-X/MSI enablement functions
> pci_enable_msix() and pci_enable_msi_block() all drivers
> using these two interfaces need to be updated to use the
> new pci_enable_msi_range() and pci_enable_msix_range()
> interfaces.
>
> Signed-off-by: Alexander Gordeev <[email protected]>
> Cc: Rusty Russell <[email protected]>
> Cc: "Michael S. Tsirkin" <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> drivers/virtio/virtio_pci.c | 8 +++-----
> 1 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
> index a416f9b..dea042c 100644
> --- a/drivers/virtio/virtio_pci.c
> +++ b/drivers/virtio/virtio_pci.c
> @@ -333,11 +333,9 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
> for (i = 0; i < nvectors; ++i)
> vp_dev->msix_entries[i].entry = i;
>
> - /* pci_enable_msix returns positive if we can't get this many. */
> - err = pci_enable_msix(vp_dev->pci_dev, vp_dev->msix_entries, nvectors);
> - if (err > 0)
> - err = -ENOSPC;
> - if (err)
> + err = pci_enable_msix_range(vp_dev->pci_dev,
> + vp_dev->msix_entries, nvectors, nvectors);
> + if (err < 0)
> goto error;
> vp_dev->msix_enabled = 1;

I've put this in my pending queue, but in case someone else wants to
take it:

Acked-by: Rusty Russell <[email protected]>

Cheers,
Rusty.

2014-02-20 05:12:57

by Michael S. Tsirkin

Subject: Re: [PATCH] virtio: Use pci_enable_msix_range() instead of pci_enable_msix()

On Wed, Feb 19, 2014 at 11:15:29AM +0100, Alexander Gordeev wrote:
> As result deprecation of MSI-X/MSI enablement functions
> pci_enable_msix() and pci_enable_msi_block() all drivers
> using these two interfaces need to be updated to use the
> new pci_enable_msi_range() and pci_enable_msix_range()
> interfaces.
>
> Signed-off-by: Alexander Gordeev <[email protected]>
> Cc: Rusty Russell <[email protected]>
> Cc: "Michael S. Tsirkin" <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]

Acked-by: Michael S. Tsirkin <[email protected]>

> ---
> drivers/virtio/virtio_pci.c | 8 +++-----
> 1 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
> index a416f9b..dea042c 100644
> --- a/drivers/virtio/virtio_pci.c
> +++ b/drivers/virtio/virtio_pci.c
> @@ -333,11 +333,9 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
> for (i = 0; i < nvectors; ++i)
> vp_dev->msix_entries[i].entry = i;
>
> - /* pci_enable_msix returns positive if we can't get this many. */
> - err = pci_enable_msix(vp_dev->pci_dev, vp_dev->msix_entries, nvectors);
> - if (err > 0)
> - err = -ENOSPC;
> - if (err)
> + err = pci_enable_msix_range(vp_dev->pci_dev,
> + vp_dev->msix_entries, nvectors, nvectors);
> + if (err < 0)
> goto error;
> vp_dev->msix_enabled = 1;
>
> --
> 1.7.7.6

2014-02-21 16:57:53

by Alexander Gordeev

Subject: Re: [PATCH] virtio: Use pci_enable_msix_range() instead of pci_enable_msix()

Hi Rusty et al,

Based on recently accepted to the mainline pci_enable_msix_exact() function,
I am sending a updated version of the patch. Please, let me know if it does
not work for you and you need and incremental update from the previous version.

Thanks!


--
Regards,
Alexander Gordeev
[email protected]

2014-02-21 16:59:34

by Alexander Gordeev

Subject: [PATCH v2] virtio: Use pci_enable_msix_exact() instead of pci_enable_msix()

As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range() or pci_enable_msi_exact()
and pci_enable_msix_range() or pci_enable_msix_exact()
interfaces.

Signed-off-by: Alexander Gordeev <[email protected]>
Cc: Rusty Russell <[email protected]>
Cc: "Michael S. Tsirkin" <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
drivers/virtio/virtio_pci.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index a416f9b..101db3f 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -333,10 +333,8 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
for (i = 0; i < nvectors; ++i)
vp_dev->msix_entries[i].entry = i;

- /* pci_enable_msix returns positive if we can't get this many. */
- err = pci_enable_msix(vp_dev->pci_dev, vp_dev->msix_entries, nvectors);
- if (err > 0)
- err = -ENOSPC;
+ err = pci_enable_msix_exact(vp_dev->pci_dev,
+ vp_dev->msix_entries, nvectors);
if (err)
goto error;
vp_dev->msix_enabled = 1;
--
1.7.7.6

--
Regards,
Alexander Gordeev
[email protected]

2014-02-22 21:13:32

by Michael S. Tsirkin

Subject: Re: [PATCH v2] virtio: Use pci_enable_msix_exact() instead of pci_enable_msix()

On Fri, Feb 21, 2014 at 06:01:28PM +0100, Alexander Gordeev wrote:
> As result of deprecation of MSI-X/MSI enablement functions
> pci_enable_msix() and pci_enable_msi_block() all drivers
> using these two interfaces need to be updated to use the
> new pci_enable_msi_range() or pci_enable_msi_exact()
> and pci_enable_msix_range() or pci_enable_msix_exact()
> interfaces.


Acked-by: Michael S. Tsirkin <[email protected]>

> Signed-off-by: Alexander Gordeev <[email protected]>
> Cc: Rusty Russell <[email protected]>
> Cc: "Michael S. Tsirkin" <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> drivers/virtio/virtio_pci.c | 6 ++----
> 1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
> index a416f9b..101db3f 100644
> --- a/drivers/virtio/virtio_pci.c
> +++ b/drivers/virtio/virtio_pci.c
> @@ -333,10 +333,8 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,
> for (i = 0; i < nvectors; ++i)
> vp_dev->msix_entries[i].entry = i;
>
> - /* pci_enable_msix returns positive if we can't get this many. */
> - err = pci_enable_msix(vp_dev->pci_dev, vp_dev->msix_entries, nvectors);
> - if (err > 0)
> - err = -ENOSPC;
> + err = pci_enable_msix_exact(vp_dev->pci_dev,
> + vp_dev->msix_entries, nvectors);
> if (err)
> goto error;
> vp_dev->msix_enabled = 1;
> --
> 1.7.7.6
>
> --
> Regards,
> Alexander Gordeev
> [email protected]

2014-02-24 03:40:49

by Rusty Russell

Subject: Re: [PATCH v2] virtio: Use pci_enable_msix_exact() instead of pci_enable_msix()

"Michael S. Tsirkin" <[email protected]> writes:
> On Fri, Feb 21, 2014 at 06:01:28PM +0100, Alexander Gordeev wrote:
>> As result of deprecation of MSI-X/MSI enablement functions
>> pci_enable_msix() and pci_enable_msi_block() all drivers
>> using these two interfaces need to be updated to use the
>> new pci_enable_msi_range() or pci_enable_msi_exact()
>> and pci_enable_msix_range() or pci_enable_msix_exact()
>> interfaces.
>
>
> Acked-by: Michael S. Tsirkin <[email protected]>

Thanks, applied.

Cheers,
Rusty.