ixgbe: define IXGBE_MAX_VFS_DRV_LIMIT macro and cleanup const 63

PATCH In review Ethan Zhao 2 participants 8 messages Jan 15, 2014 – Jan 16, 2014

Subsystems (3)

Networking Network drivers Intel Ethernet

lore

Share & tools

lore

Ethan Zhao

author

2014-01-15 14:12 UTC #0 lore raw

PATCH v3 1/2 ixgbe: define IXGBE_MAX_VFS_DRV_LIMIT macro and cleanup const 63

Because ixgbe driver limit the max number of VF functions could be enabled to 63, so define one macro IXGBE_MAX_VFS_DRV_LIMIT and cleanup the const 63 in code.

v2: fix a typo.
v3: fix a encoding issue.

Signed-off-by Ethan Zhao <[email protected]>

---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c  | 4 ++--
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 5 +++--
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +2 -2

index 0ade0cd..47e9b44 100644
@@ -4818,7 +4818,7 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter)
 #ifdef CONFIG_PCI_IOV
 	/* assign number of SR-IOV VFs */
 	if (hw->mac.type != ixgbe_mac_82598EB)
-		adapter->num_vfs = (max_vfs > 63) ? 0 : max_vfs;
+		adapter->num_vfs = (max_vfs > IXGBE_MAX_VFS_DRV_LIMIT) ? 0 : max_vfs;
 
 #endif
 	/* enable itr by default in dynamic mode */

@@ -7640,7 +7640,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	ixgbe_init_mbx_params_pf(hw);
 	memcpy(&hw->mbx.ops, ii->mbx_ops, sizeof(hw->mbx.ops));
 	ixgbe_enable_sriov(adapter);
-	pci_sriov_set_totalvfs(pdev, 63);
+	pci_sriov_set_totalvfs(pdev, IXGBE_MAX_VFS_DRV_LIMIT);
 skip_sriov:
 
 #endif

drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +3 -2

index 276d7b1..6925979 100644
@@ -152,7 +152,8 @@ void ixgbe_enable_sriov(struct ixgbe_adapter *adapter)
 		 * physical function.  If the user requests greater thn
 		 * 63 VFs then it is an error - reset to default of zero.
 		 */
-		adapter->num_vfs = min_t(unsigned int, adapter->num_vfs, 63);
+		adapter->num_vfs = min_t(unsigned int,
+					adapter->num_vfs, IXGBE_MAX_VFS_DRV_LIMIT);
 
 		err = pci_enable_sriov(adapter->pdev, adapter->num_vfs);
 		if (err) {

@@ -259,7 +260,7 @@ static int ixgbe_pci_sriov_enable(struct pci_dev *dev, int num_vfs)
 	 * PF.  The PCI bus driver already checks for other values out of
 	 * range.
 	 */
-	if (num_vfs > 63) {
+	if (num_vfs > IXGBE_MAX_VFS_DRV_LIMIT) {
 		err = -EPERM;
 		goto err_out;
 	}

drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h +5 -0

index 4713f9f..2593666 100644
@@ -28,6 +28,11 @@
 #ifndef _IXGBE_SRIOV_H_
 #define _IXGBE_SRIOV_H_
 
+/*  ixgbe driver limit the max number of VFs could be enabled to
+ *  63 (IXGBE_MAX_VF_FUNCTIONS - 1)
+ */
+#define IXGBE_MAX_VFS_DRV_LIMIT  (IXGBE_MAX_VF_FUNCTIONS - 1)
+
 void ixgbe_restore_vf_multicasts(struct ixgbe_adapter *adapter);
 void ixgbe_msg_task(struct ixgbe_adapter *adapter);
 int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask);

Signature · 1 line

1.8.3.4 (Apple Git-47)

Brown, Aaron F

2014-01-15 22:00 UTC #1 lore raw

Quoted 19 lines · Ethan Zhao

Because ixgbe driver limit the max number of VF functions could be enabled to 63, so define one macro IXGBE_MAX_VFS_DRV_LIMIT and cleanup the const 63 in code.
v2: fix a typo.
v3: fix a encoding issue.
Signed-off-by Ethan Zhao <[email protected]>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c  | 4 ++--
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 5 +++--
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +0 -0
index 0ade0cd..47e9b44 100644

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c static int ixgbe_sw_init(struct ixgbe_adapter *adapter) · line 4821

Quoted 4 lines

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +0 -1

@@ -4818,7 +4818,7 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter)
 #ifdef CONFIG_PCI_IOV
 	/* assign number of SR-IOV VFs */
 	if (hw->mac.type != ixgbe_mac_82598EB)
