ice: Store number of functions for the device
Subsystems (2)
Tony Nguyen
maintainerPATCH 1/15 ice: Store number of functions for the device
From: Bruce Allan <[email protected]>
Store the number of functions the device has and use this number when setting safe mode capabilities instead of calculating it.
--- drivers/net/ethernet/intel/ice/ice_common.c | 21 ++++++++++----------- drivers/net/ethernet/intel/ice/ice_type.h | 1 + 2 files changed, 11 insertions(+), 11 deletions(-)
drivers/net/ethernet/intel/ice/ice_common.c +10 -11
@@ -1673,6 +1673,10 @@ ice_parse_caps(struct ice_hw *hw, void *buf, u32 cap_count,ice_debug (hw,ICE_DBG_INIT ,"%s: valid_functions (bitmap) = %d\n" , prefix, caps->valid_functions); + +/* store func count for resource management purposes */ +if (dev_p) + dev_p->num_funcs =hweight32 (number);break ;case ICE_AQC_CAPS_SRIOV : caps->sr_iov_1_1 = (number ==1 );
@@ -1875,8 +1879,7 @@ void ice_set_safe_mode_caps(struct ice_hw *hw)struct ice_hw_dev_caps *dev_caps = &hw->dev_caps;u32 valid_func, rxq_first_id, txq_first_id;u32 msix_vector_first_id, max_mtu; -u32 num_func =0 ; -u8 i; +u32 num_funcs;/* cache some func_caps values that should be restored after memset */ valid_func = func_caps->common_cap.valid_functions;
@@ -1909,6 +1912,7 @@ void ice_set_safe_mode_caps(struct ice_hw *hw) rxq_first_id = dev_caps->common_cap.rxq_first_id; msix_vector_first_id = dev_caps->common_cap.msix_vector_first_id; max_mtu = dev_caps->common_cap.max_mtu; + num_funcs = dev_caps->num_funcs;/* unset dev capabilities */ memset (dev_caps,0 ,sizeof (*dev_caps));
@@ -1919,19 +1923,14 @@ void ice_set_safe_mode_caps(struct ice_hw *hw) dev_caps->common_cap.rxq_first_id = rxq_first_id; dev_caps->common_cap.msix_vector_first_id = msix_vector_first_id; dev_caps->common_cap.max_mtu = max_mtu; - -/* valid_func is a bitmap. get number of functions */ -#define ICE_MAX_FUNCS 8 -for (i =0 ; i <ICE_MAX_FUNCS ; i++) -if (valid_func &BIT (i)) - num_func++; + dev_caps->num_funcs = num_funcs;/* one Tx and one Rx queue per function in safe mode */ - dev_caps->common_cap.num_rxq = num_func; - dev_caps->common_cap.num_txq = num_func; + dev_caps->common_cap.num_rxq = num_funcs; + dev_caps->common_cap.num_txq = num_funcs;/* two MSIX vectors per function */ - dev_caps->common_cap.num_msix_vectors =2 * num_func; + dev_caps->common_cap.num_msix_vectors =2 * num_funcs; }/**
drivers/net/ethernet/intel/ice/ice_type.h +1 -0
@@ -202,6 +202,7 @@ struct ice_hw_dev_caps {struct ice_hw_common_caps common_cap;u32 num_vfs_exposed;/* Total number of VFs exposed */ u32 num_vsi_allocd_to_host;/* Excluding EMP VSI */ +u32 num_funcs; };/* MAC info */
Signature · 1 line
2.20.1
Tony Nguyen
maintainerPATCH 2/15 ice: Correct capabilities reporting of max TCs
From: Bruce Allan <[email protected]>
Firmware always returns 8 as the max number of supported TCs. However on devices with more than 4 ports, the maximum number of TCs per port is limited to 4. Check and, if necessary, correct the reporting of capabilities for devices with more than 4 ports.
--- drivers/net/ethernet/intel/ice/ice_common.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/net/ethernet/intel/ice/ice_common.c +12 -0
@@ -1783,6 +1783,18 @@ ice_parse_caps(struct ice_hw *hw, void *buf, u32 cap_count,break ; } } + +/* Re-calculate capabilities that are dependent on the number of +* physical ports; i.e. some features are not supported or function +* differently on devices with more than 4 ports. +*/ +if (hw->dev_caps.num_funcs >4 ) { +/* Max 4 TCs per port */ + caps->maxtc =4 ; +ice_debug (hw,ICE_DBG_INIT , +"%s: maxtc = %d (based on #ports)\n" , prefix, + caps->maxtc); + } }/**
Signature · 1 line
2.20.1
Bowers
PATCH 2/15 ice: Correct capabilities reporting of max TCs
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Friday, November 8, 2019 6:23 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S33 02/15] ice: Correct capabilities reporting of max TCsFrom: Bruce Allan <[email protected]>
Firmware always returns 8 as the max number of supported TCs. However on devices with more than 4 ports, the maximum number of TCs per port is limited to 4. Check and, if necessary, correct the reporting of capabilities for devices with more than 4 ports.
Quoted 5 lines
Signed-off-by Bruce Allan <[email protected]>Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/ice/ice_common.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
Tony Nguyen
maintainerPATCH 3/15 ice: Disallow VF VLAN opcodes if VLAN offloads disabled
In reply to Tony NguyenFrom: Brett Creeley <[email protected]>
Currently if the host disables VLAN offloads on the VF by not setting the VIRTCHNL_VF_OFFLOAD_VLAN capability bit we will still honor VF VLAN configuration messages over VIRTCHNL. These messages (i.e. enable/disable VLAN stripping and VLAN filtering) should be blocked when the feature is not supported. Fix that by adding a helper function to determine if the VF is allowed to do VLAN operations based on the host's VF configuration.
Also, mirror the VF communicated capabilities in the host's VF configuration.
--- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +29 -0
@@ -1686,6 +1686,9 @@ static int ice_vc_get_vf_res_msg(struct ice_vf *vf, u8 *msg)ether_addr_copy (vfres->vsi_res[0 ].default_mac_addr, vf->dflt_lan_addr.addr); +/* match guest capabilities */ + vf->driver_caps = vfres->vf_cap_flags; +set_bit (ICE_VF_STATE_ACTIVE , vf->vf_states); err:
@@ -2653,6 +2656,17 @@ ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos,return ret; } +/** +* ice_vf_vlan_offload_ena - determine if capabilities support VLAN offloads +* @caps: VF driver negotiated capabilities +* +* Return true if VIRTCHNL_VF_OFFLOAD_VLAN capability is set, else return false +*/ +static bool ice_vf_vlan_offload_ena (u32 caps) +{ +return !!(caps &VIRTCHNL_VF_OFFLOAD_VLAN ); +} +/** * ice_vc_process_vlan_msg * @vf: pointer to the VF info
@@ -2679,6 +2693,11 @@ static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v) goto error_param; } +if (!ice_vf_vlan_offload_ena (vf->driver_caps)) { + v_ret =VIRTCHNL_STATUS_ERR_PARAM ; + goto error_param; + } +if (!ice_vc_isvalid_vsi_id (vf, vfl->vsi_id)) { v_ret =VIRTCHNL_STATUS_ERR_PARAM ; goto error_param;
@@ -2864,6 +2883,11 @@ static int ice_vc_ena_vlan_stripping(struct ice_vf *vf) goto error_param; } +if (!ice_vf_vlan_offload_ena (vf->driver_caps)) { + v_ret =VIRTCHNL_STATUS_ERR_PARAM ; + goto error_param; + } + vsi = pf->vsi[vf->lan_vsi_idx];if (ice_vsi_manage_vlan_stripping (vsi, true)) v_ret =VIRTCHNL_STATUS_ERR_PARAM ;
@@ -2890,6 +2914,11 @@ static int ice_vc_dis_vlan_stripping(struct ice_vf *vf) goto error_param; } +if (!ice_vf_vlan_offload_ena (vf->driver_caps)) { + v_ret =VIRTCHNL_STATUS_ERR_PARAM ; + goto error_param; + } + vsi = pf->vsi[vf->lan_vsi_idx];if (!vsi) { v_ret =VIRTCHNL_STATUS_ERR_PARAM ;
Signature · 1 line
2.20.1
Bowers
PATCH 3/15 ice: Disallow VF VLAN opcodes if VLAN offloads disabled
Quoted 17 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Friday, November 8, 2019 6:23 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S33 03/15] ice: Disallow VF VLAN opcodes if VLAN offloads disabledFrom: Brett Creeley <[email protected]>
Currently if the host disables VLAN offloads on the VF by not setting the
VIRTCHNL_VF_OFFLOAD_VLANcapability bit we will still honor VF VLAN configuration messages over VIRTCHNL. These messages (i.e. enable/disable VLAN stripping and VLAN filtering) should be blocked when the feature is not supported. Fix that by adding a helper function to determine if the VF is allowed to do VLAN operations based on the host's VF configuration.
Quoted 6 lines
Also, mirror the VF communicated capabilities in the host's VF configuration.
Signed-off-by Brett Creeley <[email protected]>--- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+)
Tony Nguyen
maintainerPATCH 4/15 ice: Don't modify stripping for add/del VLANs on VF
In reply to Tony NguyenFrom: Brett Creeley <[email protected]>
Currently when adding/deleting vlans in ice_vc_process_vlan_msg() we are calling ice_vsi_manage_vlan_stripping() to enable/disable when adding and deleting a VLAN respectively. This is wrong because adding/deleting VLANs has nothing to do with configuring VLAN stripping. VLAN stripping is configured through the following VIRTCHNL operations:
VIRTCHNL_OP_ENABLE_VLAN_STRIPPING VIRTCHNL_OP_DISABLE_VLAN_STRIPPING
Unfortunately we can't just remove this because then stripping will never be configured on VF initialization. Fix this by adding a new function that initializes (disables/enables) VLAN stripping for the VF based on the device supported capabilities. This allows us to remove the call to ice_vsi_manage_vlan_stripping() in ice_vc_process_vlan_msg().
--- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 39 +++++++++++++++---- 1 file changed, 31 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +31 -8
@@ -2735,14 +2735,6 @@ static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v) goto error_param; } -if (ice_vsi_manage_vlan_stripping (vsi, add_v)) { -dev_err (&pf->pdev->dev, -"%sable VLAN stripping failed for VSI %i\n" , - add_v ?"en" :"dis" , vsi->vsi_num); - v_ret =VIRTCHNL_STATUS_ERR_PARAM ; - goto error_param; - } -if (test_bit (ICE_VF_STATE_UC_PROMISC , vf->vf_states) ||test_bit (ICE_VF_STATE_MC_PROMISC , vf->vf_states)) vlan_promisc = true;
@@ -2933,6 +2925,33 @@ static int ice_vc_dis_vlan_stripping(struct ice_vf *vf) v_ret, NULL, 0); } +/** +* ice_vf_init_vlan_stripping - enable/disable VLAN stripping on initialization +* @vf: VF to enable/disable VLAN stripping for on initialization +* +* If the VIRTCHNL_VF_OFFLOAD_VLAN flag is set enable VLAN stripping, else if +* the flag is cleared then we want to disable stripping. For example, the flag +* will be cleared when port VLANs are configured by the administrator before +* passing the VF to the guest or if the AVF driver doesn't support VLAN +* offloads. +*/ +static int ice_vf_init_vlan_stripping (struct ice_vf *vf) +{ +struct ice_vsi *vsi = vf->pf->vsi[vf->lan_vsi_idx]; + +if (!vsi) +return -EINVAL ; + +/* don't modify stripping if port VLAN is configured */ +if (vsi->info.pvid) +return 0 ; + +if (ice_vf_vlan_offload_ena (vf->driver_caps)) +return ice_vsi_manage_vlan_stripping (vsi, true); +else +return ice_vsi_manage_vlan_stripping (vsi, false); +} +/** * ice_vc_process_vf_msg - Process request from VF * @pf: pointer to the PF structure
@@ -2987,6 +3006,10 @@ void ice_vc_process_vf_msg(struct ice_pf *pf, struct ice_rq_event_info *event)break ;case VIRTCHNL_OP_GET_VF_RESOURCES : err =ice_vc_get_vf_res_msg (vf, msg); +if (ice_vf_init_vlan_stripping (vf)) +dev_err (&pf->pdev->dev, +"Failed to initialize VLAN stripping for VF %d\n" , + vf->vf_id);ice_vc_notify_vf_link_state (vf);break ;case VIRTCHNL_OP_RESET_VF :
Signature · 1 line
2.20.1
Bowers
PATCH 4/15 ice: Don't modify stripping for add/del VLANs on VF
Quoted 25 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Friday, November 8, 2019 6:23 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S33 04/15] ice: Don't modify stripping for add/del VLANs on VFFrom: Brett Creeley <[email protected]>
Currently when adding/deleting vlans in
ice_vc_process_vlan_msg()we are callingice_vsi_manage_vlan_stripping()to enable/disable when adding and deleting a VLAN respectively. This is wrong because adding/deleting VLANs has nothing to do with configuring VLAN stripping. VLAN stripping is configured through the following VIRTCHNL operations:
VIRTCHNL_OP_ENABLE_VLAN_STRIPPINGVIRTCHNL_OP_DISABLE_VLAN_STRIPPINGUnfortunately we can't just remove this because then stripping will never be configured on VF initialization. Fix this by adding a new function that initializes (disables/enables) VLAN stripping for the VF based on the device supported capabilities.
This allows us to remove the call toice_vsi_manage_vlan_stripping()inice_vc_process_vlan_msg().
Quoted 4 lines
Signed-off-by Brett Creeley <[email protected]>--- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 39 +++++++++++++++---- 1 file changed, 31 insertions(+), 8 deletions(-)
Tony Nguyen
maintainerPATCH 5/15 ice: fix stack leakage
In reply to Tony NguyenFrom: Jesse Brandeburg <[email protected]>
In the case of an invalid virtchannel request the driver would return uninitialized data to the VF from the PF stack which is a bug. Fix by initializing the stack variable earlier in the function before any return paths can be taken.
--- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +1 -2
@@ -1886,8 +1886,8 @@ static int ice_vc_get_stats_msg(struct ice_vf *vf, u8 *msg)enum virtchnl_status_code v_ret =VIRTCHNL_STATUS_SUCCESS ;struct virtchnl_queue_select *vqs = (struct virtchnl_queue_select *)msg; +struct ice_eth_stats stats = {0 };struct ice_pf *pf = vf->pf; -struct ice_eth_stats stats;struct ice_vsi *vsi;if (!test_bit (ICE_VF_STATE_ACTIVE , vf->vf_states)) {
@@ -1906,7 +1906,6 @@ static int ice_vc_get_stats_msg(struct ice_vf *vf, u8 *msg) goto error_param; } -memset (&stats,0 ,sizeof (struct ice_eth_stats ));ice_update_eth_stats (vsi); stats = vsi->eth_stats;
Signature · 1 line
2.20.1
Bowers
PATCH 5/15 ice: fix stack leakage
Quoted 14 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Friday, November 8, 2019 6:23 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S33 05/15] ice: fix stack leakageFrom: Jesse Brandeburg <[email protected]>
In the case of an invalid virtchannel request the driver would return uninitialized data to the VF from the PF stack which is a bug. Fix by initializing the stack variable earlier in the function before any return paths can be taken.
Quoted 4 lines
Signed-off-by Jesse Brandeburg <[email protected]>--- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Tony Nguyen
maintainerPATCH 6/15 ice: Only disable VF state when freeing each VF resources
In reply to Tony NguyenFrom: Akeem G Abodunrin <[email protected]>
It is wrong to set PF disable state flag for all VFs when freeing VF resources - Instead, we should set VF disable state flag for each VF with its resources being returned to the device. Right now, all VF opcodes, mailbox communication to clear its resources as well fails - since we already indicate that PF is in disable state, with all VFs not active. In addition, we don't need to notify VF that PF is intending to reset it, if it is already in disabled state.
--- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +8 -4
@@ -318,8 +318,9 @@ void ice_free_vfs(struct ice_pf *pf) pf->num_alloc_vfs =0 ;for (i =0 ; i < tmp; i++) {if (test_bit (ICE_VF_STATE_INIT , pf->vf[i].vf_states)) { -/* disable VF qp mappings */ +/* disable VF qp mappings and set VF disable state */ ice_dis_vf_mappings (&pf->vf[i]); +set_bit (ICE_VF_STATE_DIS , pf->vf[i].vf_states);ice_free_vf_res (&pf->vf[i]); } }
@@ -1303,9 +1304,12 @@ static void ice_vc_notify_vf_reset(struct ice_vf *vf)if (!vf || vf->vf_id >= vf->pf->num_alloc_vfs)return ; -/* verify if the VF is in either init or active before proceeding */ -if (!test_bit (ICE_VF_STATE_INIT , vf->vf_states) && - !test_bit (ICE_VF_STATE_ACTIVE , vf->vf_states)) +/* Bail out if VF is in disabled state, neither initialized, nor active +* state - otherwise proceed with notifications +*/ +if ((!test_bit (ICE_VF_STATE_INIT , vf->vf_states) && + !test_bit (ICE_VF_STATE_ACTIVE , vf->vf_states)) || +test_bit (ICE_VF_STATE_DIS , vf->vf_states))return ; pfe.event =VIRTCHNL_EVENT_RESET_IMPENDING ;
Signature · 1 line
2.20.1
Bowers
PATCH 6/15 ice: Only disable VF state when freeing each VF resources
Quoted 17 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Friday, November 8, 2019 6:23 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S33 06/15] ice: Only disable VF state when freeing each VF resourcesFrom: Akeem G Abodunrin <[email protected]>
It is wrong to set PF disable state flag for all VFs when freeing VF resources - Instead, we should set VF disable state flag for each VF with its resources being returned to the device. Right now, all VF opcodes, mailbox communication to clear its resources as well fails - since we already indicate that PF is in disable state, with all VFs not active. In addition, we don't need to notify VF that PF is intending to reset it, if it is already in disabled state.
Quoted 4 lines
Signed-off-by Akeem G Abodunrin <[email protected]>--- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
Tony Nguyen
maintainerPATCH 7/15 ice: Fix setting coalesce to handle DCB configuration
In reply to Tony NguyenFrom: Brett Creeley <[email protected]>
Currently there can be a case where a DCB map is applied and there are more interrupt vectors (vsi->num_q_vectors) than Rx queues (vsi->num_rxq) and Tx queues (vsi->num_txq). If we try to set coalesce settings in this case it will report a false failure. Fix this by checking if vector index is valid with respect to the number of Tx and Rx queues configured.
--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/ice/ice_ethtool.c +10 -3
@@ -3420,10 +3420,17 @@ __ice_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec,struct ice_vsi *vsi = np->vsi;if (q_num <0 ) { -int i; +int v_idx; + +ice_for_each_q_vector (vsi, v_idx) { +/* In some cases if DCB is configured the num_[rx|tx]q +* can be less than vsi->num_q_vectors. This check +* accounts for that so we don't report a false failure +*/ +if (v_idx >= vsi->num_rxq && v_idx >= vsi->num_txq) + goto set_complete; -ice_for_each_q_vector (vsi, i) { -if (ice_set_q_coalesce (vsi, ec, i)) +if (ice_set_q_coalesce (vsi, ec, v_idx))return -EINVAL ; } goto set_complete;
Signature · 1 line
2.20.1
Bowers
PATCH 7/15 ice: Fix setting coalesce to handle DCB configuration
Quoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Friday, November 8, 2019 6:23 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S33 07/15] ice: Fix setting coalesce to handle DCB configurationFrom: Brett Creeley <[email protected]>
Currently there can be a case where a DCB map is applied and there are more interrupt vectors (
vsi->num_q_vectors) than Rx queues (vsi->num_rxq) and Tx queues (vsi->num_txq). If we try to set coalesce settings in this case it will report a false failure. Fix this by checking if vector index is valid with respect to the number of Tx and Rx queues configured.
Quoted 4 lines
Signed-off-by Brett Creeley <[email protected]>--- drivers/net/ethernet/intel/ice/ice_ethtool.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
Tony Nguyen
maintainerPATCH 8/15 ice: Refactor removal of VLAN promiscuous rules
In reply to Tony NguyenFrom: Brett Creeley <[email protected]>
Currently ice_clear_vsi_promisc() detects if the VLAN ID sent is not 0 and sets the recipe_id to ICE_SW_LKUP_PROMISC_VLAN in that case and ICE_SW_LKUP_PROMISC if the VLAN_ID is 0. However this doesn't allow VLAN 0 promiscuous rules to be removed, but they can be added. Fix this by checking if the promisc_mask contains ICE_PROMISC_VLAN_RX or ICE_PROMISC_VLAN_TX. This change was made to match what is being done for ice_set_vsi_promisc().
--- drivers/net/ethernet/intel/ice/ice_switch.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ice/ice_switch.c +9 -4
@@ -2428,7 +2428,7 @@ ice_clear_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask,if (!ice_is_vsi_valid (hw, vsi_handle))return ICE_ERR_PARAM ; -if (vid) +if (promisc_mask & (ICE_PROMISC_VLAN_RX |ICE_PROMISC_VLAN_TX )) recipe_id =ICE_SW_LKUP_PROMISC_VLAN ;else recipe_id =ICE_SW_LKUP_PROMISC ;
@@ -2440,13 +2440,18 @@ ice_clear_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask,mutex_lock (rule_lock);list_for_each_entry (itr, rule_head, list_entry) { +struct ice_fltr_info *fltr_info;u8 fltr_promisc_mask =0 ;if (!ice_vsi_uses_fltr (itr, vsi_handle))continue ; + fltr_info = &itr->fltr_info; + +if (recipe_id ==ICE_SW_LKUP_PROMISC_VLAN && + vid != fltr_info->l_data.mac_vlan.vlan_id) +continue ; - fltr_promisc_mask |= -ice_determine_promisc_mask (&itr->fltr_info); + fltr_promisc_mask |=ice_determine_promisc_mask (fltr_info);/* Skip if filter is not completely specified by given mask */ if (fltr_promisc_mask & ~promisc_mask)
@@ -2454,7 +2459,7 @@ ice_clear_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask, status =ice_add_entry_to_vsi_fltr_list (hw, vsi_handle, &remove_list_head, - &itr->fltr_info); + fltr_info);if (status) {mutex_unlock (rule_lock); goto free_fltr_list;
Signature · 1 line
2.20.1
Bowers
PATCH 8/15 ice: Refactor removal of VLAN promiscuous rules
Quoted 19 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Friday, November 8, 2019 6:23 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S33 08/15] ice: Refactor removal of VLAN promiscuous rulesFrom: Brett Creeley <[email protected]>
Currently
ice_clear_vsi_promisc()detects if the VLAN ID sent is not 0 and sets therecipe_idtoICE_SW_LKUP_PROMISC_VLANin that case andICE_SW_LKUP_PROMISCif theVLAN_IDis 0. However this doesn't allow VLAN
0 promiscuous rules to be removed, but they can be added. Fix this by checking if thepromisc_maskcontainsICE_PROMISC_VLAN_RXorICE_PROMISC_VLAN_TX. This change was made to match what is being done forice_set_vsi_promisc().
Quoted 4 lines
Signed-off-by Brett Creeley <[email protected]>--- drivers/net/ethernet/intel/ice/ice_switch.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
Tony Nguyen
maintainerPATCH 9/15 ice: Do not use devm* functions for local uses
In reply to Tony NguyenIn situations where we alloc and free memory within the same function do not use the devm_* variants; use regular alloc and free functions. Remove any unused vars if there are no usages after these changes.
Also, replace an allocate and copy with kmemdup() and remove an unnecessary memset() to 0 after a kzalloc().
--- drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 25 +++++---- drivers/net/ethernet/intel/ice/ice_ethtool.c | 50 ++++++++--------- drivers/net/ethernet/intel/ice/ice_lib.c | 54 +++++++++---------- drivers/net/ethernet/intel/ice/ice_main.c | 24 ++++----- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 15 +++--- 5 files changed, 80 insertions(+), 88 deletions(-)
drivers/net/ethernet/intel/ice/ice_dcb_lib.c +14 -11
@@ -345,8 +345,7 @@ void ice_dcb_rebuild(struct ice_pf *pf) }/* Retrieve DCB config and ensure same as current in SW */ - prev_cfg =devm_kmemdup (&pf->pdev->dev, local_dcbx_cfg, -sizeof (*prev_cfg),GFP_KERNEL ); + prev_cfg =kmemdup (local_dcbx_cfg,sizeof (*prev_cfg),GFP_KERNEL );if (!prev_cfg) {dev_err (&pf->pdev->dev,"Failed to alloc space for DCB cfg\n" ); goto dcb_error;
@@ -361,11 +360,12 @@ void ice_dcb_rebuild(struct ice_pf *pf)if (ice_dcb_need_recfg (pf, prev_cfg, local_dcbx_cfg)) {/* difference in cfg detected - disable DCB till next MIB */ dev_err (&pf->pdev->dev,"Set local MIB not accurate\n" ); +kfree (prev_cfg); goto dcb_error; }/* fetched config congruent to previous configuration */ -devm_kfree (&pf->pdev->dev, prev_cfg); +kfree (prev_cfg);/* Set the local desired config */ if (local_dcbx_cfg->dcbx_mode ==ICE_DCBX_MODE_CEE )
@@ -389,13 +389,16 @@ void ice_dcb_rebuild(struct ice_pf *pf) dcb_error:dev_err (&pf->pdev->dev,"Disabling DCB until new settings occur\n" ); - prev_cfg =devm_kzalloc (&pf->pdev->dev,sizeof (*prev_cfg),GFP_KERNEL ); + prev_cfg =kzalloc (sizeof (*prev_cfg),GFP_KERNEL ); +if (!prev_cfg) +return ; + prev_cfg->etscfg.willing = true; prev_cfg->etscfg.tcbwtable[0 ] =ICE_TC_MAX_BW ; prev_cfg->etscfg.tsatable[0 ] =ICE_IEEE_TSA_ETS ;memcpy (&prev_cfg->etsrec, &prev_cfg->etscfg,sizeof (prev_cfg->etsrec));ice_pf_dcb_cfg (pf, prev_cfg, false); -devm_kfree (&pf->pdev->dev, prev_cfg); +kfree (prev_cfg); }/**
@@ -410,18 +413,17 @@ static int ice_dcb_init_cfg(struct ice_pf *pf, bool locked)int ret =0 ; pi = pf->hw.port_info; - newcfg =devm_kzalloc (&pf->pdev->dev,sizeof (*newcfg),GFP_KERNEL ); + newcfg =kmemdup (&pi->local_dcbx_cfg,sizeof (*newcfg),GFP_KERNEL );if (!newcfg)return -ENOMEM ; -memcpy (newcfg, &pi->local_dcbx_cfg,sizeof (*newcfg));memset (&pi->local_dcbx_cfg,0 ,sizeof (*newcfg));dev_info (&pf->pdev->dev,"Configuring initial DCB values\n" );if (ice_pf_dcb_cfg (pf, newcfg, locked)) ret = -EINVAL ; -devm_kfree (&pf->pdev->dev, newcfg); +kfree (newcfg);return ret; }
@@ -442,9 +444,10 @@ static int ice_dcb_sw_dflt_cfg(struct ice_pf *pf, bool ets_willing, bool locked) hw = &pf->hw; pi = hw->port_info; - dcbcfg =devm_kzalloc (&pf->pdev->dev,sizeof (*dcbcfg),GFP_KERNEL ); + dcbcfg =kzalloc (sizeof (*dcbcfg),GFP_KERNEL ); +if (!dcbcfg) +return -ENOMEM ; -memset (dcbcfg,0 ,sizeof (*dcbcfg));memset (&pi->local_dcbx_cfg,0 ,sizeof (*dcbcfg)); dcbcfg->etscfg.willing = ets_willing ?1 :0 ;
@@ -465,7 +468,7 @@ static int ice_dcb_sw_dflt_cfg(struct ice_pf *pf, bool ets_willing, bool locked) dcbcfg->app[0 ].prot_id =ICE_APP_PROT_ID_FCOE ; ret =ice_pf_dcb_cfg (pf, dcbcfg, locked); -devm_kfree (&pf->pdev->dev, dcbcfg); +kfree (dcbcfg);if (ret)return ret;
drivers/net/ethernet/intel/ice/ice_ethtool.c +22 -28
188 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_lib.c +26 -28
200 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_main.c +11 -13
@@ -724,7 +724,7 @@ void ice_print_link_msg(struct ice_vsi *vsi, bool isup) an ="False" ;/* Get FEC mode requested based on PHY caps last SW configuration */ - caps =devm_kzalloc (&vsi->back->pdev->dev,sizeof (*caps),GFP_KERNEL ); + caps =kzalloc (sizeof (*caps),GFP_KERNEL );if (!caps) { fec_req ="Unknown" ; goto done;
@@ -744,7 +744,7 @@ void ice_print_link_msg(struct ice_vsi *vsi, bool isup)else fec_req ="NONE" ; -devm_kfree (&vsi->back->pdev->dev, caps); +kfree (caps); done: netdev_info(vsi->netdev, "NIC Link is up %sbps, Requested FEC: %s, FEC: %s, Autoneg: %s, Flow Control: %s\n",
@@ -1011,8 +1011,7 @@ static int __ice_clean_ctrlq(struct ice_pf *pf, enum ice_ctl_q q_type) } event.buf_len = cq->rq_buf_size; - event.msg_buf =devm_kzalloc (&pf->pdev->dev, event.buf_len, -GFP_KERNEL ); + event.msg_buf =kzalloc (event.buf_len,GFP_KERNEL );if (!event.msg_buf)return 0 ;
@@ -1055,7 +1054,7 @@ static int __ice_clean_ctrlq(struct ice_pf *pf, enum ice_ctl_q q_type) } }while (pending && (i++ <ICE_DFLT_IRQ_WORK )); -devm_kfree (&pf->pdev->dev, event.msg_buf); +kfree (event.msg_buf);return pending && (i ==ICE_DFLT_IRQ_WORK ); }
@@ -1370,7 +1369,7 @@ static int ice_force_phys_link_state(struct ice_vsi *vsi, bool link_up) pi = vsi->port_info; - pcaps =devm_kzalloc (dev,sizeof (*pcaps),GFP_KERNEL ); + pcaps =kzalloc (sizeof (*pcaps),GFP_KERNEL );if (!pcaps)return -ENOMEM ;
@@ -1389,7 +1388,7 @@ static int ice_force_phys_link_state(struct ice_vsi *vsi, bool link_up) link_up == !!(pi->phy.link_info.link_info & ICE_AQ_LINK_UP)) goto out; - cfg =devm_kzalloc (dev,sizeof (*cfg),GFP_KERNEL ); + cfg =kzalloc (sizeof (*cfg),GFP_KERNEL );if (!cfg) { retcode = -ENOMEM ; goto out;
@@ -1414,9 +1413,9 @@ static int ice_force_phys_link_state(struct ice_vsi *vsi, bool link_up) retcode = -EIO ; } -devm_kfree (dev, cfg); +kfree (cfg); out: -devm_kfree (dev, pcaps); +kfree (pcaps);return retcode; }
@@ -4866,7 +4865,6 @@ ice_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,*/ static int ice_vsi_update_bridge_mode (struct ice_vsi *vsi,u16 bmode) { -struct device *dev = &vsi->back->pdev->dev;struct ice_aqc_vsi_props *vsi_props;struct ice_hw *hw = &vsi->back->hw;struct ice_vsi_ctx *ctxt;
@@ -4875,7 +4873,7 @@ static int ice_vsi_update_bridge_mode(struct ice_vsi *vsi, u16 bmode) vsi_props = &vsi->info; - ctxt =devm_kzalloc (dev,sizeof (*ctxt),GFP_KERNEL ); + ctxt =kzalloc (sizeof (*ctxt),GFP_KERNEL );if (!ctxt)return -ENOMEM ;
@@ -4891,7 +4889,7 @@ static int ice_vsi_update_bridge_mode(struct ice_vsi *vsi, u16 bmode) status =ice_update_vsi (hw, vsi->idx, ctxt,NULL );if (status) { -dev_err (dev,"update VSI for bridge mode failed, bmode = %d err %d aq_err %d\n" , +dev_err (&vsi->back->pdev->dev,"update VSI for bridge mode failed, bmode = %d err %d aq_err %d\n" , bmode, status, hw->adminq.sq_last_status); ret = -EIO ; goto out;
@@ -4900,7 +4898,7 @@ static int ice_vsi_update_bridge_mode(struct ice_vsi *vsi, u16 bmode) vsi_props->sw_flags = ctxt->info.sw_flags; out: -devm_kfree (dev, ctxt); +kfree (ctxt);return ret; }
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +7 -8
@@ -459,13 +459,12 @@ static void ice_vsi_kill_pvid_fill_ctxt(struct ice_vsi_ctx *ctxt)*/ static int ice_vsi_manage_pvid (struct ice_vsi *vsi,u16 vid,bool enable) { -struct device *dev = &vsi->back->pdev->dev;struct ice_hw *hw = &vsi->back->hw;struct ice_vsi_ctx *ctxt;enum ice_status status;int ret =0 ; - ctxt =devm_kzalloc (dev,sizeof (*ctxt),GFP_KERNEL ); + ctxt =kzalloc (sizeof (*ctxt),GFP_KERNEL );if (!ctxt)return -ENOMEM ;
@@ -477,7 +476,7 @@ static int ice_vsi_manage_pvid(struct ice_vsi *vsi, u16 vid, bool enable) status =ice_update_vsi (hw, vsi->idx, ctxt,NULL );if (status) { -dev_info (dev,"update VSI for port VLAN failed, err %d aq_err %d\n" , +dev_info (&vsi->back->pdev->dev,"update VSI for port VLAN failed, err %d aq_err %d\n" , status, hw->adminq.sq_last_status); ret = -EIO ; goto out;
@@ -485,7 +484,7 @@ static int ice_vsi_manage_pvid(struct ice_vsi *vsi, u16 vid, bool enable) vsi->info = ctxt->info; out: -devm_kfree (dev, ctxt); +kfree (ctxt);return ret; }
@@ -1624,7 +1623,7 @@ static int ice_vc_get_vf_res_msg(struct ice_vf *vf, u8 *msg) len =sizeof (struct virtchnl_vf_resource ); - vfres =devm_kzalloc (&pf->pdev->dev, len,GFP_KERNEL ); + vfres =kzalloc (len,GFP_KERNEL );if (!vfres) { v_ret =VIRTCHNL_STATUS_ERR_NO_MEMORY ; len =0 ;
@@ -1700,7 +1699,7 @@ static int ice_vc_get_vf_res_msg(struct ice_vf *vf, u8 *msg) ret =ice_vc_send_msg_to_vf (vf,VIRTCHNL_OP_GET_VF_RESOURCES , v_ret, (u8 *)vfres, len); -devm_kfree (&pf->pdev->dev, vfres); +kfree (vfres);return ret; }
@@ -3167,7 +3166,7 @@ int ice_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool ena)return 0 ; } - ctx =devm_kzalloc (&pf->pdev->dev,sizeof (*ctx),GFP_KERNEL ); + ctx =kzalloc (sizeof (*ctx),GFP_KERNEL );if (!ctx)return -ENOMEM ;
@@ -3190,7 +3189,7 @@ int ice_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool ena) vsi->info.sec_flags = ctx->info.sec_flags; vsi->info.sw_flags2 = ctx->info.sw_flags2; out: -devm_kfree (&pf->pdev->dev, ctx); +kfree (ctx);return ret; }
Signature · 1 line
2.20.1
Bowers
PATCH 9/15 ice: Do not use devm* functions for local uses
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Friday, November 8, 2019 6:23 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S33 09/15] ice: Do not use devm* functions for local usesIn situations where we alloc and free memory within the same function do not use the devm_* variants; use regular alloc and free functions. Remove any unused vars if there are no usages after these changes.
Also, replace an allocate and copy with
kmemdup()and remove an unnecessarymemset()to 0 after akzalloc().
Quoted 8 lines
Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 25 +++++---- drivers/net/ethernet/intel/ice/ice_ethtool.c | 50 ++++++++--------- drivers/net/ethernet/intel/ice/ice_lib.c | 54 +++++++++---------- drivers/net/ethernet/intel/ice/ice_main.c | 24 ++++----- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 15 +++--- 5 files changed, 80 insertions(+), 88 deletions(-)
Tony Nguyen
maintainerPATCH 10/15 ice: Add ice_pf_to_dev(pf) macro
In reply to Tony NguyenFrom: Brett Creeley <[email protected]>
We use &pf->dev->pdev all over the code. Add a simple macro to do this for us. When multiple de-references like this are being done add a local struct device variable.
--- drivers/net/ethernet/intel/ice/ice.h | 2 + drivers/net/ethernet/intel/ice/ice_base.c | 22 +- drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 112 +++++----- drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 2 +- drivers/net/ethernet/intel/ice/ice_dcb_nl.c | 14 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 57 +++--- drivers/net/ethernet/intel/ice/ice_lib.c | 155 ++++++++------ drivers/net/ethernet/intel/ice/ice_main.c | 171 ++++++++-------- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 191 ++++++++++-------- drivers/net/ethernet/intel/ice/ice_xsk.c | 4 +- 10 files changed, 389 insertions(+), 341 deletions(-)
drivers/net/ethernet/intel/ice/ice.h +2 -0
@@ -130,6 +130,8 @@ extern const char ice_drv_ver[]; ICE_PROMISC_VLAN_TX | \ ICE_PROMISC_VLAN_RX) +#define ice_pf_to_dev (pf) (&((pf)->pdev->dev)) +struct ice_txq_meta {u32 q_teid;/* Tx-scheduler element identifier */ u16 q_id;/* Entry in VSI's txq_map bitmap */
drivers/net/ethernet/intel/ice/ice_base.c +12 -10
@@ -101,7 +101,8 @@ static int ice_vsi_alloc_q_vector(struct ice_vsi *vsi, int v_idx)struct ice_q_vector *q_vector;/* allocate q_vector */ - q_vector =devm_kzalloc (&pf->pdev->dev,sizeof (*q_vector),GFP_KERNEL ); + q_vector =devm_kzalloc (ice_pf_to_dev (pf),sizeof (*q_vector), +GFP_KERNEL );if (!q_vector)return -ENOMEM ;
@@ -138,10 +139,11 @@ static void ice_free_q_vector(struct ice_vsi *vsi, int v_idx)struct ice_q_vector *q_vector;struct ice_pf *pf = vsi->back;struct ice_ring *ring; +struct device *dev; + dev =ice_pf_to_dev (pf);if (!vsi->q_vectors[v_idx]) { -dev_dbg (&pf->pdev->dev,"Queue vector at index %d not found\n" , - v_idx); +dev_dbg (dev,"Queue vector at index %d not found\n" , v_idx);return ; } q_vector = vsi->q_vectors[v_idx];
@@ -155,7 +157,7 @@ static void ice_free_q_vector(struct ice_vsi *vsi, int v_idx)if (vsi->netdev)netif_napi_del (&q_vector->napi); -devm_kfree (&pf->pdev->dev, q_vector); +devm_kfree (dev, q_vector); vsi->q_vectors[v_idx] =NULL ; }
@@ -482,7 +484,7 @@ int ice_vsi_ctrl_rx_ring(struct ice_vsi *vsi, bool ena, u16 rxq_idx)/* wait for the change to finish */ ret =ice_pf_rxq_wait (pf, pf_q, ena);if (ret) -dev_err (&pf->pdev->dev, +dev_err (ice_pf_to_dev (pf),"VSI idx %d Rx ring %d %sable timeout\n" , vsi->idx, pf_q, (ena ?"en" :"dis" ));
@@ -500,11 +502,12 @@ int ice_vsi_alloc_q_vectors(struct ice_vsi *vsi) {struct ice_pf *pf = vsi->back;int v_idx =0 , num_q_vectors; +struct device *dev;int err; + dev =ice_pf_to_dev (pf);if (vsi->q_vectors[0 ]) { -dev_dbg (&pf->pdev->dev,"VSI %d has existing q_vectors\n" , - vsi->vsi_num); +dev_dbg (dev,"VSI %d has existing q_vectors\n" , vsi->vsi_num);return -EEXIST ; }
@@ -522,8 +525,7 @@ int ice_vsi_alloc_q_vectors(struct ice_vsi *vsi)while (v_idx--)ice_free_q_vector (vsi, v_idx); -dev_err (&pf->pdev->dev, -"Failed to allocate %d q_vector for VSI %d, ret=%d\n" , +dev_err (dev,"Failed to allocate %d q_vector for VSI %d, ret=%d\n" , vsi->num_q_vectors, vsi->vsi_num, err); vsi->num_q_vectors =0 ;return err;
@@ -640,7 +642,7 @@ ice_vsi_cfg_txq(struct ice_vsi *vsi, struct ice_ring *ring, status =ice_ena_vsi_txq (vsi->port_info, vsi->idx, tc, ring->q_handle,1 , qg_buf, buf_len,NULL );if (status) { -dev_err (&pf->pdev->dev, +dev_err (ice_pf_to_dev (pf),"Failed to set LAN Tx queue context, error: %d\n" , status);return -ENODEV ;
drivers/net/ethernet/intel/ice/ice_dcb_lib.c +55 -57
357 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_dcb_lib.h +1 -1
@@ -58,7 +58,7 @@ ice_dcb_get_tc(struct ice_vsi __always_unused *vsi,static inline int ice_init_pf_dcb (struct ice_pf *pf,bool __always_unused locked) { -dev_dbg (&pf->pdev->dev,"DCB not supported\n" ); +dev_dbg (ice_pf_to_dev (pf),"DCB not supported\n" );return -EOPNOTSUPP ; }
drivers/net/ethernet/intel/ice/ice_dcb_nl.c +7 -7
@@ -179,7 +179,7 @@ static u8 ice_dcbnl_setdcbx(struct net_device *netdev, u8 mode)else pf->hw.port_info->local_dcbx_cfg.dcbx_mode =ICE_DCBX_MODE_IEEE ; -dev_info (&pf->pdev->dev,"DCBx mode = 0x%x\n" , mode); +dev_info (ice_pf_to_dev (pf),"DCBx mode = 0x%x\n" , mode);return ICE_DCB_HW_CHG_RST ; }
@@ -297,7 +297,7 @@ ice_dcbnl_get_pfc_cfg(struct net_device *netdev, int prio, u8 *setting)return ; *setting = (pi->local_dcbx_cfg.pfc.pfcena >> prio) &0x1 ; -dev_dbg (&pf->pdev->dev, +dev_dbg (ice_pf_to_dev (pf),"Get PFC Config up=%d, setting=%d, pfcenable=0x%x\n" , prio, *setting, pi->local_dcbx_cfg.pfc.pfcena); }
@@ -328,7 +328,7 @@ static void ice_dcbnl_set_pfc_cfg(struct net_device *netdev, int prio, u8 set)else new_cfg->pfc.pfcena &= ~BIT (prio); -dev_dbg (&pf->pdev->dev,"Set PFC config UP:%d set:%d pfcena:0x%x\n" , +dev_dbg (ice_pf_to_dev (pf),"Set PFC config UP:%d set:%d pfcena:0x%x\n" , prio, set, new_cfg->pfc.pfcena); }
@@ -359,7 +359,7 @@ static u8 ice_dcbnl_getstate(struct net_device *netdev) state =test_bit (ICE_FLAG_DCB_CAPABLE , pf->flags); -dev_dbg (&pf->pdev->dev,"DCB enabled state = %d\n" , state); +dev_dbg (ice_pf_to_dev (pf),"DCB enabled state = %d\n" , state);return state; }
@@ -418,7 +418,7 @@ ice_dcbnl_get_pg_tc_cfg_tx(struct net_device *netdev, int prio,return ; *pgid = pi->local_dcbx_cfg.etscfg.prio_table[prio]; -dev_dbg (&pf->pdev->dev, +dev_dbg (ice_pf_to_dev (pf),"Get PG config prio=%d tc=%d\n" , prio, *pgid); }
@@ -479,7 +479,7 @@ ice_dcbnl_get_pg_bwg_cfg_tx(struct net_device *netdev, int pgid, u8 *bw_pct)return ; *bw_pct = pi->local_dcbx_cfg.etscfg.tcbwtable[pgid]; -dev_dbg (&pf->pdev->dev,"Get PG BW config tc=%d bw_pct=%d\n" , +dev_dbg (ice_pf_to_dev (pf),"Get PG BW config tc=%d bw_pct=%d\n" , pgid, *bw_pct); }
@@ -597,7 +597,7 @@ static u8 ice_dcbnl_get_cap(struct net_device *netdev, int capid, u8 *cap)break ; } -dev_dbg (&pf->pdev->dev,"DCBX Get Capability cap=%d capval=0x%x\n" , +dev_dbg (ice_pf_to_dev (pf),"DCBX Get Capability cap=%d capval=0x%x\n" , capid, *cap);return 0 ; }
drivers/net/ethernet/intel/ice/ice_ethtool.c +31 -26
211 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_lib.c +88 -67
499 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_main.c +85 -86
620 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +106 -85
674 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_xsk.c +2 -2
@@ -331,7 +331,7 @@ static int ice_xsk_umem_dma_map(struct ice_vsi *vsi, struct xdp_umem *umem)struct device *dev;unsigned int i; - dev = &pf->pdev->dev; + dev =ice_pf_to_dev (pf);for (i =0 ; i < umem->npgs; i++) { dma_addr_t dma = dma_map_page_attrs(dev, umem->pgs[i], 0, PAGE_SIZE,
@@ -369,7 +369,7 @@ static void ice_xsk_umem_dma_unmap(struct ice_vsi *vsi, struct xdp_umem *umem)struct device *dev;unsigned int i; - dev = &pf->pdev->dev; + dev =ice_pf_to_dev (pf);for (i =0 ; i < umem->npgs; i++) {dma_unmap_page_attrs (dev, umem->pages[i].dma,PAGE_SIZE ,DMA_BIDIRECTIONAL ,ICE_RX_DMA_ATTR );
Signature · 1 line
2.20.1
Bowers
PATCH 10/15 ice: Add ice_pf_to_dev(pf) macro
Quoted 17 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Friday, November 8, 2019 6:23 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S33 10/15] ice: Addice_pf_to_dev(pf)macroFrom: Brett Creeley <[email protected]>
We use
&pf->dev->pdevall over the code. Add a simple macro to do this for us. When multiple de-references like this are being done add a local struct device variable.Signed-off-by Brett Creeley <[email protected]>Signed-off-by Tony Nguyen <[email protected]>
Quoted 12 lines
--- drivers/net/ethernet/intel/ice/ice.h | 2 + drivers/net/ethernet/intel/ice/ice_base.c | 22 +- drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 112 +++++----- drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 2 +- drivers/net/ethernet/intel/ice/ice_dcb_nl.c | 14 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 57 +++--- drivers/net/ethernet/intel/ice/ice_lib.c | 155 ++++++++------ drivers/net/ethernet/intel/ice/ice_main.c | 171 ++++++++-------- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 191 ++++++++++-------- drivers/net/ethernet/intel/ice/ice_xsk.c | 4 +- 10 files changed, 389 insertions(+), 341 deletions(-)
Tony Nguyen
maintainerPATCH 11/15 ice: add helpers for virtchnl
In reply to Tony NguyenFrom: Jesse Brandeburg <[email protected]>
The virtchannel interface was repeating a lot of strings and wasting storage space in the kernel. There was also inconsistent messages for the same thing. Consolidate all those messages and bit checks into a couple of helper functions.
Also, reduce stack space usage by simplifying getting the pointer to the pf using a helper.
--- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 134 ++++++++---------- 1 file changed, 63 insertions(+), 71 deletions(-)
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +63 -71
@@ -5,6 +5,35 @@#include "ice_base.h" #include "ice_lib.h" +/** +* ice_validate_vf_id - helper to check if VF ID is valid +* @pf: pointer to the PF structure +* @vf_id: the ID of the VF to check +*/ +static int ice_validate_vf_id (struct ice_pf *pf,int vf_id) +{ +if (vf_id >= pf->num_alloc_vfs) { +dev_err (ice_pf_to_dev (pf),"Invalid VF ID: %d\n" , vf_id); +return -EINVAL ; + } +return 0 ; +} + +/** +* ice_check_vf_init - helper to check if VF init complete +* @pf: pointer to the PF structure +* @vf: the pointer to the VF to check +*/ +static int ice_check_vf_init (struct ice_pf *pf,struct ice_vf *vf) +{ +if (!test_bit (ICE_VF_STATE_INIT , vf->vf_states)) { +dev_err (ice_pf_to_dev (pf),"VF ID: %d in reset. Try again.\n" , + vf->vf_id); +return -EBUSY ; + } +return 0 ; +} +/** * ice_err_to_virt err - translate errors for VF return code * @ice_err: error return code
@@ -1302,9 +1331,13 @@ void ice_vc_notify_reset(struct ice_pf *pf)static void ice_vc_notify_vf_reset (struct ice_vf *vf) {struct virtchnl_pf_event pfe; +struct ice_pf *pf; -/* validate the request */ -if (!vf || vf->vf_id >= vf->pf->num_alloc_vfs) +if (!vf) +return ; + + pf = vf->pf; +if (ice_validate_vf_id (pf, vf->vf_id))return ;/* Bail out if VF is in disabled state, neither initialized, nor active
@@ -1317,7 +1350,7 @@ static void ice_vc_notify_vf_reset(struct ice_vf *vf) pfe.event =VIRTCHNL_EVENT_RESET_IMPENDING ; pfe.severity =PF_EVENT_SEVERITY_CERTAIN_DOOM ; -ice_aq_send_msg_to_vf (&vf->pf->hw, vf->vf_id,VIRTCHNL_OP_EVENT , +ice_aq_send_msg_to_vf (&pf->hw, vf->vf_id,VIRTCHNL_OP_EVENT ,VIRTCHNL_STATUS_SUCCESS , (u8 *)&pfe,sizeof (pfe),NULL ); }
@@ -1544,11 +1577,12 @@ ice_vc_send_msg_to_vf(struct ice_vf *vf, u32 v_opcode,struct device *dev;struct ice_pf *pf; -/* validate the request */ -if (!vf || vf->vf_id >= vf->pf->num_alloc_vfs) +if (!vf)return -EINVAL ; pf = vf->pf; +if (ice_validate_vf_id (pf, vf->vf_id)) +return -EINVAL ; dev =ice_pf_to_dev (pf);
@@ -1622,7 +1656,7 @@ static int ice_vc_get_vf_res_msg(struct ice_vf *vf, u8 *msg)int len =0 ;int ret; -if (!test_bit (ICE_VF_STATE_INIT , vf->vf_states)) { +if (ice_check_vf_init (pf, vf)) { v_ret =VIRTCHNL_STATUS_ERR_PARAM ; goto err; }
@@ -1801,7 +1835,7 @@ static int ice_vc_config_rss_key(struct ice_vf *vf, u8 *msg)struct virtchnl_rss_key *vrk = (struct virtchnl_rss_key *)msg;struct ice_pf *pf = vf->pf; -struct ice_vsi *vsi =NULL ; +struct ice_vsi *vsi;if (!test_bit (ICE_VF_STATE_ACTIVE , vf->vf_states)) { v_ret =VIRTCHNL_STATUS_ERR_PARAM ;
@@ -1848,7 +1882,7 @@ static int ice_vc_config_rss_lut(struct ice_vf *vf, u8 *msg)struct virtchnl_rss_lut *vrl = (struct virtchnl_rss_lut *)msg;enum virtchnl_status_code v_ret =VIRTCHNL_STATUS_SUCCESS ;struct ice_pf *pf = vf->pf; -struct ice_vsi *vsi =NULL ; +struct ice_vsi *vsi;if (!test_bit (ICE_VF_STATE_ACTIVE , vf->vf_states)) { v_ret =VIRTCHNL_STATUS_ERR_PARAM ;
@@ -2597,19 +2631,15 @@ ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos, __be16 vlan_proto) {u16 vlanprio = vlan_id | (qos <<ICE_VLAN_PRIORITY_S ); -struct ice_netdev_priv *np =netdev_priv (netdev); -struct ice_pf *pf = np->vsi->back; +struct ice_pf *pf =ice_netdev_to_pf (netdev);struct ice_vsi *vsi;struct device *dev;struct ice_vf *vf;int ret =0 ; dev =ice_pf_to_dev (pf); -/* validate the request */ -if (vf_id >= pf->num_alloc_vfs) { -dev_err (dev,"invalid VF id: %d\n" , vf_id); +if (ice_validate_vf_id (pf, vf_id))return -EINVAL ; - }if (vlan_id >ICE_MAX_VLANID || qos >7 ) {dev_err (dev,"Invalid VF Parameters\n" );
@@ -2623,10 +2653,8 @@ ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos, vf = &pf->vf[vf_id]; vsi = pf->vsi[vf->lan_vsi_idx]; -if (!test_bit (ICE_VF_STATE_INIT , vf->vf_states)) { -dev_err (dev,"VF %d in reset. Try again.\n" , vf_id); +if (ice_check_vf_init (pf, vf))return -EBUSY ; - }if (le16_to_cpu (vsi->info.pvid) == vlanprio) {/* duplicate request, so just return success */
@@ -2984,7 +3012,7 @@ void ice_vc_process_vf_msg(struct ice_pf *pf, struct ice_rq_event_info *event)int err =0 ; dev =ice_pf_to_dev (pf); -if (vf_id >= pf->num_alloc_vfs) { +if (ice_validate_vf_id (pf, vf_id)) { err = -EINVAL ; goto error_handler; }
@@ -3102,24 +3130,18 @@ void ice_vc_process_vf_msg(struct ice_pf *pf, struct ice_rq_event_info *event)int ice_get_vf_cfg (struct net_device *netdev,int vf_id,struct ifla_vf_info *ivi) { -struct ice_netdev_priv *np =netdev_priv (netdev); -struct ice_vsi *vsi = np->vsi; -struct ice_pf *pf = vsi->back; +struct ice_pf *pf =ice_netdev_to_pf (netdev); +struct ice_vsi *vsi;struct ice_vf *vf; -/* validate the request */ -if (vf_id >= pf->num_alloc_vfs) { -netdev_err (netdev,"invalid VF id: %d\n" , vf_id); +if (ice_validate_vf_id (pf, vf_id))return -EINVAL ; - } vf = &pf->vf[vf_id]; vsi = pf->vsi[vf->lan_vsi_idx]; -if (!test_bit (ICE_VF_STATE_INIT , vf->vf_states)) { -netdev_err (netdev,"VF %d in reset. Try again.\n" , vf_id); +if (ice_check_vf_init (pf, vf))return -EBUSY ; - } ivi->vf = vf_id;ether_addr_copy (ivi->mac, vf->dflt_lan_addr.addr);
@@ -3152,9 +3174,8 @@ ice_get_vf_cfg(struct net_device *netdev, int vf_id, struct ifla_vf_info *ivi)*/ int ice_set_vf_spoofchk (struct net_device *netdev,int vf_id,bool ena) { -struct ice_netdev_priv *np =netdev_priv (netdev); -struct ice_vsi *vsi = np->vsi; -struct ice_pf *pf = vsi->back; +struct ice_pf *pf =ice_netdev_to_pf (netdev); +struct ice_vsi *vsi = pf->vsi[0 ];struct ice_vsi_ctx *ctx;enum ice_status status;struct device *dev;
@@ -3162,18 +3183,12 @@ int ice_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool ena)int ret =0 ; dev =ice_pf_to_dev (pf); - -/* validate the request */ -if (vf_id >= pf->num_alloc_vfs) { -netdev_err (netdev,"invalid VF id: %d\n" , vf_id); +if (ice_validate_vf_id (pf, vf_id))return -EINVAL ; - } vf = &pf->vf[vf_id]; -if (!test_bit (ICE_VF_STATE_INIT , vf->vf_states)) { -netdev_err (netdev,"VF %d in reset. Try again.\n" , vf_id); +if (ice_check_vf_init (pf, vf))return -EBUSY ; - }if (ena == vf->spoofchk) { dev_dbg(dev, "VF spoofchk already %s\n",
@@ -3235,17 +3250,12 @@ static void ice_wait_on_vf_reset(struct ice_vf *vf)*/ int ice_set_vf_mac (struct net_device *netdev,int vf_id,u8 *mac) { -struct ice_netdev_priv *np =netdev_priv (netdev); -struct ice_vsi *vsi = np->vsi; -struct ice_pf *pf = vsi->back; +struct ice_pf *pf =ice_netdev_to_pf (netdev);struct ice_vf *vf;int ret =0 ; -/* validate the request */ -if (vf_id >= pf->num_alloc_vfs) { -netdev_err (netdev,"invalid VF id: %d\n" , vf_id); +if (ice_validate_vf_id (pf, vf_id))return -EINVAL ; - } vf = &pf->vf[vf_id];/* Don't set MAC on disabled VF */
@@ -3257,10 +3267,8 @@ int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)*/ ice_wait_on_vf_reset (vf); -if (!test_bit (ICE_VF_STATE_INIT , vf->vf_states)) { -netdev_err (netdev,"VF %d in reset. Try again.\n" , vf_id); +if (ice_check_vf_init (pf, vf))return -EBUSY ; - }if (is_zero_ether_addr (mac) ||is_multicast_ether_addr (mac)) {netdev_err (netdev,"%pM not a valid unicast address\n" , mac);
@@ -3292,19 +3300,13 @@ int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)*/ int ice_set_vf_trust (struct net_device *netdev,int vf_id,bool trusted) { -struct ice_netdev_priv *np =netdev_priv (netdev); -struct ice_vsi *vsi = np->vsi; -struct ice_pf *pf = vsi->back; +struct ice_pf *pf =ice_netdev_to_pf (netdev);struct device *dev;struct ice_vf *vf; dev =ice_pf_to_dev (pf); - -/* validate the request */ -if (vf_id >= pf->num_alloc_vfs) { -dev_err (dev,"invalid VF id: %d\n" , vf_id); +if (ice_validate_vf_id (pf, vf_id))return -EINVAL ; - } vf = &pf->vf[vf_id];/* Don't set Trusted Mode on disabled VF */
@@ -3316,10 +3318,8 @@ int ice_set_vf_trust(struct net_device *netdev, int vf_id, bool trusted)*/ ice_wait_on_vf_reset (vf); -if (!test_bit (ICE_VF_STATE_INIT , vf->vf_states)) { -dev_err (dev,"VF %d in reset. Try again.\n" , vf_id); +if (ice_check_vf_init (pf, vf))return -EBUSY ; - }/* Check if already trusted */ if (trusted == vf->trusted)
@@ -3343,29 +3343,21 @@ int ice_set_vf_trust(struct net_device *netdev, int vf_id, bool trusted)*/ int ice_set_vf_link_state (struct net_device *netdev,int vf_id,int link_state) { -struct ice_netdev_priv *np =netdev_priv (netdev); -struct ice_pf *pf = np->vsi->back; +struct ice_pf *pf =ice_netdev_to_pf (netdev);struct virtchnl_pf_event pfe = {0 };struct ice_link_status *ls; -struct device *dev;struct ice_vf *vf;struct ice_hw *hw; - dev =ice_pf_to_dev (pf); - -if (vf_id >= pf->num_alloc_vfs) { -dev_err (dev,"Invalid VF Identifier %d\n" , vf_id); +if (ice_validate_vf_id (pf, vf_id))return -EINVAL ; - } vf = &pf->vf[vf_id]; hw = &pf->hw; ls = &pf->hw.port_info->phy.link_info; -if (!test_bit (ICE_VF_STATE_INIT , vf->vf_states)) { -dev_err (dev,"vf %d in reset. Try again.\n" , vf_id); +if (ice_check_vf_init (pf, vf))return -EBUSY ; - } pfe.event =VIRTCHNL_EVENT_LINK_CHANGE ; pfe.severity =PF_EVENT_SEVERITY_INFO ;
Signature · 1 line
2.20.1
Bowers
PATCH 11/15 ice: add helpers for virtchnl
Quoted 17 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Friday, November 8, 2019 6:23 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S33 11/15] ice: add helpers for virtchnlFrom: Jesse Brandeburg <[email protected]>
The virtchannel interface was repeating a lot of strings and wasting storage space in the kernel. There was also inconsistent messages for the same thing. Consolidate all those messages and bit checks into a couple of helper functions.
Also, reduce stack space usage by simplifying getting the pointer to the pf using a helper.
Quoted 7 lines
Signed-off-by Jesse Brandeburg <[email protected]>Co-developed-by Brett Creeley <[email protected]>Signed-off-by Brett Creeley <[email protected]>Signed-off-by Tony Nguyen <[email protected]>--- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 134 ++++++++---------- 1 file changed, 63 insertions(+), 71 deletions(-)
Tony Nguyen
maintainerPATCH 12/15 ice: implement VF stats NDO
In reply to Tony NguyenFrom: Jesse Brandeburg <[email protected]>
Implement the VF stats gathering via the kernel via ndo_get_vf_stats(). The driver will show per-VF stats in the output of the
ip -s link show dev <PF> command.
--- drivers/net/ethernet/intel/ice/ice_main.c | 1 + .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 45 +++++++++++++++++++ .../net/ethernet/intel/ice/ice_virtchnl_pf.h | 11 +++++ 3 files changed, 57 insertions(+)
drivers/net/ethernet/intel/ice/ice_main.c +1 -0
@@ -5219,6 +5219,7 @@ static const struct net_device_ops ice_netdev_ops = { .ndo_set_vf_trust = ice_set_vf_trust, .ndo_set_vf_vlan = ice_set_vf_port_vlan, .ndo_set_vf_link_state = ice_set_vf_link_state, + .ndo_get_vf_stats = ice_get_vf_stats, .ndo_vlan_rx_add_vid = ice_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = ice_vlan_rx_kill_vid, .ndo_set_features = ice_set_features,
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +45 -0
48 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h +11 -0
@@ -122,6 +122,9 @@ int ice_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool ena);int ice_calc_vf_reg_idx (struct ice_vf *vf,struct ice_q_vector *q_vector);void ice_set_vf_state_qs_dis (struct ice_vf *vf); +int +ice_get_vf_stats (struct net_device *netdev,int vf_id, +struct ifla_vf_stats *vf_stats);#else /* CONFIG_PCI_IOV */ #define ice_process_vflr_event (pf) do {} while (0)#define ice_free_vfs (pf) do {} while (0)
@@ -194,5 +197,13 @@ ice_calc_vf_reg_idx(struct ice_vf __always_unused *vf, {return 0 ; } + +static inline int +ice_get_vf_stats (struct net_device __always_unused *netdev, +int __always_unused vf_id, +struct ifla_vf_stats __always_unused *vf_stats) +{ +return -EOPNOTSUPP ; +}#endif /* CONFIG_PCI_IOV */ #endif /* _ICE_VIRTCHNL_PF_H_ */
Signature · 1 line
2.20.1
Bowers
PATCH 12/15 ice: implement VF stats NDO
Quoted 13 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Friday, November 8, 2019 6:23 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S33 12/15] ice: implement VF stats NDOFrom: Jesse Brandeburg <[email protected]>
Implement the VF stats gathering via the kernel via
ndo_get_vf_stats(). The driver will show per-VF stats in the output of the ip -s link show dev <PF> command.
Quoted 7 lines
Signed-off-by Jesse Brandeburg <[email protected]>Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/ice/ice_main.c | 1 + .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 45 +++++++++++++++++++ .../net/ethernet/intel/ice/ice_virtchnl_pf.h | 11 +++++ 3 files changed, 57 insertions(+)
Tony Nguyen
maintainerPATCH 13/15 ice: Implement ethtool ops for channels
In reply to Tony NguyenFrom: Henry Tieman <[email protected]>
Add code to query and set the number of channels on the primary VSI for a PF. This is accessed from the 'ethtool -l' and 'ethtool -L' commands, respectively. Though the ice driver supports asymmetric queues report an IRQ vector that has both Rx and Tx queues attached and is counted as a 'combined' channel.
--- drivers/net/ethernet/intel/ice/ice.h | 4 + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 4 +- drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 2 + drivers/net/ethernet/intel/ice/ice_ethtool.c | 194 +++++++++++++++++++ drivers/net/ethernet/intel/ice/ice_lib.c | 70 +++++-- drivers/net/ethernet/intel/ice/ice_lib.h | 2 +- drivers/net/ethernet/intel/ice/ice_main.c | 87 ++++++++- 7 files changed, 344 insertions(+), 19 deletions(-)
drivers/net/ethernet/intel/ice/ice.h +4 -0
@@ -285,6 +285,8 @@ struct ice_vsi {u16 num_txq;/* Used Tx queues */ u16 alloc_rxq;/* Allocated Rx queues */ u16 num_rxq;/* Used Rx queues */ +u16 req_txq;/* User requested Tx queues */ +u16 req_rxq;/* User requested Rx queues */ u16 num_rx_desc;u16 num_tx_desc;struct ice_tc_cfg tc_cfg;
@@ -491,6 +493,7 @@ void ice_set_ethtool_ops(struct net_device *netdev);void ice_set_ethtool_safe_mode_ops (struct net_device *netdev);u16 ice_get_avail_txq_count (struct ice_pf *pf);u16 ice_get_avail_rxq_count (struct ice_pf *pf); +int ice_vsi_recfg_qs (struct ice_vsi *vsi,int new_rx,int new_tx);void ice_update_vsi_stats (struct ice_vsi *vsi);void ice_update_pf_stats (struct ice_pf *pf);int ice_up (struct ice_vsi *vsi);
@@ -505,6 +508,7 @@ ice_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames,int ice_set_rss (struct ice_vsi *vsi,u8 *seed,u8 *lut,u16 lut_size);int ice_get_rss (struct ice_vsi *vsi,u8 *seed,u8 *lut,u16 lut_size);void ice_fill_rss_lut (u8 *lut,u16 rss_table_size,u16 rss_size); +int ice_schedule_reset (struct ice_pf *pf,enum ice_reset_req reset);void ice_print_link_msg (struct ice_vsi *vsi,bool isup);int ice_open (struct net_device *netdev);int ice_stop (struct net_device *netdev);
drivers/net/ethernet/intel/ice/ice_dcb_lib.c +1 -3
@@ -4,8 +4,6 @@#include "ice_dcb_lib.h" #include "ice_dcb_nl.h" -static void ice_pf_dcb_recfg (struct ice_pf *pf); -/** * ice_vsi_cfg_netdev_tc - Setup the netdev TC configuration * @vsi: the VSI being configured
@@ -535,7 +533,7 @@ static int ice_dcb_noncontig_cfg(struct ice_pf *pf)* calling this function. Reconfiguring DCB based on * local_dcbx_cfg. */ -static void ice_pf_dcb_recfg (struct ice_pf *pf) +void ice_pf_dcb_recfg (struct ice_pf *pf) {struct ice_dcbx_cfg *dcbcfg = &pf->hw.port_info->local_dcbx_cfg;u8 tc_map =0 ;
drivers/net/ethernet/intel/ice/ice_dcb_lib.h +2 -0
@@ -20,6 +20,7 @@ u8 ice_dcb_get_num_tc(struct ice_dcbx_cfg *dcbcfg);u8 ice_dcb_get_tc (struct ice_vsi *vsi,int queue_index);int ice_pf_dcb_cfg (struct ice_pf *pf,struct ice_dcbx_cfg *new_cfg,bool locked); +void ice_pf_dcb_recfg (struct ice_pf *pf);void ice_vsi_cfg_dcb_rings (struct ice_vsi *vsi);int ice_init_pf_dcb (struct ice_pf *pf,bool locked);void ice_update_dcb_stats (struct ice_pf *pf);
@@ -78,6 +79,7 @@ ice_tx_prepare_vlan_flags_dcb(struct ice_ring __always_unused *tx_ring, }#define ice_update_dcb_stats (pf) do {} while (0) +#define ice_pf_dcb_recfg (pf) do {} while (0)#define ice_vsi_cfg_dcb_rings (vsi) do {} while (0)#define ice_dcb_process_lldp_set_mib_change (pf, event) do {} while (0)#define ice_set_cgd_num (tlan_ctx, ring) do {} while (0)
drivers/net/ethernet/intel/ice/ice_ethtool.c +194 -0
212 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_lib.c +56 -14
148 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_lib.h +1 -1
@@ -73,7 +73,7 @@ int ice_free_res(struct ice_res_tracker *res, u16 index, u16 id);int ice_get_res (struct ice_pf *pf,struct ice_res_tracker *res,u16 needed,u16 id); -int ice_vsi_rebuild (struct ice_vsi *vsi); +int ice_vsi_rebuild (struct ice_vsi *vsi,bool init_vsi);bool ice_is_reset_in_progress (unsigned long *state);
drivers/net/ethernet/intel/ice/ice_main.c +86 -1
111 lines not on this page · raw message
Signature · 1 line
2.20.1
Bowers
PATCH 13/15 ice: Implement ethtool ops for channels
Quoted 20 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Friday, November 8, 2019 6:23 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S33 13/15] ice: Implement ethtool ops for channelsFrom: Henry Tieman <[email protected]>
Add code to query and set the number of channels on the primary VSI for a PF. This is accessed from the 'ethtool -l' and 'ethtool -L' commands, respectively. Though the ice driver supports asymmetric queues report an IRQ vector that has both Rx and Tx queues attached and is counted as a 'combined' channel.
Signed-off-by Henry Tieman <[email protected]>Co-developed-by Maciej Fijalkowski <[email protected]>Signed-off-by Maciej Fijalkowski <[email protected]>Signed-off-by Tony Nguyen <[email protected]>
Quoted 9 lines
--- drivers/net/ethernet/intel/ice/ice.h | 4 + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 4 +- drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 2 + drivers/net/ethernet/intel/ice/ice_ethtool.c | 194 +++++++++++++++++++ drivers/net/ethernet/intel/ice/ice_lib.c | 70 +++++-- drivers/net/ethernet/intel/ice/ice_lib.h | 2 +- drivers/net/ethernet/intel/ice/ice_main.c | 87 ++++++++- 7 files changed, 344 insertions(+), 19 deletions(-)
Tony Nguyen
maintainerPATCH 14/15 ice: remove pointless NULL check of port_info
In reply to Tony NguyenFrom: Jacob Keller <[email protected]>
The code in ice_sched_cleanup_all checks whether the port info is NULL prior to calling ice_sched_clear_port. However, ice_sched_clear_port already checks whether port info is non-NULL.
More importantly, it also checks whether the port structure has been initialized by checking its port_state field as well.
--- drivers/net/ethernet/intel/ice/ice_sched.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_sched.c +1 -2
@@ -798,8 +798,7 @@ void ice_sched_cleanup_all(struct ice_hw *hw) hw->layer_info =NULL ; } -if (hw->port_info) -ice_sched_clear_port (hw->port_info); +ice_sched_clear_port (hw->port_info); hw->num_tx_sched_layers =0 ; hw->num_tx_sched_phys_layers =0 ;
Signature · 1 line
2.20.1
Bowers
PATCH 14/15 ice: remove pointless NULL check of port_info
Quoted 14 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Friday, November 8, 2019 6:24 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S33 14/15] ice: remove pointless NULL check ofport_infoFrom: Jacob Keller <[email protected]>
The code in
ice_sched_cleanup_allchecks whether the port info is NULL prior to callingice_sched_clear_port. However,ice_sched_clear_portalready checks whether port info is non-NULL.
Quoted 7 lines
More importantly, it also checks whether the port structure has been initialized by checking its
port_statefield as well.Signed-off-by Jacob Keller <[email protected]>--- drivers/net/ethernet/intel/ice/ice_sched.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Tony Nguyen
maintainerPATCH 15/15 ice: Update FW API minor version
In reply to Tony NguyenFrom: Kevin Scott <[email protected]>
Update FW API minor version to align to current value advertised by FW in new NVM images.
--- drivers/net/ethernet/intel/ice/ice_controlq.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_controlq.h +1 -1
@@ -22,7 +22,7 @@*/ #define EXP_FW_API_VER_BRANCH 0x00#define EXP_FW_API_VER_MAJOR 0x01 -#define EXP_FW_API_VER_MINOR 0x03 +#define EXP_FW_API_VER_MINOR 0x05/* Different control queue types: These are mainly for SW consumption. */ enum ice_ctl_q {
Signature · 1 line
2.20.1
Bowers
PATCH 15/15 ice: Update FW API minor version
Quoted 10 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Friday, November 8, 2019 6:24 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S33 15/15] ice: Update FW API minor versionFrom: Kevin Scott <[email protected]>
Quoted 8 lines
Update FW API minor version to align to current value advertised by FW in new NVM images.
Signed-off-by Kevin Scott <[email protected]>Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/ice/ice_controlq.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Bowers
PATCH 1/15 ice: Store number of functions for the device
In reply to Tony NguyenQuoted 13 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Friday, November 8, 2019 6:23 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S33 01/15] ice: Store number of functions for the deviceFrom: Bruce Allan <[email protected]>
Store the number of functions the device has and use this number when setting safe mode capabilities instead of calculating it.
Quoted 8 lines
Signed-off-by Bruce Allan <[email protected]>Co-developed-by Kevin Scott <[email protected]>Signed-off-by Kevin Scott <[email protected]>Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/ice/ice_common.c | 21 ++++++++++----------- drivers/net/ethernet/intel/ice/ice_type.h | 1 + 2 files changed, 11 insertions(+), 11 deletions(-)