[PATCH v2 0/2] block: Use pci_enable_msix_exact() instead of pci_enable_msix()

[PATCH v2 0/2] block: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

Changes since v1:
  - cciss: patch #1: a weird 'goto' removed;
  - cciss: patch #2: pci_enable_msix_exact() used, not pci_enable_msix_range();
  - rsxx: patch dropped - no need to change anything;

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.

This change updates 'cciss' only, but there is also 'nvme' update
pending - I am waiting for Intel guys to clarify if they want to
route it thru their tree. If not, I will post the 'nvme' patch as
a follow-up to this series.

Thanks!

Cc: Jens Axboe <axboe@kernel.dk>
Cc: Mike Miller <mike.miller@hp.com>
Cc: iss_storagedev@hp.com
Cc: linux-pci@vger.kernel.org

Alexander Gordeev (2):
  cciss: Fallback to MSI rather than to INTx if MSI-X failed
  cciss: Use pci_enable_msix_exact() instead of pci_enable_msix()

 drivers/block/cciss.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

-- 
1.7.7.6

[PATCH v2 1/2] cciss: Fallback to MSI rather than to INTx if MSI-X failed

[Alexander Gordeev]

Currently the driver falls back to INTx mode when MSI-X
initialization failed. This is a suboptimal behaviour
for chips that also support MSI. This update changes that
behaviour and falls back to MSI mode in case MSI-X mode
initialization failed.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Mike Miller <mike.miller@hp.com>
Cc: iss_storagedev@hp.com
Cc: Jens Axboe <axboe@kernel.dk>
Cc: linux-pci@vger.kernel.org
---
 drivers/block/cciss.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 036e8ab..73894ca 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -4092,11 +4092,9 @@ static void cciss_interrupt_mode(ctlr_info_t *h)
 		if (err > 0) {
 			dev_warn(&h->pdev->dev,
 				"only %d MSI-X vectors available\n", err);
-			goto default_int_mode;
 		} else {
 			dev_warn(&h->pdev->dev,
 				"MSI-X init failed %d\n", err);
-			goto default_int_mode;
 		}
 	}
 	if (pci_find_capability(h->pdev, PCI_CAP_ID_MSI)) {
-- 
1.7.7.6

[PATCH v2 2/2] cciss: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

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: Mike Miller <mike.miller@hp.com>
Cc: iss_storagedev@hp.com
Cc: Jens Axboe <axboe@kernel.dk>
Cc: linux-pci@vger.kernel.org
---
 drivers/block/cciss.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 73894ca..4595c22 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -4080,7 +4080,7 @@ static void cciss_interrupt_mode(ctlr_info_t *h)
 		goto default_int_mode;
 
 	if (pci_find_capability(h->pdev, PCI_CAP_ID_MSIX)) {
-		err = pci_enable_msix(h->pdev, cciss_msix_entries, 4);
+		err = pci_enable_msix_exact(h->pdev, cciss_msix_entries, 4);
 		if (!err) {
 			h->intr[0] = cciss_msix_entries[0].vector;
 			h->intr[1] = cciss_msix_entries[1].vector;
@@ -4088,10 +4088,6 @@ static void cciss_interrupt_mode(ctlr_info_t *h)
 			h->intr[3] = cciss_msix_entries[3].vector;
 			h->msix_vector = 1;
 			return;
-		}
-		if (err > 0) {
-			dev_warn(&h->pdev->dev,
-				"only %d MSI-X vectors available\n", err);
 		} else {
 			dev_warn(&h->pdev->dev,
 				"MSI-X init failed %d\n", err);
-- 
1.7.7.6

[PATCH v2 3/2] nvme: Use pci_enable_msi_range() and pci_enable_msix_range()

[Alexander Gordeev]

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: Keith Busch <keith.busch@intel.com>
Cc: Matthew Wilcox <willy@linux.intel.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: linux-nvme@lists.infradead.org
Cc: linux-pci@vger.kernel.org
Reviewed-by: Keith Busch <keith.busch@intel.com>
---
 drivers/block/nvme-core.c |   33 +++++++++------------------------
 1 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 51824d1..eca2b3e 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -1837,31 +1837,16 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
 	/* Deregister the admin queue's interrupt */
 	free_irq(dev->entry[0].vector, adminq);
 
-	vecs = nr_io_queues;
-	for (i = 0; i < vecs; i++)
+	for (i = 0; i < nr_io_queues; i++)
 		dev->entry[i].entry = i;
-	for (;;) {
-		result = pci_enable_msix(pdev, dev->entry, vecs);
-		if (result <= 0)
-			break;
-		vecs = result;
-	}
-
-	if (result < 0) {
-		vecs = nr_io_queues;
-		if (vecs > 32)
-			vecs = 32;
-		for (;;) {
-			result = pci_enable_msi_block(pdev, vecs);
-			if (result == 0) {
-				for (i = 0; i < vecs; i++)
-					dev->entry[i].vector = i + pdev->irq;
-				break;
-			} else if (result < 0) {
-				vecs = 1;
-				break;
-			}
-			vecs = result;
+	vecs = pci_enable_msix_range(pdev, dev->entry, 1, nr_io_queues);
+	if (vecs < 0) {
+		vecs = pci_enable_msi_range(pdev, 1, min(nr_io_queues, 32));
+		if (vecs < 0) {
+			vecs = 1;
+		} else {
+			for (i = 0; i < vecs; i++)
+				dev->entry[i].vector = i + pdev->irq;
 		}
 	}
 
-- 
1.7.7.6

-- 
Regards,
Alexander Gordeev
agordeev@redhat.com

[PATCH v2 3/2] nvme: Use pci_enable_msi_range() and pci_enable_msix_range()

[Alexander Gordeev]

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 at redhat.com>
Cc: Keith Busch <keith.busch at intel.com>
Cc: Matthew Wilcox <willy at linux.intel.com>
Cc: Jens Axboe <axboe at kernel.dk>
Cc: linux-nvme at lists.infradead.org
Cc: linux-pci at vger.kernel.org
Reviewed-by: Keith Busch <keith.busch at intel.com>
---
 drivers/block/nvme-core.c |   33 +++++++++------------------------
 1 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 51824d1..eca2b3e 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -1837,31 +1837,16 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
 	/* Deregister the admin queue's interrupt */
 	free_irq(dev->entry[0].vector, adminq);
 
-	vecs = nr_io_queues;
-	for (i = 0; i < vecs; i++)
+	for (i = 0; i < nr_io_queues; i++)
 		dev->entry[i].entry = i;
-	for (;;) {
-		result = pci_enable_msix(pdev, dev->entry, vecs);
-		if (result <= 0)
-			break;
-		vecs = result;
-	}
-
-	if (result < 0) {
-		vecs = nr_io_queues;
-		if (vecs > 32)
-			vecs = 32;
-		for (;;) {
-			result = pci_enable_msi_block(pdev, vecs);
-			if (result == 0) {
-				for (i = 0; i < vecs; i++)
-					dev->entry[i].vector = i + pdev->irq;
-				break;
-			} else if (result < 0) {
-				vecs = 1;
-				break;
-			}
-			vecs = result;
+	vecs = pci_enable_msix_range(pdev, dev->entry, 1, nr_io_queues);
+	if (vecs < 0) {
+		vecs = pci_enable_msi_range(pdev, 1, min(nr_io_queues, 32));
+		if (vecs < 0) {
+			vecs = 1;
+		} else {
+			for (i = 0; i < vecs; i++)
+				dev->entry[i].vector = i + pdev->irq;
 		}
 	}
 
-- 
1.7.7.6

-- 
Regards,
Alexander Gordeev
agordeev at redhat.com

Re: [PATCH v2 0/2] block: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Bjorn Helgaas]

On Wed, Feb 26, 2014 at 10:02:40AM +0100, Alexander Gordeev wrote:
> Changes since v1:
>   - cciss: patch #1: a weird 'goto' removed;
>   - cciss: patch #2: pci_enable_msix_exact() used, not pci_enable_msix_range();
>   - rsxx: patch dropped - no need to change anything;
> 
> 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.
> 
> This change updates 'cciss' only, but there is also 'nvme' update
> pending - I am waiting for Intel guys to clarify if they want to
> route it thru their tree. If not, I will post the 'nvme' patch as
> a follow-up to this series.

Hi Jens,

I'd like to get these merged during the v3.15 merge window.  I'd be glad to
review and apply them through my tree, unless you want to do it.  They do
depend on f7fc32c, which went in after the v3.14 merge window, which makes
it a bit of a hassle.

So let me know if you'd rather handle these; otherwise I'll review them and
put them in my tree next week.

I'll include the nvme update, since it has Keith's "Reviewed-by".

Bjorn

> Cc: Jens Axboe <axboe@kernel.dk>
> Cc: Mike Miller <mike.miller@hp.com>
> Cc: iss_storagedev@hp.com
> Cc: linux-pci@vger.kernel.org
> 
> Alexander Gordeev (2):
>   cciss: Fallback to MSI rather than to INTx if MSI-X failed
>   cciss: Use pci_enable_msix_exact() instead of pci_enable_msix()
> 
>  drivers/block/cciss.c |    8 +-------
>  1 files changed, 1 insertions(+), 7 deletions(-)
> 
> -- 
> 1.7.7.6
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 0/2] block: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Jens Axboe]

On 03/12/2014 10:12 PM, Bjorn Helgaas wrote:
> On Wed, Feb 26, 2014 at 10:02:40AM +0100, Alexander Gordeev wrote:
>> Changes since v1:
>>    - cciss: patch #1: a weird 'goto' removed;
>>    - cciss: patch #2: pci_enable_msix_exact() used, not pci_enable_msix_range();
>>    - rsxx: patch dropped - no need to change anything;
>>
>> 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.
>>
>> This change updates 'cciss' only, but there is also 'nvme' update
>> pending - I am waiting for Intel guys to clarify if they want to
>> route it thru their tree. If not, I will post the 'nvme' patch as
>> a follow-up to this series.
>
> Hi Jens,
>
> I'd like to get these merged during the v3.15 merge window.  I'd be glad to
> review and apply them through my tree, unless you want to do it.  They do
> depend on f7fc32c, which went in after the v3.14 merge window, which makes
> it a bit of a hassle.

My 3.15/drivers (and core) branch are based off 3.14-rc3, so it should 
be OK. I've queued them up, as it's mostly a followup to the previous 
ones from Alexander.

-- 
Jens Axboe

Re: [PATCH v2 0/2] block: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Bjorn Helgaas]

On Thu, Mar 13, 2014 at 9:28 AM, Jens Axboe <axboe@kernel.dk> wrote:
> On 03/12/2014 10:12 PM, Bjorn Helgaas wrote:
>>
>> On Wed, Feb 26, 2014 at 10:02:40AM +0100, Alexander Gordeev wrote:
>>>
>>> Changes since v1:
>>>    - cciss: patch #1: a weird 'goto' removed;
>>>    - cciss: patch #2: pci_enable_msix_exact() used, not
>>> pci_enable_msix_range();
>>>    - rsxx: patch dropped - no need to change anything;
>>>
>>> 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.
>>>
>>> This change updates 'cciss' only, but there is also 'nvme' update
>>> pending - I am waiting for Intel guys to clarify if they want to
>>> route it thru their tree. If not, I will post the 'nvme' patch as
>>> a follow-up to this series.
>>
>>
>> Hi Jens,
>>
>> I'd like to get these merged during the v3.15 merge window.  I'd be glad
>> to
>> review and apply them through my tree, unless you want to do it.  They do
>> depend on f7fc32c, which went in after the v3.14 merge window, which makes
>> it a bit of a hassle.
>
>
> My 3.15/drivers (and core) branch are based off 3.14-rc3, so it should be
> OK. I've queued them up, as it's mostly a followup to the previous ones from
> Alexander.

Great, thanks!  I'll take them off my to-do list.

Bjorn

Re: [PATCH v2 0/2] block: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

On Thu, Mar 13, 2014 at 09:28:20AM -0600, Jens Axboe wrote:
> On 03/12/2014 10:12 PM, Bjorn Helgaas wrote:
> >On Wed, Feb 26, 2014 at 10:02:40AM +0100, Alexander Gordeev wrote:
> >>Changes since v1:
> >>   - cciss: patch #1: a weird 'goto' removed;
> >>   - cciss: patch #2: pci_enable_msix_exact() used, not pci_enable_msix_range();
> >>   - rsxx: patch dropped - no need to change anything;
> >>
> >>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.
> >>
> >>This change updates 'cciss' only, but there is also 'nvme' update
> >>pending - I am waiting for Intel guys to clarify if they want to
> >>route it thru their tree. If not, I will post the 'nvme' patch as
> >>a follow-up to this series.
> >
> >Hi Jens,
> >
> >I'd like to get these merged during the v3.15 merge window.  I'd be glad to
> >review and apply them through my tree, unless you want to do it.  They do
> >depend on f7fc32c, which went in after the v3.14 merge window, which makes
> >it a bit of a hassle.
> 
> My 3.15/drivers (and core) branch are based off 3.14-rc3, so it
> should be OK. I've queued them up, as it's mostly a followup to the
> previous ones from Alexander.

Oh-oh, cciss patch #2 requires commit 3ce4e86 ("PCI/MSI: Add
pci_enable_msi_exact() and pci_enable_msix_exact()") which was
pulled to 3.14-rc4 only. Sorry for failing to clarify that :(

And I also notice 3111cc3 ("skd: Use pci_enable_msix_exact() instead
of pci_enable_msix_range()") in your tree also should not compile :(

> -- 
> Jens Axboe
> 

-- 
Regards,
Alexander Gordeev
agordeev@redhat.com

Re: [PATCH v2 0/2] block: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Jens Axboe]

On 03/13/2014 11:36 AM, Alexander Gordeev wrote:
> On Thu, Mar 13, 2014 at 09:28:20AM -0600, Jens Axboe wrote:
>> On 03/12/2014 10:12 PM, Bjorn Helgaas wrote:
>>> On Wed, Feb 26, 2014 at 10:02:40AM +0100, Alexander Gordeev wrote:
>>>> Changes since v1:
>>>>    - cciss: patch #1: a weird 'goto' removed;
>>>>    - cciss: patch #2: pci_enable_msix_exact() used, not pci_enable_msix_range();
>>>>    - rsxx: patch dropped - no need to change anything;
>>>>
>>>> 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.
>>>>
>>>> This change updates 'cciss' only, but there is also 'nvme' update
>>>> pending - I am waiting for Intel guys to clarify if they want to
>>>> route it thru their tree. If not, I will post the 'nvme' patch as
>>>> a follow-up to this series.
>>>
>>> Hi Jens,
>>>
>>> I'd like to get these merged during the v3.15 merge window.  I'd be glad to
>>> review and apply them through my tree, unless you want to do it.  They do
>>> depend on f7fc32c, which went in after the v3.14 merge window, which makes
>>> it a bit of a hassle.
>>
>> My 3.15/drivers (and core) branch are based off 3.14-rc3, so it
>> should be OK. I've queued them up, as it's mostly a followup to the
>> previous ones from Alexander.
>
> Oh-oh, cciss patch #2 requires commit 3ce4e86 ("PCI/MSI: Add
> pci_enable_msi_exact() and pci_enable_msix_exact()") which was
> pulled to 3.14-rc4 only. Sorry for failing to clarify that :(
>
> And I also notice 3111cc3 ("skd: Use pci_enable_msix_exact() instead
> of pci_enable_msix_range()") in your tree also should not compile :(

Gah, please be a bit more diligent in the future, that's a lot of 
breakage for a small series. If it's this broken, I'll have to rebase 
the branch, which I attempt to never do for the "official" branches.

-- 
Jens Axboe

Re: [PATCH v2 0/2] block: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

On Thu, Mar 13, 2014 at 06:36:56PM +0100, Alexander Gordeev wrote:
> Oh-oh, cciss patch #2 requires commit 3ce4e86 ("PCI/MSI: Add
> pci_enable_msi_exact() and pci_enable_msix_exact()") which was
> pulled to 3.14-rc4 only. Sorry for failing to clarify that :(
> 
> And I also notice 3111cc3 ("skd: Use pci_enable_msix_exact() instead
> of pci_enable_msix_range()") in your tree also should not compile :(

Hi Jens,

3.14 contains prerequisite commits for the patches above.
Would you pull them or do you want me to resend the two?

Thanks!

-- 
Regards,
Alexander Gordeev
agordeev@redhat.com

Re: [PATCH v2 0/2] block: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Jens Axboe]

On 03/31/2014 01:52 PM, Alexander Gordeev wrote:
> On Thu, Mar 13, 2014 at 06:36:56PM +0100, Alexander Gordeev wrote:
>> Oh-oh, cciss patch #2 requires commit 3ce4e86 ("PCI/MSI: Add
>> pci_enable_msi_exact() and pci_enable_msix_exact()") which was
>> pulled to 3.14-rc4 only. Sorry for failing to clarify that :(
>>
>> And I also notice 3111cc3 ("skd: Use pci_enable_msix_exact() instead
>> of pci_enable_msix_range()") in your tree also should not compile :(
>
> Hi Jens,
>
> 3.14 contains prerequisite commits for the patches above.
> Would you pull them or do you want me to resend the two?

I'm assuming you are referring to the cciss patches? I can add those 
back, for a post-merge pull request.

-- 
Jens Axboe

Re: [PATCH v2 0/2] block: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

On Mon, Mar 31, 2014 at 02:12:48PM -0600, Jens Axboe wrote:
> On 03/31/2014 01:52 PM, Alexander Gordeev wrote:
> >On Thu, Mar 13, 2014 at 06:36:56PM +0100, Alexander Gordeev wrote:
> >>Oh-oh, cciss patch #2 requires commit 3ce4e86 ("PCI/MSI: Add
> >>pci_enable_msi_exact() and pci_enable_msix_exact()") which was
> >>pulled to 3.14-rc4 only. Sorry for failing to clarify that :(
> >>
> >>And I also notice 3111cc3 ("skd: Use pci_enable_msix_exact() instead
> >>of pci_enable_msix_range()") in your tree also should not compile :(
> >
> >Hi Jens,
> >
> >3.14 contains prerequisite commits for the patches above.
> >Would you pull them or do you want me to resend the two?
> 
> I'm assuming you are referring to the cciss patches? I can add those
> back, for a post-merge pull request.

Nope. You kicked off the second of two 'cciss' patch ("PCI/MSI: Add
pci_enable_msi_exact() and pci_enable_msix_exact()") and the last one
from a series I posted in another thread ("skd: Use pci_enable_msix_exact()
instead of pci_enable_msix_range()").

> 
> -- 
> Jens Axboe
> 

-- 
Regards,
Alexander Gordeev
agordeev@redhat.com