ixgbe: move num_vfs_macvlans allocation into separate function
Subsystems (2)
PATCH 1/3 ixgbe: move num_vfs_macvlans allocation into separate function
Move the code allocating memory for list of MAC addresses that the VFs can use for MACVLAN into its own function.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 48 +++++++++++++++--------- 1 file changed, 29 insertions(+), 19 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +29 -19
@@ -46,42 +46,50 @@#include "ixgbe_sriov.h" #ifdef CONFIG_PCI_IOV -static int __ixgbe_enable_sriov (struct ixgbe_adapter *adapter) +static inline void ixgbe_alloc_vf_macvlans (struct ixgbe_adapter *adapter) {struct ixgbe_hw *hw = &adapter->hw; -int num_vf_macvlans, i;struct vf_macvlans *mv_list; - - adapter->flags |=IXGBE_FLAG_SRIOV_ENABLED ; -e_info (probe,"SR-IOV enabled with %d VFs\n" , adapter->num_vfs); - -/* Enable VMDq flag so device will be set in VM mode */ - adapter->flags |=IXGBE_FLAG_VMDQ_ENABLED ; -if (!adapter->ring_feature[RING_F_VMDQ ].limit) - adapter->ring_feature[RING_F_VMDQ ].limit =1 ; - adapter->ring_feature[RING_F_VMDQ ].offset = adapter->num_vfs; +int num_vf_macvlans, i; num_vf_macvlans = hw->mac.num_rar_entries - - (IXGBE_MAX_PF_MACVLANS +1 + adapter->num_vfs); + (IXGBE_MAX_PF_MACVLANS +1 + adapter->num_vfs); +if (!num_vf_macvlans) +return ; - adapter->mv_list = mv_list =kcalloc (num_vf_macvlans, -sizeof (struct vf_macvlans ), -GFP_KERNEL ); + mv_list =kcalloc (num_vf_macvlans,sizeof (struct vf_macvlans ), +GFP_KERNEL );if (mv_list) {/* Initialize list of VF macvlans */ INIT_LIST_HEAD (&adapter->vf_mvs.l);for (i =0 ; i < num_vf_macvlans; i++) { - mv_list->vf =-1 ; - mv_list->free = true; -list_add (&mv_list->l, &adapter->vf_mvs.l); - mv_list++; + mv_list[i].vf =-1 ; + mv_list[i].free = true; +list_add (&mv_list[i].l, &adapter->vf_mvs.l); } + adapter->mv_list = mv_list; } +} + +static int __ixgbe_enable_sriov (struct ixgbe_adapter *adapter) +{ +struct ixgbe_hw *hw = &adapter->hw; + + adapter->flags |=IXGBE_FLAG_SRIOV_ENABLED ; +e_info (probe,"SR-IOV enabled with %d VFs\n" , adapter->num_vfs); + +/* Enable VMDq flag so device will be set in VM mode */ + adapter->flags |=IXGBE_FLAG_VMDQ_ENABLED ; +if (!adapter->ring_feature[RING_F_VMDQ ].limit) + adapter->ring_feature[RING_F_VMDQ ].limit =1 ; + adapter->ring_feature[RING_F_VMDQ ].offset = adapter->num_vfs;/* Initialize default switching mode VEB */ IXGBE_WRITE_REG (hw,IXGBE_PFDTXGSWC ,IXGBE_PFDTXGSWC_VT_LBEN ); adapter->bridge_mode =BRIDGE_MODE_VEB ; +ixgbe_alloc_vf_macvlans (adapter); +/* If call to enable VFs succeeded then allocate memory * for per VF control structures. */
@@ -89,6 +97,8 @@ static int __ixgbe_enable_sriov(struct ixgbe_adapter *adapter)kcalloc (adapter->num_vfs,sizeof (struct vf_data_storage ),GFP_KERNEL );if (adapter->vfinfo) { +int i; +/* limit trafffic classes based on VFs enabled */ if ((adapter->hw.mac.type == ixgbe_mac_82599EB) && (adapter->num_vfs <16 )) {
PATCH 2/3 ixgbe: return early instead of wrap block in if statement
Since we exit at the end of the block, we can save a level of indentation by performing an early return, and make the next several sections of code more legible, with fewer 80 character line breaks.
Also moved allocating vfinfo at the beginning and the notification for enabling SRIOV at the end of the function when we know that it will succeed.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 85 ++++++++++++------------ 1 file changed, 41 insertions(+), 44 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +41 -44
@@ -74,9 +74,9 @@ static inline void ixgbe_alloc_vf_macvlans(struct ixgbe_adapter *adapter)static int __ixgbe_enable_sriov (struct ixgbe_adapter *adapter) {struct ixgbe_hw *hw = &adapter->hw; +int i; adapter->flags |=IXGBE_FLAG_SRIOV_ENABLED ; -e_info (probe,"SR-IOV enabled with %d VFs\n" , adapter->num_vfs);/* Enable VMDq flag so device will be set in VM mode */ adapter->flags |=IXGBE_FLAG_VMDQ_ENABLED ;
@@ -84,60 +84,57 @@ static int __ixgbe_enable_sriov(struct ixgbe_adapter *adapter) adapter->ring_feature[RING_F_VMDQ ].limit =1 ; adapter->ring_feature[RING_F_VMDQ ].offset = adapter->num_vfs; -/* Initialize default switching mode VEB */ -IXGBE_WRITE_REG (hw,IXGBE_PFDTXGSWC ,IXGBE_PFDTXGSWC_VT_LBEN ); - adapter->bridge_mode =BRIDGE_MODE_VEB ; - -ixgbe_alloc_vf_macvlans (adapter); -/* If call to enable VFs succeeded then allocate memory * for per VF control structures. */ - adapter->vfinfo = -kcalloc (adapter->num_vfs, -sizeof (struct vf_data_storage ),GFP_KERNEL ); -if (adapter->vfinfo) { -int i; - -/* limit trafffic classes based on VFs enabled */ -if ((adapter->hw.mac.type == ixgbe_mac_82599EB) && - (adapter->num_vfs <16 )) { - adapter->dcb_cfg.num_tcs.pg_tcs =MAX_TRAFFIC_CLASS ; - adapter->dcb_cfg.num_tcs.pfc_tcs =MAX_TRAFFIC_CLASS ; - }else if (adapter->num_vfs <32 ) { - adapter->dcb_cfg.num_tcs.pg_tcs =4 ; - adapter->dcb_cfg.num_tcs.pfc_tcs =4 ; - }else { - adapter->dcb_cfg.num_tcs.pg_tcs =1 ; - adapter->dcb_cfg.num_tcs.pfc_tcs =1 ; - } + adapter->vfinfo =kcalloc (adapter->num_vfs, +sizeof (struct vf_data_storage ),GFP_KERNEL ); +if (!adapter->vfinfo) +return -ENOMEM ; + +ixgbe_alloc_vf_macvlans (adapter); + +/* Initialize default switching mode VEB */ +IXGBE_WRITE_REG (hw,IXGBE_PFDTXGSWC ,IXGBE_PFDTXGSWC_VT_LBEN ); + adapter->bridge_mode =BRIDGE_MODE_VEB ; -/* Disable RSC when in SR-IOV mode */ - adapter->flags2 &= ~(IXGBE_FLAG2_RSC_CAPABLE | -IXGBE_FLAG2_RSC_ENABLED ); +/* limit trafffic classes based on VFs enabled */ +if ((adapter->hw.mac.type == ixgbe_mac_82599EB) && + (adapter->num_vfs <16 )) { + adapter->dcb_cfg.num_tcs.pg_tcs =MAX_TRAFFIC_CLASS ; + adapter->dcb_cfg.num_tcs.pfc_tcs =MAX_TRAFFIC_CLASS ; + }else if (adapter->num_vfs <32 ) { + adapter->dcb_cfg.num_tcs.pg_tcs =4 ; + adapter->dcb_cfg.num_tcs.pfc_tcs =4 ; + }else { + adapter->dcb_cfg.num_tcs.pg_tcs =1 ; + adapter->dcb_cfg.num_tcs.pfc_tcs =1 ; + } -for (i =0 ; i < adapter->num_vfs; i++) { -/* enable spoof checking for all VFs */ - adapter->vfinfo[i].spoofchk_enabled = true; +/* Disable RSC when in SR-IOV mode */ + adapter->flags2 &= ~(IXGBE_FLAG2_RSC_CAPABLE | +IXGBE_FLAG2_RSC_ENABLED ); -/* We support VF RSS querying only for 82599 and x540 -* devices at the moment. These devices share RSS -* indirection table and RSS hash key with PF therefore -* we want to disable the querying by default. -*/ - adapter->vfinfo[i].rss_query_enabled =0 ; +for (i =0 ; i < adapter->num_vfs; i++) { +/* enable spoof checking for all VFs */ + adapter->vfinfo[i].spoofchk_enabled = true; -/* Untrust all VFs */ - adapter->vfinfo[i].trusted = false; +/* We support VF RSS querying only for 82599 and x540 +* devices at the moment. These devices share RSS +* indirection table and RSS hash key with PF therefore +* we want to disable the querying by default. +*/ + adapter->vfinfo[i].rss_query_enabled =0 ; -/* set the default xcast mode */ - adapter->vfinfo[i].xcast_mode =IXGBEVF_XCAST_MODE_NONE ; - } +/* Untrust all VFs */ + adapter->vfinfo[i].trusted = false; -return 0 ; +/* set the default xcast mode */ + adapter->vfinfo[i].xcast_mode =IXGBEVF_XCAST_MODE_NONE ; } -return -ENOMEM ; +e_info (probe,"SR-IOV enabled with %d VFs\n" , adapter->num_vfs); +return 0 ; }/**
Bowers
PATCH 2/3 ixgbe: return early instead of wrap block in if statement
Quoted 12 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Emil Tantilov
Sent: Friday, January 20, 2017 2:12 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH 2/3] ixgbe: return early instead of wrap block in if statementSince we exit at the end of the block, we can save a level of indentation by performing an early return, and make the next several sections of code more legible, with fewer 80 character line breaks.
Quoted 8 lines
Also moved allocating vfinfo at the beginning and the notification for enabling SRIOV at the end of the function when we know that it will succeed.
Signed-off-by Emil Tantilov <[email protected]>--- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 85 ++++++++++++--------- --- 1 file changed, 41 insertions(+), 44 deletions(-)
PATCH 3/3 ixgbe: do not use adapter->num_vfs when setting VFs via module parameter
In reply to Emil TantilovAvoid setting adapter->num_vfs early in the init code path when using the max_vfs module parameter by passing it to ixgbe_enable_sriov() as a function parameter.
This fixes an issue where if we failed to allocate vfinfo in __ixgbe_enable_sriov() the driver will crash with NULL pointer in ixgbe_disable_sriov() when attempting to free the vfinfo struct based on adapter->num_vfs. Also it cleans up the assignment of adapter->num_vfs since now it will only be set in __ixgbe_enable_sriov() and cleared in ixgbe_disable_sriov().
--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +-- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 50 ++++++++++++------------ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 2 - 3 files changed, 28 insertions(+), 30 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +2 -4
@@ -5989,10 +5989,8 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter,/* assign number of SR-IOV VFs */ if (hw->mac.type != ixgbe_mac_82598EB) {if (max_vfs >IXGBE_MAX_VFS_DRV_LIMIT ) { - adapter->num_vfs =0 ; + max_vfs =0 ;e_dev_warn ("max_vfs parameter out of range. Not assigning any SR-IOV VFs\n" ); - }else { - adapter->num_vfs = max_vfs; } }#endif /* CONFIG_PCI_IOV */
@@ -9854,7 +9852,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)ixgbe_init_mbx_params_pf (hw); hw->mbx.ops = ii->mbx_ops;pci_sriov_set_totalvfs (pdev,IXGBE_MAX_VFS_DRV_LIMIT ); -ixgbe_enable_sriov (adapter); +ixgbe_enable_sriov (adapter, max_vfs); skip_sriov:#endif
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +25 -25
137 lines not on this page · raw message
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h +1 -1
@@ -59,7 +59,7 @@ int ixgbe_ndo_get_vf_config(struct net_device *netdev,void ixgbe_check_vf_rate_limit (struct ixgbe_adapter *adapter);int ixgbe_disable_sriov (struct ixgbe_adapter *adapter);#ifdef CONFIG_PCI_IOV -void ixgbe_enable_sriov (struct ixgbe_adapter *adapter); +void ixgbe_enable_sriov (struct ixgbe_adapter *adapter,unsigned int max_vfs);#endif int ixgbe_pci_sriov_configure (struct pci_dev *dev,int num_vfs);
Bowers
PATCH 3/3 ixgbe: do not use adapter->num_vfs when setting VFs via module parameter
Quoted 19 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Emil Tantilov
Sent: Friday, January 20, 2017 2:12 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH 3/3] ixgbe: do not useadapter->num_vfswhen setting VFs via module parameterAvoid setting
adapter->num_vfsearly in the init code path when using themax_vfsmodule parameter by passing it toixgbe_enable_sriov()as a function parameter.This fixes an issue where if we failed to allocate vfinfo in
__ixgbe_enable_sriov()the driver will crash with NULL pointer inixgbe_disable_sriov()when attempting to free the vfinfo struct based onadapter->num_vfs. Also it cleans up the assignment ofadapter->num_vfssince now it will only be set in__ixgbe_enable_sriov()and cleared inixgbe_disable_sriov().
Quoted 7 lines
Signed-off-by Emil Tantilov <[email protected]>--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +-- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 50 ++++++++++++--------- --- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 2 - 3 files changed, 28 insertions(+), 30 deletions(-)
Bowers
PATCH 1/3 ixgbe: move num_vfs_macvlans allocation into separate function
In reply to Emil TantilovQuoted 8 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Emil Tantilov
Sent: Friday, January 20, 2017 2:12 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH 1/3] ixgbe: movenum_vfs_macvlansallocation into separate function
Quoted 8 lines
Move the code allocating memory for list of MAC addresses that the VFs can use for MACVLAN into its own function.
Signed-off-by Emil Tantilov <[email protected]>--- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 48 +++++++++++++++---- ----- 1 file changed, 29 insertions(+), 19 deletions(-)