diff mbox

[net,3/8] ixgbe: fix vf lookup

Message ID 1328693798-27323-4-git-send-email-jeffrey.t.kirsher@intel.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Kirsher, Jeffrey T Feb. 8, 2012, 9:36 a.m. UTC
From: Greg Rose <gregory.v.rose@intel.com>

Recent addition of code to find already allocated VFs failed to take
account that systems with 2 or more multi-port SR-IOV capable controllers
might have already enabled VFs.  Make sure that the VFs the function is
finding are actually subordinate to the particular instance of the adapter
that is looking for them and not subordinate to some device that has
previously enabled SR-IOV.

This bug exists in 3.2 stable as well as 3.3 release candidates.

CC: stable@vger.kernel.org
Reported-by: David Ahern <daahern@cisco.com>
Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
Tested-by: Robert E Garrett <robertX.e.garrett@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Comments

David Miller Feb. 8, 2012, 11:33 p.m. UTC | #1
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Wed,  8 Feb 2012 01:36:33 -0800

> -		if (pvfdev->devfn == vf_devfn)
> +		if (pvfdev->devfn == vf_devfn &&
> +				(pvfdev->bus->number >= pdev->bus->number))

Come on.... do you look at these patches at all?

I don't think you did, because this kind of code formatting stuff
sticks out like a sore thumb.
--
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 Feb. 8, 2012, 11:39 p.m. UTC | #2
> -----Original Message-----
> From: David Miller [mailto:davem@davemloft.net]
> Sent: Wednesday, February 08, 2012 3:33 PM
> To: Kirsher, Jeffrey T
> Cc: Rose, Gregory V; netdev@vger.kernel.org; gospo@redhat.com;
> sassmann@redhat.com; stable@vger.kernel.org
> Subject: Re: [net 3/8] ixgbe: fix vf lookup
> 
> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Wed,  8 Feb 2012 01:36:33 -0800
> 
> > -		if (pvfdev->devfn == vf_devfn)
> > +		if (pvfdev->devfn == vf_devfn &&
> > +				(pvfdev->bus->number >= pdev->bus->number))
> 
> Come on.... do you look at these patches at all?
> 
> I don't think you did, because this kind of code formatting stuff
> sticks out like a sore thumb.

I'll fix it.

- 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
Kirsher, Jeffrey T Feb. 9, 2012, 9:06 a.m. UTC | #3
On Wed, 2012-02-08 at 18:33 -0500, David Miller wrote:
> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Wed,  8 Feb 2012 01:36:33 -0800
> 
> > -             if (pvfdev->devfn == vf_devfn)
> > +             if (pvfdev->devfn == vf_devfn &&
> > +                             (pvfdev->bus->number >=
> pdev->bus->number))
> 
> Come on.... do you look at these patches at all?
> 
> I don't think you did, because this kind of code formatting stuff
> sticks out like a sore thumb. 

Your right, I over-looked this, and it is especially bad since I caught
the problem with the igb patch (which was right before this one).  I
remember thinking that I need to make sure the ixgbe patch did not have
the same formatting issue.  But completely forgot before I applied the
patch.
diff mbox

Patch

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index 8d8cdbc..b982710 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -67,7 +67,8 @@  static int ixgbe_find_enabled_vfs(struct ixgbe_adapter *adapter)
 	vf_devfn = pdev->devfn + 0x80;
 	pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, device_id, NULL);
 	while (pvfdev) {
-		if (pvfdev->devfn == vf_devfn)
+		if (pvfdev->devfn == vf_devfn &&
+				(pvfdev->bus->number >= pdev->bus->number))
 			vfs_found++;
 		vf_devfn += 2;
 		pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID,