linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] virtio: Use pci_enable_msix_range() instead of pci_enable_msix()
@ 2014-02-19 10:15 Alexander Gordeev
  2014-02-20  1:44 ` Rusty Russell
  2014-02-20  5:17 ` [PATCH] virtio: Use pci_enable_msix_range() " Michael S. Tsirkin
  0 siblings, 2 replies; 7+ messages in thread
From: Alexander Gordeev @ 2014-02-19 10:15 UTC (permalink / raw)
  To: linux-kernel
  Cc: Alexander Gordeev, Rusty Russell, Michael S. Tsirkin, virtio-dev,
	virtualization, linux-pci

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 <agordeev@redhat.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: virtio-dev@lists.oasis-open.org
Cc: virtualization@lists.linux-foundation.org
Cc: linux-pci@vger.kernel.org
---
 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


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH] virtio: Use pci_enable_msix_range() instead of pci_enable_msix()
  2014-02-19 10:15 [PATCH] virtio: Use pci_enable_msix_range() instead of pci_enable_msix() Alexander Gordeev
@ 2014-02-20  1:44 ` Rusty Russell
  2014-02-21 16:59   ` Alexander Gordeev
  2014-02-20  5:17 ` [PATCH] virtio: Use pci_enable_msix_range() " Michael S. Tsirkin
  1 sibling, 1 reply; 7+ messages in thread
From: Rusty Russell @ 2014-02-20  1:44 UTC (permalink / raw)
  To: Alexander Gordeev, linux-kernel
  Cc: Alexander Gordeev, Michael S. Tsirkin, virtio-dev, virtualization,
	linux-pci

Alexander Gordeev <agordeev@redhat.com> 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 <agordeev@redhat.com>
> Cc: Rusty Russell <rusty@rustcorp.com.au>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: virtio-dev@lists.oasis-open.org
> Cc: virtualization@lists.linux-foundation.org
> Cc: linux-pci@vger.kernel.org
> ---
>  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 <rusty@rustcorp.com.au>

Cheers,
Rusty.


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] virtio: Use pci_enable_msix_range() instead of pci_enable_msix()
  2014-02-19 10:15 [PATCH] virtio: Use pci_enable_msix_range() instead of pci_enable_msix() Alexander Gordeev
  2014-02-20  1:44 ` Rusty Russell
@ 2014-02-20  5:17 ` Michael S. Tsirkin
  1 sibling, 0 replies; 7+ messages in thread
From: Michael S. Tsirkin @ 2014-02-20  5:17 UTC (permalink / raw)
  To: Alexander Gordeev
  Cc: linux-kernel, Rusty Russell, virtio-dev, virtualization,
	linux-pci

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 <agordeev@redhat.com>
> Cc: Rusty Russell <rusty@rustcorp.com.au>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: virtio-dev@lists.oasis-open.org
> Cc: virtualization@lists.linux-foundation.org
> Cc: linux-pci@vger.kernel.org

Acked-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH] virtio: Use pci_enable_msix_range() instead of pci_enable_msix()
  2014-02-20  1:44 ` Rusty Russell
@ 2014-02-21 16:59   ` Alexander Gordeev
  2014-02-21 17:01     ` [PATCH v2] virtio: Use pci_enable_msix_exact() " Alexander Gordeev
  0 siblings, 1 reply; 7+ messages in thread
From: Alexander Gordeev @ 2014-02-21 16:59 UTC (permalink / raw)
  To: Rusty Russell
  Cc: linux-kernel, Michael S. Tsirkin, virtio-dev, virtualization,
	linux-pci

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
agordeev@redhat.com

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v2] virtio: Use pci_enable_msix_exact() instead of pci_enable_msix()
  2014-02-21 16:59   ` Alexander Gordeev
@ 2014-02-21 17:01     ` Alexander Gordeev
  2014-02-22 21:18       ` Michael S. Tsirkin
  0 siblings, 1 reply; 7+ messages in thread
From: Alexander Gordeev @ 2014-02-21 17:01 UTC (permalink / raw)
  To: Rusty Russell
  Cc: linux-kernel, Michael S. Tsirkin, virtio-dev, virtualization,
	linux-pci

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 <agordeev@redhat.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: virtio-dev@lists.oasis-open.org
Cc: virtualization@lists.linux-foundation.org
Cc: linux-pci@vger.kernel.org
---
 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
agordeev@redhat.com

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH v2] virtio: Use pci_enable_msix_exact() instead of pci_enable_msix()
  2014-02-21 17:01     ` [PATCH v2] virtio: Use pci_enable_msix_exact() " Alexander Gordeev
@ 2014-02-22 21:18       ` Michael S. Tsirkin
  2014-02-24  1:43         ` Rusty Russell
  0 siblings, 1 reply; 7+ messages in thread
From: Michael S. Tsirkin @ 2014-02-22 21:18 UTC (permalink / raw)
  To: Alexander Gordeev
  Cc: Rusty Russell, linux-kernel, virtio-dev, virtualization,
	linux-pci

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 <mst@redhat.com>

> Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
> Cc: Rusty Russell <rusty@rustcorp.com.au>
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: virtio-dev@lists.oasis-open.org
> Cc: virtualization@lists.linux-foundation.org
> Cc: linux-pci@vger.kernel.org
> ---
>  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
> agordeev@redhat.com

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2] virtio: Use pci_enable_msix_exact() instead of pci_enable_msix()
  2014-02-22 21:18       ` Michael S. Tsirkin
@ 2014-02-24  1:43         ` Rusty Russell
  0 siblings, 0 replies; 7+ messages in thread
From: Rusty Russell @ 2014-02-24  1:43 UTC (permalink / raw)
  To: Michael S. Tsirkin, Alexander Gordeev
  Cc: linux-kernel, virtio-dev, virtualization, linux-pci

"Michael S. Tsirkin" <mst@redhat.com> 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 <mst@redhat.com>

Thanks, applied.

Cheers,
Rusty.

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2014-02-24  1:43 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-19 10:15 [PATCH] virtio: Use pci_enable_msix_range() instead of pci_enable_msix() Alexander Gordeev
2014-02-20  1:44 ` Rusty Russell
2014-02-21 16:59   ` Alexander Gordeev
2014-02-21 17:01     ` [PATCH v2] virtio: Use pci_enable_msix_exact() " Alexander Gordeev
2014-02-22 21:18       ` Michael S. Tsirkin
2014-02-24  1:43         ` Rusty Russell
2014-02-20  5:17 ` [PATCH] virtio: Use pci_enable_msix_range() " Michael S. Tsirkin

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).