Patchwork [net-2.6] ixgbe/igb: catch invalid VF settings

login
register
mail settings
Submitter Andy Gospodarek
Date July 21, 2010, 4:40 p.m.
Message ID <1279730431-17156-1-git-send-email-andy@greyhouse.net>
Download mbox | patch
Permalink /patch/59471/
State Accepted
Delegated to: David Miller
Headers show

Comments

Andy Gospodarek - July 21, 2010, 4:40 p.m.
Some ixgbe cards put an invalid VF device ID in the PCIe SR-IOV
capability.  The ixgbe driver is only valid for PFs or non SR-IOV
hardware.  It seems that the same problem could occur on igb hardware as
well, so if we discover we are trying to initialize a VF in ixbge_probe
or igb_probe, print an error and exit.

Based on a patch for ixgbe from Chris Wright <chrisw@sous-sol.org>.

Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Cc: Chris Wright <chrisw@sous-sol.org>

---
 drivers/net/igb/igb_main.c     |    9 +++++++++
 drivers/net/ixgbe/ixgbe_main.c |    9 +++++++++
 2 files changed, 18 insertions(+), 0 deletions(-)
Chris Wright - July 21, 2010, 4:50 p.m.
* Andy Gospodarek (andy@greyhouse.net) wrote:
> Some ixgbe cards put an invalid VF device ID in the PCIe SR-IOV
> capability.  The ixgbe driver is only valid for PFs or non SR-IOV
> hardware.  It seems that the same problem could occur on igb hardware as
> well, so if we discover we are trying to initialize a VF in ixbge_probe
> or igb_probe, print an error and exit.
> 
> Based on a patch for ixgbe from Chris Wright <chrisw@sous-sol.org>.
> 
> Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
> Cc: Chris Wright <chrisw@sous-sol.org>

Acked-by: Chris Wright <chrisw@sous-sol.org>

Only seen this on ixgbe, but since the result there is a kernel panic
makes sense to be defensive.

thanks,
-chris
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rose, Gregory V - July 21, 2010, 8:23 p.m.
>-----Original Message-----
>From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org]
>On Behalf Of Chris Wright
>Sent: Wednesday, July 21, 2010 9:51 AM
>To: Andy Gospodarek
>Cc: netdev@vger.kernel.org; chrisw@sous-sol.org
>Subject: Re: [PATCH net-2.6] ixgbe/igb: catch invalid VF settings
>
>* Andy Gospodarek (andy@greyhouse.net) wrote:
>> Some ixgbe cards put an invalid VF device ID in the PCIe SR-IOV
>> capability.  The ixgbe driver is only valid for PFs or non SR-IOV
>> hardware.  It seems that the same problem could occur on igb hardware
>as
>> well, so if we discover we are trying to initialize a VF in
>ixbge_probe
>> or igb_probe, print an error and exit.
>>
>> Based on a patch for ixgbe from Chris Wright <chrisw@sous-sol.org>.
>>
>> Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
>> Cc: Chris Wright <chrisw@sous-sol.org>
>
>Acked-by: Chris Wright <chrisw@sous-sol.org>
>
>Only seen this on ixgbe, but since the result there is a kernel panic
>makes sense to be defensive.
>
>thanks,
>-chris

Acked-by: Greg Rose <gregory.v.rose@intel.com>

Looks good, thanks.

- Greg

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jeff Kirsher - July 21, 2010, 8:31 p.m.
On Wed, Jul 21, 2010 at 13:23, Rose, Gregory V <gregory.v.rose@intel.com> wrote:
>>-----Original Message-----
>>From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org]
>>On Behalf Of Chris Wright
>>Sent: Wednesday, July 21, 2010 9:51 AM
>>To: Andy Gospodarek
>>Cc: netdev@vger.kernel.org; chrisw@sous-sol.org
>>Subject: Re: [PATCH net-2.6] ixgbe/igb: catch invalid VF settings
>>
>>* Andy Gospodarek (andy@greyhouse.net) wrote:
>>> Some ixgbe cards put an invalid VF device ID in the PCIe SR-IOV
>>> capability.  The ixgbe driver is only valid for PFs or non SR-IOV
>>> hardware.  It seems that the same problem could occur on igb hardware
>>as
>>> well, so if we discover we are trying to initialize a VF in
>>ixbge_probe
>>> or igb_probe, print an error and exit.
>>>
>>> Based on a patch for ixgbe from Chris Wright <chrisw@sous-sol.org>.
>>>
>>> Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
>>> Cc: Chris Wright <chrisw@sous-sol.org>
>>
>>Acked-by: Chris Wright <chrisw@sous-sol.org>
>>
>>Only seen this on ixgbe, but since the result there is a kernel panic
>>makes sense to be defensive.
>>
>>thanks,
>>-chris
>
> Acked-by: Greg Rose <gregory.v.rose@intel.com>
>
> Looks good, thanks.
>
> - Greg
>