-		adapter->num_vfs = (max_vfs > 63) ? 0 : max_vfs;

Unfortunately the if statement got changed considerably with a recent commit:

commit 170e85430bcbe4d18e81b5a70bb163c741381092
ixgbe: add warning when max_vfs is out of range.

And the pattern no longer exists to make a match. In other words, this patch no longer applies to net-next and I have to ask you for yet another spin if you still want to squash the magic number.

Thanks,
Aaron

Ethan Zhao

author

2014-01-16 01:27 UTC #2 lore raw

Quoted 29 lines · Aaron F

Quoted 19 lines · Ethan Zhao
Because ixgbe driver limit the max number of VF functions could be enabled to 63, so define one macro IXGBE_MAX_VFS_DRV_LIMIT and cleanup the const 63 in code.
v2: fix a typo.
v3: fix a encoding issue.
Signed-off-by Ethan Zhao <[email protected]>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c  | 4 ++--
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 5 +++--
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +0 -0
index 0ade0cd..47e9b44 100644
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c static int ixgbe_sw_init(struct ixgbe_adapter *adapter) · line 4821
Quoted 4 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +0 -1
@@ -4818,7 +4818,7 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter)
 #ifdef CONFIG_PCI_IOV
      /* assign number of SR-IOV VFs */
      if (hw->mac.type != ixgbe_mac_82598EB)
-             adapter->num_vfs = (max_vfs > 63) ? 0 : max_vfs;
Unfortunately the if statement got changed considerably with a recent commit:

Quoted 6 lines

commit 170e85430bcbe4d18e81b5a70bb163c741381092
ixgbe: add warning when max_vfs is out of range.
And the pattern no longer exists to make a match. In other words, this patch no longer applies to net-next and I have to ask you for yet another spin if you still want to squash the magic number.

It's not a good news. Our distro is waiting for this patch showing up in stable. OK, info me if there is a windows for me to revise the patch.

Thanks,
Ethan

Quoted 3 lines

Thanks,
Aaron

------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired

Brown, Aaron F

2014-01-16 01:54 UTC #3 lore raw

Quoted 33 lines · Ethan Zhao

Quoted 32 lines · Aaron F
Quoted 19 lines · Ethan Zhao
Because ixgbe driver limit the max number of VF functions could be enabled to 63, so define one macro IXGBE_MAX_VFS_DRV_LIMIT and cleanup the const 63 in code.
v2: fix a typo.
v3: fix a encoding issue.
Signed-off-by Ethan Zhao <[email protected]>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c  | 4 ++--
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 5 +++--
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +0 -0
index 0ade0cd..47e9b44 100644
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c static int ixgbe_sw_init(struct ixgbe_adapter *adapter) · line 4821
Quoted 4 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +0 -1
@@ -4818,7 +4818,7 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter)
 #ifdef CONFIG_PCI_IOV
      /* assign number of SR-IOV VFs */
      if (hw->mac.type != ixgbe_mac_82598EB)
-             adapter->num_vfs = (max_vfs > 63) ? 0 : max_vfs;
Unfortunately the if statement got changed considerably with a recent commit:
commit 170e85430bcbe4d18e81b5a70bb163c741381092
ixgbe: add warning when max_vfs is out of range.

Quoted 6 lines

Quoted 3 lines
And the pattern no longer exists to make a match. In other words, this patch no longer applies to net-next and I have to ask you for yet another spin if you still want to squash the magic number.
It's not a good news. Our distro is waiting for this patch showing up in stable. OK, info me if there is a windows for me to revise the patch.

I don't think any particular window of time is better than another. I don't see this change as needing very thorough testing so if you send in (yet) another version I'll try to get it through our internal process as rapidly as I can.