Dave, I do not plan on adding this patch to my queue, so feel free to
take this patch after review.
David Miller - July 21, 2010, 8:45 p.m.
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Wed, 21 Jul 2010 13:31:38 -0700

> On Wed, Jul 21, 2010 at 13:23, Rose, Gregory V <gregory.v.rose@intel.com> wrote:
>>>-----Original Message-----
>>>From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org]
>>>On Behalf Of Chris Wright
>>>Sent: Wednesday, July 21, 2010 9:51 AM
>>>To: Andy Gospodarek
>>>Cc: netdev@vger.kernel.org; chrisw@sous-sol.org
>>>Subject: Re: [PATCH net-2.6] ixgbe/igb: catch invalid VF settings
>>>
>>>* Andy Gospodarek (andy@greyhouse.net) wrote:
>>>> Some ixgbe cards put an invalid VF device ID in the PCIe SR-IOV
>>>> capability.  The ixgbe driver is only valid for PFs or non SR-IOV
>>>> hardware.  It seems that the same problem could occur on igb hardware
>>>as
>>>> well, so if we discover we are trying to initialize a VF in
>>>ixbge_probe
>>>> or igb_probe, print an error and exit.
>>>>
>>>> Based on a patch for ixgbe from Chris Wright <chrisw@sous-sol.org>.
>>>>
>>>> Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
>>>> Cc: Chris Wright <chrisw@sous-sol.org>
>>>
>>>Acked-by: Chris Wright <chrisw@sous-sol.org>
>>>
>>>Only seen this on ixgbe, but since the result there is a kernel panic
>>>makes sense to be defensive.
>>>
>>>thanks,
>>>-chris
>>
>> Acked-by: Greg Rose <gregory.v.rose@intel.com>
>>
>> Looks good, thanks.
>>
>> - Greg
>>
> 
> Dave, I do not plan on adding this patch to my queue, so feel free to
> take this patch after review.

Ok, will do.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - July 21, 2010, 8:51 p.m.
From: David Miller <davem@davemloft.net>
Date: Wed, 21 Jul 2010 13:45:13 -0700 (PDT)

> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Wed, 21 Jul 2010 13:31:38 -0700
> 
>> Dave, I do not plan on adding this patch to my queue, so feel free to
>> take this patch after review.
> 
> Ok, will do.

Applied, thanks everyone.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 3881918..cea37e0 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1722,6 +1722,15 @@  static int __devinit igb_probe(struct pci_dev *pdev,
 	u16 eeprom_apme_mask = IGB_EEPROM_APME;
 	u32 part_num;
 
+	/* Catch broken hardware that put the wrong VF device ID in
+	 * the PCIe SR-IOV capability.
+	 */
+	if (pdev->is_virtfn) {
+		WARN(1, KERN_ERR "%s (%hx:%hx) should not be a VF!\n",
+		     pci_name(pdev), pdev->vendor, pdev->device);
+		return -EINVAL;
+	}
+
 	err = pci_enable_device_mem(pdev);
 	if (err)
 		return err;
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 7b5d976..74d9b6d 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -6492,6 +6492,15 @@  static int __devinit ixgbe_probe(struct pci_dev *pdev,
 #endif
 	u32 part_num, eec;
 
+	/* Catch broken hardware that put the wrong VF device ID in
+	 * the PCIe SR-IOV capability.
+	 */
+	if (pdev->is_virtfn) {
+		WARN(1, KERN_ERR "%s (%hx:%hx) should not be a VF!\n",
+		     pci_name(pdev), pdev->vendor, pdev->device);
+		return -EINVAL;
+	}
+
 	err = pci_enable_device_mem(pdev);
 	if (err)
 		return err;