Quoted 7 lines

Thanks,
Ethan
Quoted 3 lines
Thanks,
Aaron

Ethan Zhao

author

2014-01-16 01:58 UTC #4 lore raw

Aaron,

Is this your net-next repo ? if so, I rebuild the patch with this repo right now .
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git

Thanks,
Ethan

Quoted 38 lines · Aaron F

Quoted 37 lines · Ethan Zhao
Quoted 35 lines · Aaron F
Quoted 19 lines · Ethan Zhao
Because ixgbe driver limit the max number of VF functions could be enabled to 63, so define one macro IXGBE_MAX_VFS_DRV_LIMIT and cleanup the const 63 in code.
v2: fix a typo.
v3: fix a encoding issue.
Signed-off-by Ethan Zhao <[email protected]>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c  | 4 ++--
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 5 +++--
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +0 -0
index 0ade0cd..47e9b44 100644
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c static int ixgbe_sw_init(struct ixgbe_adapter *adapter) · line 4821
Quoted 4 lines
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +0 -1
@@ -4818,7 +4818,7 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter)
 #ifdef CONFIG_PCI_IOV
      /* assign number of SR-IOV VFs */
      if (hw->mac.type != ixgbe_mac_82598EB)
-             adapter->num_vfs = (max_vfs > 63) ? 0 : max_vfs;
Unfortunately the if statement got changed considerably with a recent commit:
commit 170e85430bcbe4d18e81b5a70bb163c741381092
ixgbe: add warning when max_vfs is out of range.
And the pattern no longer exists to make a match. In other words, this patch no longer applies to net-next and I have to ask you for yet another spin if you still want to squash the magic number.

Quoted 16 lines

Quoted 2 lines
It's not a good news. Our distro is waiting for this patch showing up in stable. OK, info me if there is a windows for me to revise the patch.
I don't think any particular window of time is better than another. I don't see this change as needing very thorough testing so if you send in (yet) another version I'll try to get it through our internal process as rapidly as I can.
Quoted 7 lines
Thanks,
Ethan
Quoted 3 lines
Thanks,
Aaron

Brown, Aaron F

2014-01-16 02:51 UTC #5 lore raw

Quoted 9 lines · Ethan Zhao

Aaron,
Is this your net-next repo ? if so, I rebuild the patch with this repo right now .
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
Thanks,
Ethan

Only sort of. Jeff uses it to push patches up, but I don't have an account there so am simply sending them up the old fashioned way, via email, hence it is probably not getting updated while Jeff is out.

As long as your patch can apply cleanly to Dave Miller's net-next tree I should be able to pull it into our internal ones.
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired

Ethan Zhao

author

2014-01-16 03:08 UTC #6 lore raw

Aaron,
Ok, Dave Miler's net-next tree.

Thanks,
Etan

Quoted 16 lines · Aaron F

Quoted 9 lines · Ethan Zhao
Aaron,
Is this your net-next repo ? if so, I rebuild the patch with this repo right now .
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
Thanks,
Ethan
Only sort of. Jeff uses it to push patches up, but I don't have an account there so am simply sending them up the old fashioned way, via email, hence it is probably not getting updated while Jeff is out.
As long as your patch can apply cleanly to Dave Miller's net-next tree I should be able to pull it into our internal ones.

Ethan Zhao

author

2014-01-16 04:20 UTC #7 lore raw

Aaron,
Revised those patches for Dave Miller's net-next OK, passed
building. resent.

Thanks,
Ethan

Quoted 24 lines · Ethan Zhao

Aaron,
Ok, Dave Miler's net-next tree.
Thanks,
Etan
Quoted 16 lines · Aaron F
Quoted 9 lines · Ethan Zhao
Aaron,
Is this your net-next repo ? if so, I rebuild the patch with this repo right now .
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
Thanks,
Ethan
Only sort of. Jeff uses it to push patches up, but I don't have an account there so am simply sending them up the old fashioned way, via email, hence it is probably not getting updated while Jeff is out.
As long as your patch can apply cleanly to Dave Miller's net-next tree I should be able to pull it into our internal ones.