ice: update ethtool stats on-demand
Subsystems (2)
Tony Nguyen
maintainerPATCH 1/12 ice: update ethtool stats on-demand
From: Bruce Allan <[email protected]>
Users expect ethtool statistics to be updated on-demand when invoking 'ethtool -S <iface>' instead of providing a snapshot of statistics taken once a second (the frequency of the watchdog task where stats are currently updated). Update stats every time 'ethtool -S <iface>' is run.
Also, fix an indentation style issue and an unnecessary local variable initialization in ice_get_ethtool_stats() discovered while investigating the subject issue.
--- drivers/net/ethernet/intel/ice/ice.h | 2 ++ drivers/net/ethernet/intel/ice/ice_ethtool.c | 7 +++++-- drivers/net/ethernet/intel/ice/ice_main.c | 6 ++---- 3 files changed, 9 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/ice/ice.h +2 -0
@@ -450,6 +450,8 @@ int ice_vsi_setup_tx_rings(struct ice_vsi *vsi);int ice_vsi_setup_rx_rings (struct ice_vsi *vsi);void ice_set_ethtool_ops (struct net_device *netdev);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);int ice_down (struct ice_vsi *vsi);int ice_vsi_cfg (struct ice_vsi *vsi);
drivers/net/ethernet/intel/ice/ice_ethtool.c +5 -2
@@ -1319,14 +1319,17 @@ ice_get_ethtool_stats(struct net_device *netdev,struct ice_vsi *vsi = np->vsi;struct ice_pf *pf = vsi->back;struct ice_ring *ring; -unsigned int j =0 ; +unsigned int j;int i =0 ;char *p; +ice_update_pf_stats (pf); +ice_update_vsi_stats (vsi); +for (j =0 ; j <ICE_VSI_STATS_LEN ; j++) { p = (char *)vsi + ice_gstrings_vsi_stats[j].stat_offset; data[i++] = (ice_gstrings_vsi_stats[j].sizeof_stat == -sizeof (u64)) ? *(u64 *)p : *(u32 *)p; +sizeof (u64)) ? *(u64 *)p : *(u32 *)p; }/* populate per queue stats */
drivers/net/ethernet/intel/ice/ice_main.c +2 -4
@@ -34,8 +34,6 @@ static const struct net_device_ops ice_netdev_ops;static void ice_rebuild (struct ice_pf *pf);static void ice_vsi_release_all (struct ice_pf *pf); -static void ice_update_vsi_stats (struct ice_vsi *vsi); -static void ice_update_pf_stats (struct ice_pf *pf);/** * ice_get_tx_pending - returns number of Tx descriptors not processed
@@ -3290,7 +3288,7 @@ static void ice_update_vsi_ring_stats(struct ice_vsi *vsi)* ice_update_vsi_stats - Update VSI stats counters * @vsi: the VSI to be updated */ -static void ice_update_vsi_stats (struct ice_vsi *vsi) +void ice_update_vsi_stats (struct ice_vsi *vsi) {struct rtnl_link_stats64 *cur_ns = &vsi->net_stats;struct ice_eth_stats *cur_es = &vsi->eth_stats;
@@ -3326,7 +3324,7 @@ static void ice_update_vsi_stats(struct ice_vsi *vsi)* ice_update_pf_stats - Update PF port stats counters * @pf: PF whose stats needs to be updated */ -static void ice_update_pf_stats (struct ice_pf *pf) +void ice_update_pf_stats (struct ice_pf *pf) {struct ice_hw_port_stats *prev_ps, *cur_ps;struct ice_hw *hw = &pf->hw;
Signature · 1 line
2.20.1
Tony Nguyen
maintainerPATCH 2/12 ice: Fix issues updating VSI MAC filters
From: Akeem G Abodunrin <[email protected]>
VSI, especially VF could request to add or remove filter for another VSI, driver should really guide such request and disallow it. However, instead of returning error for such malicious request, driver can simply return success.
In addition, we are not tracking number of MAC filters configured per VF correctly - and this leads to issue updating VF MAC filters whenever they were removed and re-configured via bringing VF interface down and up. Also, since VF could send request to update multiple MAC filters at once, driver should program those filters individually in the switch, in order to determine which action resulted to error, and communicate accordingly to the VF.
So, with this changes, we now track number of filters added right from when VF resources allocation is done, and could properly add filters for both trusted and non_trusted VFs, without MAC filters mis-match issue in the switch...
Also refactor code, so that driver can use new function to add or remove MAC filters.
--- drivers/net/ethernet/intel/ice/ice_lib.c | 30 +++++++++ drivers/net/ethernet/intel/ice/ice_lib.h | 4 ++ drivers/net/ethernet/intel/ice/ice_main.c | 64 +++++-------------- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 42 ++++++------ 4 files changed, 73 insertions(+), 67 deletions(-)
drivers/net/ethernet/intel/ice/ice_lib.c +30 -0
@@ -3211,3 +3211,33 @@ int ice_vsi_cfg_tc(struct ice_vsi *vsi, u8 ena_tc) return ret; }#endif /* CONFIG_DCB */ + +/** +* ice_vsi_cfg_mac_fltr - Add or remove a MAC address filter for a VSI +* @vsi: the VSI being configured MAC filter +* @macaddr: the MAC address to be added. +* @set: Add or delete a MAC filter +* +* Adds or removes MAC address filter entry for VF VSI +*/ +enum ice_status +ice_vsi_cfg_mac_fltr (struct ice_vsi *vsi,const u8 *macaddr,bool set) +{ +LIST_HEAD (tmp_add_list); +enum ice_status status; + +/* Update MAC filter list to be added or removed for a VSI */ +if (ice_add_mac_to_list (vsi, &tmp_add_list, macaddr)) { + status =ICE_ERR_NO_MEMORY ; + goto cfg_mac_fltr_exit; + } + +if (set) + status =ice_add_mac (&vsi->back->hw, &tmp_add_list); +else + status =ice_remove_mac (&vsi->back->hw, &tmp_add_list); + +cfg_mac_fltr_exit: +ice_free_fltr_list (&vsi->back->pdev->dev, &tmp_add_list); +return status; +}
drivers/net/ethernet/intel/ice/ice_lib.h +4 -0
@@ -95,4 +95,8 @@ void ice_vsi_free_tx_rings(struct ice_vsi *vsi);int ice_vsi_manage_rss_lut (struct ice_vsi *vsi,bool ena);u32 ice_intrl_usec_to_reg (u8 intrl,u8 gran); + +enum ice_status +ice_vsi_cfg_mac_fltr (struct ice_vsi *vsi,const u8 *macaddr,bool set); +#endif /* !_ICE_LIB_H_ */
drivers/net/ethernet/intel/ice/ice_main.c +17 -47
120 lines not on this page · raw message
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +22 -20
69 lines not on this page · raw message
Signature · 1 line
2.20.1
Bowers
PATCH 2/12 ice: Fix issues updating VSI MAC filters
Quoted 31 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, July 25, 2019 2:54 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S25 02/12] ice: Fix issues updating VSI MAC filtersFrom: Akeem G Abodunrin <[email protected]>
VSI, especially VF could request to add or remove filter for another VSI, driver should really guide such request and disallow it. However, instead of returning error for such malicious request, driver can simply return success.
In addition, we are not tracking number of MAC filters configured per VF correctly - and this leads to issue updating VF MAC filters whenever they were removed and re-configured via bringing VF interface down and up. Also, since VF could send request to update multiple MAC filters at once, driver should program those filters individually in the switch, in order to determine which action resulted to error, and communicate accordingly to the VF.
So, with this changes, we now track number of filters added right from when VF resources allocation is done, and could properly add filters for both trusted and
non_trustedVFs, without MAC filters mis-match issue in the switch...Also refactor code, so that driver can use new function to add or remove MAC filters.
Quoted 8 lines
Signed-off-by Akeem G Abodunrin <[email protected]>Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/ice/ice_lib.c | 30 +++++++++ drivers/net/ethernet/intel/ice/ice_lib.h | 4 ++ drivers/net/ethernet/intel/ice/ice_main.c | 64 +++++-------------- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 42 ++++++------ 4 files changed, 73 insertions(+), 67 deletions(-)
Tony Nguyen
maintainerPATCH 3/12 ice: Don't allow VSI to remove unassociated ucast filter
In reply to Tony NguyenFrom: Akeem G Abodunrin <[email protected]>
If a VSI is not using a unicast filter or did not configure that particular unicast filter, driver should not allow it to be removed by the rogue VSI.
--- drivers/net/ethernet/intel/ice/ice_switch.c | 56 +++++++++++++++++++++ 1 file changed, 56 insertions(+)
drivers/net/ethernet/intel/ice/ice_switch.c +56 -0
@@ -2136,6 +2136,38 @@ ice_cfg_dflt_vsi(struct ice_hw *hw, u16 vsi_handle, bool set, u8 direction)return status; } +/** +* ice_find_ucast_rule_entry - Search for a unicast MAC filter rule entry +* @hw: pointer to the hardware structure +* @recp_id: lookup type for which the specified rule needs to be searched +* @f_info: rule information +* +* Helper function to search for a unicast rule entry - this is to be used +* to remove unicast MAC filter that is not shared with other VSIs on the +* PF switch. +* +* Returns pointer to entry storing the rule if found +*/ +static struct ice_fltr_mgmt_list_entry * +ice_find_ucast_rule_entry (struct ice_hw *hw,u8 recp_id, +struct ice_fltr_info *f_info) +{ +struct ice_switch_info *sw = hw->switch_info; +struct ice_fltr_mgmt_list_entry *list_itr; +struct list_head *list_head; + + list_head = &sw->recp_list[recp_id].filt_rules; +list_for_each_entry (list_itr, list_head, list_entry) { +if (!memcmp (&f_info->l_data, &list_itr->fltr_info.l_data, +sizeof (f_info->l_data)) && + f_info->fwd_id.hw_vsi_id == + list_itr->fltr_info.fwd_id.hw_vsi_id && + f_info->flag == list_itr->fltr_info.flag) +return list_itr; + } +return NULL ; +} +/** * ice_remove_mac - remove a MAC address based filter rule * @hw: pointer to the hardware structure
@@ -2153,15 +2185,39 @@ enum ice_status ice_remove_mac(struct ice_hw *hw, struct list_head *m_list) { struct ice_fltr_list_entry *list_itr, *tmp; +struct mutex *rule_lock;/* Lock to protect filter rule list */ if (!m_list)return ICE_ERR_PARAM ; + rule_lock = &hw->switch_info->recp_list[ICE_SW_LKUP_MAC ].filt_rule_lock;list_for_each_entry_safe (list_itr, tmp, m_list, list_entry) {enum ice_sw_lkup_type l_type = list_itr->fltr_info.lkup_type; +u8 *add = &list_itr->fltr_info.l_data.mac.mac_addr[0 ]; +u16 vsi_handle;if (l_type !=ICE_SW_LKUP_MAC )return ICE_ERR_PARAM ; + + vsi_handle = list_itr->fltr_info.vsi_handle; +if (!ice_is_vsi_valid (hw, vsi_handle)) +return ICE_ERR_PARAM ; + + list_itr->fltr_info.fwd_id.hw_vsi_id = +ice_get_hw_vsi_num (hw, vsi_handle); +if (is_unicast_ether_addr (add) && !hw->ucast_shared) { +/* Don't remove the unicast address that belongs to +* another VSI on the switch, since it is not being +* shared... +*/ +mutex_lock (rule_lock); +if (!ice_find_ucast_rule_entry (hw,ICE_SW_LKUP_MAC , + &list_itr->fltr_info)) { +mutex_unlock (rule_lock); +return ICE_ERR_DOES_NOT_EXIST ; + } +mutex_unlock (rule_lock); + } list_itr->status =ice_remove_rule_internal (hw,ICE_SW_LKUP_MAC , list_itr);
Signature · 1 line
2.20.1
Bowers
PATCH 3/12 ice: Don't allow VSI to remove unassociated ucast filter
Quoted 10 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, July 25, 2019 2:54 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S25 03/12] ice: Don't allow VSI to remove unassociated ucast filterFrom: Akeem G Abodunrin <[email protected]>
Quoted 7 lines
If a VSI is not using a unicast filter or did not configure that particular unicast filter, driver should not allow it to be removed by the rogue VSI.
Signed-off-by Akeem G Abodunrin <[email protected]>--- drivers/net/ethernet/intel/ice/ice_switch.c | 56 +++++++++++++++++++++ 1 file changed, 56 insertions(+)
Tony Nguyen
maintainerPATCH 4/12 ice: Fix ethtool port and PFC stats for 4x25G cards
In reply to Tony NguyenFrom: Usha Ketineni <[email protected]>
This patch fixes the issue where port and PFC statistics counters are incrementing at the wrong port with 4x25G cards.
Read the GLPRT port registers using lport parameter instead of pf_id to update the statistics otherwise the pf_ids are flipped for ports 2 and 3 when read from the HW register PF_FUNC_RID and this is expected as per hardware specification.
--- drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 13 ++-- drivers/net/ethernet/intel/ice/ice_main.c | 76 ++++++++++---------- 2 files changed, 45 insertions(+), 44 deletions(-)
drivers/net/ethernet/intel/ice/ice_dcb_lib.c +7 -6
@@ -505,30 +505,31 @@ void ice_update_dcb_stats(struct ice_pf *pf) {struct ice_hw_port_stats *prev_ps, *cur_ps;struct ice_hw *hw = &pf->hw; -u8 pf_id = hw->pf_id; +u8 port;int i; + port = hw->port_info->lport; prev_ps = &pf->stats_prev; cur_ps = &pf->stats;for (i =0 ; i <8 ; i++) { -ice_stat_update32 (hw,GLPRT_PXOFFRXC (pf_id, i), +ice_stat_update32 (hw,GLPRT_PXOFFRXC (port, i), pf->stat_prev_loaded, &prev_ps->priority_xoff_rx[i], &cur_ps->priority_xoff_rx[i]); -ice_stat_update32 (hw,GLPRT_PXONRXC (pf_id, i), +ice_stat_update32 (hw,GLPRT_PXONRXC (port, i), pf->stat_prev_loaded, &prev_ps->priority_xon_rx[i], &cur_ps->priority_xon_rx[i]); -ice_stat_update32 (hw,GLPRT_PXONTXC (pf_id, i), +ice_stat_update32 (hw,GLPRT_PXONTXC (port, i), pf->stat_prev_loaded, &prev_ps->priority_xon_tx[i], &cur_ps->priority_xon_tx[i]); -ice_stat_update32 (hw,GLPRT_PXOFFTXC (pf_id, i), +ice_stat_update32 (hw,GLPRT_PXOFFTXC (port, i), pf->stat_prev_loaded, &prev_ps->priority_xoff_tx[i], &cur_ps->priority_xoff_tx[i]); -ice_stat_update32 (hw,GLPRT_RXON2OFFCNT (pf_id, i), +ice_stat_update32 (hw,GLPRT_RXON2OFFCNT (port, i), pf->stat_prev_loaded, &prev_ps->priority_xon_2_xoff[i], &cur_ps->priority_xon_2_xoff[i]);
drivers/net/ethernet/intel/ice/ice_main.c +38 -38
172 lines not on this page · raw message
Signature · 1 line
2.20.1
Bowers
PATCH 4/12 ice: Fix ethtool port and PFC stats for 4x25G cards
Quoted 17 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, July 25, 2019 2:54 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S25 04/12] ice: Fix ethtool port and PFC stats for 4x25G cardsFrom: Usha Ketineni <[email protected]>
This patch fixes the issue where port and PFC statistics counters are incrementing at the wrong port with 4x25G cards.
Read the GLPRT port registers using lport parameter instead ofpf_idto update the statistics otherwise thepf_idsare flipped for ports 2 and 3 when read from the HW registerPF_FUNC_RIDand this is expected as per hardware specification.
Quoted 5 lines
Signed-off-by Usha Ketineni <[email protected]>--- drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 13 ++-- drivers/net/ethernet/intel/ice/ice_main.c | 76 ++++++++++---------- 2 files changed, 45 insertions(+), 44 deletions(-)
Tony Nguyen
maintainerPATCH 5/12 ice: added sibling head to parse nodes
In reply to Tony NguyenFrom: Victor Raj <[email protected]>
There was a bug in the previous code which never traverses all the children to get the first node of the requested layer. Add a sibling head pointer to point the first node of each layer per TC. This helps traverse easier and quicker and also removes the recursion.
--- drivers/net/ethernet/intel/ice/ice_sched.c | 57 ++++++++-------------- drivers/net/ethernet/intel/ice/ice_type.h | 2 + 2 files changed, 23 insertions(+), 36 deletions(-)
drivers/net/ethernet/intel/ice/ice_sched.c +21 -36
@@ -260,33 +260,17 @@ ice_sched_remove_elems(struct ice_hw *hw, struct ice_sched_node *parent,/** * ice_sched_get_first_node - get the first node of the given layer -* @hw: pointer to the HW struct +* @pi: port information structure * @parent: pointer the base node of the subtree * @layer: layer number * * This function retrieves the first node of the given layer from the subtree */ static struct ice_sched_node * -ice_sched_get_first_node (struct ice_hw *hw,struct ice_sched_node *parent, -u8 layer) +ice_sched_get_first_node (struct ice_port_info *pi, +struct ice_sched_node *parent,u8 layer) { -u8 i; - -if (layer < hw->sw_entry_point_layer) -return NULL ; -for (i =0 ; i < parent->num_children; i++) { -struct ice_sched_node *node = parent->children[i]; - -if (node) { -if (node->tx_sched_layer == layer) -return node; -/* this recursion is intentional, and wouldn't -* go more than 9 calls -*/ -return ice_sched_get_first_node (hw, node, layer); - } - } -return NULL ; +return pi->sib_head[parent->tc_num][layer]; }/**
@@ -342,7 +326,7 @@ void ice_free_sched_node(struct ice_port_info *pi, struct ice_sched_node *node) parent = node->parent;/* root has no parent */ if (parent) { -struct ice_sched_node *p, *tc_node; +struct ice_sched_node *p;/* update the parent */ for (i =0 ; i < parent->num_children; i++)
@@ -354,16 +338,7 @@ void ice_free_sched_node(struct ice_port_info *pi, struct ice_sched_node *node)break ; } -/* search for previous sibling that points to this node and -* remove the reference -*/ - tc_node =ice_sched_get_tc_node (pi, node->tc_num); -if (!tc_node) { -ice_debug (hw,ICE_DBG_SCHED , -"Invalid TC number %d\n" , node->tc_num); - goto err_exit; - } - p =ice_sched_get_first_node (hw, tc_node, node->tx_sched_layer); + p =ice_sched_get_first_node (pi, node, node->tx_sched_layer);while (p) {if (p->sibling == node) { p->sibling = node->sibling;
@@ -371,8 +346,13 @@ void ice_free_sched_node(struct ice_port_info *pi, struct ice_sched_node *node) } p = p->sibling; } + +/* update the sibling head if head is getting removed */ +if (pi->sib_head[node->tc_num][node->tx_sched_layer] == node) + pi->sib_head[node->tc_num][node->tx_sched_layer] = + node->sibling; } -err_exit: +/* leaf nodes have no children */ if (node->children)devm_kfree (ice_hw_to_dev (hw), node->children);
@@ -743,13 +723,17 @@ ice_sched_add_elems(struct ice_port_info *pi, struct ice_sched_node *tc_node,/* add it to previous node sibling pointer */ /* Note: siblings are not linked across branches */ - prev =ice_sched_get_first_node (hw, tc_node, layer); + prev =ice_sched_get_first_node (pi, tc_node, layer);if (prev && prev != new_node) {while (prev->sibling) prev = prev->sibling; prev->sibling = new_node; } +/* initialize the sibling head */ +if (!pi->sib_head[tc_node->tc_num][layer]) + pi->sib_head[tc_node->tc_num][layer] = new_node; +if (i ==0 ) *first_node_teid = teid; }
@@ -1160,7 +1144,7 @@ ice_sched_get_free_qparent(struct ice_port_info *pi, u16 vsi_handle, u8 tc, goto lan_q_exit;/* get the first queue group node from VSI sub-tree */ - qgrp_node =ice_sched_get_first_node (pi->hw, vsi_node, qgrp_layer); + qgrp_node =ice_sched_get_first_node (pi, vsi_node, qgrp_layer);while (qgrp_node) {/* make sure the qgroup node is part of the VSI subtree */ if (ice_sched_find_node_in_subtree (pi->hw, vsi_node, qgrp_node))
@@ -1191,7 +1175,7 @@ ice_sched_get_vsi_node(struct ice_hw *hw, struct ice_sched_node *tc_node,u8 vsi_layer; vsi_layer =ice_sched_get_vsi_layer (hw); - node =ice_sched_get_first_node (hw, tc_node, vsi_layer); + node =ice_sched_get_first_node (hw->port_info, tc_node, vsi_layer);/* Check whether it already exists */ while (node) {
@@ -1316,7 +1300,8 @@ ice_sched_calc_vsi_support_nodes(struct ice_hw *hw,/* If intermediate nodes are reached max children * then add a new one. */ - node =ice_sched_get_first_node (hw, tc_node, (u8 )i); + node =ice_sched_get_first_node (hw->port_info, tc_node, + (u8 )i);/* scan all the siblings */ while (node) {if (node->num_children < hw->max_children[i])
drivers/net/ethernet/intel/ice/ice_type.h +2 -0
@@ -347,6 +347,8 @@ struct ice_port_info {struct ice_mac_info mac;struct ice_phy_info phy;struct mutex sched_lock;/* protect access to TXSched tree */ +struct ice_sched_node * + sib_head[ICE_MAX_TRAFFIC_CLASS ][ICE_AQC_TOPO_MAX_LEVEL_NUM ];struct ice_dcbx_cfg local_dcbx_cfg;/* Oper/Local Cfg */ /* DCBX info */ struct ice_dcbx_cfg remote_dcbx_cfg;/* Peer Cfg */
Signature · 1 line
2.20.1
Bowers
PATCH 5/12 ice: added sibling head to parse nodes
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, July 25, 2019 2:54 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S25 05/12] ice: added sibling head to parse nodesFrom: Victor Raj <[email protected]>
There was a bug in the previous code which never traverses all the children to get the first node of the requested layer. Add a sibling head pointer to point the first node of each layer per TC. This helps traverse easier and quicker and also removes the recursion.
Quoted 6 lines
Signed-off-by Victor Raj <[email protected]>Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/ice/ice_sched.c | 57 ++++++++-------------- drivers/net/ethernet/intel/ice/ice_type.h | 2 + 2 files changed, 23 insertions(+), 36 deletions(-)
Tony Nguyen
maintainerPATCH 6/12 ice: Sanitize ice_ena_vsi and ice_dis_vsi
In reply to Tony NguyenFrom: Anirudh Venkataramanan <[email protected]>
1. ndo_open and ndo_stop are implemented by ice_open and ice_stop respectively. When enabling/disabling VSIs, just call ice_open/ice_stop instead of ndo_open/ndo_stop.
2. Rework logic around rtnl_lock/rtnl_unlock
3. In ice_ena_vsi, remove an unnecessary stack variable and return 0 instead of err when __ICE_NEEDS_RESTART is not set.
--- drivers/net/ethernet/intel/ice/ice_main.c | 24 +++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +11 -13
@@ -436,13 +436,13 @@ static void ice_dis_vsi(struct ice_vsi *vsi, bool locked)if (vsi->type ==ICE_VSI_PF && vsi->netdev) {if (netif_running (vsi->netdev)) { -if (!locked) { +if (!locked)rtnl_lock (); - vsi->netdev->netdev_ops->ndo_stop (vsi->netdev); + +ice_stop (vsi->netdev); + +if (!locked)rtnl_unlock (); - }else { - vsi->netdev->netdev_ops->ndo_stop (vsi->netdev); - } }else {ice_vsi_close (vsi); }
@@ -3690,21 +3690,19 @@ static int ice_ena_vsi(struct ice_vsi *vsi, bool locked)int err =0 ;if (!test_bit (__ICE_NEEDS_RESTART, vsi->state)) -return err; +return 0 ;clear_bit (__ICE_NEEDS_RESTART, vsi->state);if (vsi->netdev && vsi->type ==ICE_VSI_PF ) { -struct net_device *netd = vsi->netdev; -if (netif_running (vsi->netdev)) { -if (locked) { - err = netd->netdev_ops->ndo_open (netd); - }else { +if (!locked)rtnl_lock (); - err = netd->netdev_ops->ndo_open (netd); + + err =ice_open (vsi->netdev); + +if (!locked)rtnl_unlock (); - } } }
Signature · 1 line
2.20.1
Bowers
PATCH 6/12 ice: Sanitize ice_ena_vsi and ice_dis_vsi
Quoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, July 25, 2019 2:54 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S25 06/12] ice: Sanitizeice_ena_vsiandice_dis_vsiFrom: Anirudh Venkataramanan <[email protected]>
1.
ndo_openandndo_stopare implemented byice_openandice_stoprespectively. When enabling/disabling VSIs, just call ice_open/ice_stop instead of ndo_open/ndo_stop.2. Rework logic around rtnl_lock/rtnl_unlock
Quoted 8 lines
3. In
ice_ena_vsi, remove an unnecessary stack variable and return 0 instead of err when__ICE_NEEDS_RESTARTis not set.Signed-off-by: Anirudh Venkataramanan
<[email protected]>--- drivers/net/ethernet/intel/ice/ice_main.c | 24 +++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-)
Tony Nguyen
maintainerPATCH 7/12 ice: shorten local and add debug prints
In reply to Tony NguyenFrom: Jesse Brandeburg <[email protected]>
Add some verbose debugging for dyndbg to help us when we are having issues with link and/or PHY.
While there, shorten some strings used by locals that were causing long line wrapping.
--- drivers/net/ethernet/intel/ice/ice_common.c | 63 ++++++++++++++------- 1 file changed, 44 insertions(+), 19 deletions(-)
drivers/net/ethernet/intel/ice/ice_common.c +44 -19
@@ -263,21 +263,23 @@ enum ice_status ice_aq_get_link_info(struct ice_port_info *pi, bool ena_lse, struct ice_link_status *link, struct ice_sq_cd *cd) { - struct ice_link_status *hw_link_info_old, *hw_link_info; struct ice_aqc_get_link_status_data link_data = { 0 };struct ice_aqc_get_link_status *resp; +struct ice_link_status *li_old, *li;enum ice_media_type *hw_media_type;struct ice_fc_info *hw_fc_info;bool tx_pause, rx_pause;struct ice_aq_desc desc;enum ice_status status; +struct ice_hw *hw;u16 cmd_flags;if (!pi)return ICE_ERR_PARAM ; - hw_link_info_old = &pi->phy.link_info_old; + hw = pi->hw; + li_old = &pi->phy.link_info_old; hw_media_type = &pi->phy.media_type; - hw_link_info = &pi->phy.link_info; + li = &pi->phy.link_info; hw_fc_info = &pi->fc;ice_fill_dflt_direct_cmd_desc (&desc, ice_aqc_opc_get_link_status);
@@ -286,27 +288,27 @@ ice_aq_get_link_info(struct ice_port_info *pi, bool ena_lse, resp->cmd_flags =cpu_to_le16 (cmd_flags); resp->lport_num = pi->lport; - status =ice_aq_send_cmd (pi->hw, &desc, &link_data,sizeof (link_data), - cd); + status =ice_aq_send_cmd (hw, &desc, &link_data,sizeof (link_data), cd);if (status)return status;/* save off old link status information */ - *hw_link_info_old = *hw_link_info; + *li_old = *li;/* update current link status information */ - hw_link_info->link_speed =le16_to_cpu (link_data.link_speed); - hw_link_info->phy_type_low =le64_to_cpu (link_data.phy_type_low); - hw_link_info->phy_type_high =le64_to_cpu (link_data.phy_type_high); + li->link_speed =le16_to_cpu (link_data.link_speed); + li->phy_type_low =le64_to_cpu (link_data.phy_type_low); + li->phy_type_high =le64_to_cpu (link_data.phy_type_high); *hw_media_type =ice_get_media_type (pi); - hw_link_info->link_info = link_data.link_info; - hw_link_info->an_info = link_data.an_info; - hw_link_info->ext_info = link_data.ext_info; - hw_link_info->max_frame_size =le16_to_cpu (link_data.max_frame_size); - hw_link_info->fec_info = link_data.cfg &ICE_AQ_FEC_MASK ; - hw_link_info->topo_media_conflict = link_data.topo_media_conflict; - hw_link_info->pacing = link_data.cfg &ICE_AQ_CFG_PACING_M ; + li->link_info = link_data.link_info; + li->an_info = link_data.an_info; + li->ext_info = link_data.ext_info; + li->max_frame_size =le16_to_cpu (link_data.max_frame_size); + li->fec_info = link_data.cfg &ICE_AQ_FEC_MASK ; + li->topo_media_conflict = link_data.topo_media_conflict; + li->pacing = link_data.cfg & (ICE_AQ_CFG_PACING_M | +ICE_AQ_CFG_PACING_TYPE_M );/* update fc info */ tx_pause = !!(link_data.an_info &ICE_AQ_LINK_PAUSE_TX );
@@ -320,12 +322,24 @@ ice_aq_get_link_info(struct ice_port_info *pi, bool ena_lse,else hw_fc_info->current_mode =ICE_FC_NONE ; - hw_link_info->lse_ena = - !!(resp->cmd_flags &cpu_to_le16 (ICE_AQ_LSE_IS_ENABLED )); + li->lse_ena = !!(resp->cmd_flags &cpu_to_le16 (ICE_AQ_LSE_IS_ENABLED )); + +ice_debug (hw,ICE_DBG_LINK ,"link_speed = 0x%x\n" , li->link_speed); +ice_debug (hw,ICE_DBG_LINK ,"phy_type_low = 0x%llx\n" , + (unsigned long long )li->phy_type_low); +ice_debug (hw,ICE_DBG_LINK ,"phy_type_high = 0x%llx\n" , + (unsigned long long )li->phy_type_high); +ice_debug (hw,ICE_DBG_LINK ,"media_type = 0x%x\n" , *hw_media_type); +ice_debug (hw,ICE_DBG_LINK ,"link_info = 0x%x\n" , li->link_info); +ice_debug (hw,ICE_DBG_LINK ,"an_info = 0x%x\n" , li->an_info); +ice_debug (hw,ICE_DBG_LINK ,"ext_info = 0x%x\n" , li->ext_info); +ice_debug (hw,ICE_DBG_LINK ,"lse_ena = 0x%x\n" , li->lse_ena); +ice_debug (hw,ICE_DBG_LINK ,"max_frame = 0x%x\n" , li->max_frame_size); +ice_debug (hw,ICE_DBG_LINK ,"pacing = 0x%x\n" , li->pacing);/* save link status information */ if (link) - *link = *hw_link_info; + *link = *li;/* flag cleared so calling functions don't call AQ again */ pi->phy.get_link_info = false;
@@ -2000,6 +2014,17 @@ ice_aq_set_phy_cfg(struct ice_hw *hw, u8 lport, desc.params.set_phy.lport_num = lport; desc.flags |=cpu_to_le16 (ICE_AQ_FLAG_RD ); +ice_debug (hw,ICE_DBG_LINK ,"phy_type_low = 0x%llx\n" , + (unsigned long long )le64_to_cpu (cfg->phy_type_low)); +ice_debug (hw,ICE_DBG_LINK ,"phy_type_high = 0x%llx\n" , + (unsigned long long )le64_to_cpu (cfg->phy_type_high)); +ice_debug (hw,ICE_DBG_LINK ,"caps = 0x%x\n" , cfg->caps); +ice_debug (hw,ICE_DBG_LINK ,"low_power_ctrl = 0x%x\n" , + cfg->low_power_ctrl); +ice_debug (hw,ICE_DBG_LINK ,"eee_cap = 0x%x\n" , cfg->eee_cap); +ice_debug (hw,ICE_DBG_LINK ,"eeer_value = 0x%x\n" , cfg->eeer_value); +ice_debug (hw,ICE_DBG_LINK ,"link_fec_opt = 0x%x\n" , cfg->link_fec_opt); +return ice_aq_send_cmd (hw, &desc, cfg,sizeof (*cfg), cd); }
Signature · 1 line
2.20.1
Bowers
PATCH 7/12 ice: shorten local and add debug prints
Quoted 13 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, July 25, 2019 2:54 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S25 07/12] ice: shorten local and add debug printsFrom: Jesse Brandeburg <[email protected]>
Add some verbose debugging for dyndbg to help us when we are having issues with link and/or PHY.
Quoted 8 lines
While there, shorten some strings used by locals that were causing long line wrapping.
Signed-off-by Jesse Brandeburg <[email protected]>Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/ice/ice_common.c | 63 ++++++++++++++------- 1 file changed, 44 insertions(+), 19 deletions(-)
Tony Nguyen
maintainerPATCH 8/12 ice: Introduce a local variable for a VSI in the rebuild path
In reply to Tony NguyenFrom: Krzysztof Kazimierczak <[email protected]>
When a VSI is accessed inside the ice_for_each_vsi macro in the rebuild path (ice_vsi_rebuild_all() and ice_vsi_replay_all()), it is referred to as pf->vsi[i]. Introduce local variables to improve readability.
--- drivers/net/ethernet/intel/ice/ice_main.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +12 -9
@@ -3740,22 +3740,23 @@ static int ice_vsi_rebuild_all(struct ice_pf *pf)/* loop through pf->vsi array and reinit the VSI if found */ ice_for_each_vsi (pf, i) { +struct ice_vsi *vsi = pf->vsi[i];int err; -if (!pf->vsi[i]) +if (!vsi)continue ; - err =ice_vsi_rebuild (pf->vsi[i], true); + err =ice_vsi_rebuild (vsi, true);if (err) {dev_err (&pf->pdev->dev,"VSI at index %d rebuild failed\n" , - pf->vsi[i]->idx); + vsi->idx);return err; }dev_info (&pf->pdev->dev,"VSI at index %d rebuilt. vsi_num = 0x%x\n" , - pf->vsi[i]->idx, pf->vsi[i]->vsi_num); + vsi->idx, vsi->vsi_num); }return 0 ;
@@ -3773,25 +3774,27 @@ static int ice_vsi_replay_all(struct ice_pf *pf)/* loop through pf->vsi array and replay the VSI if found */ ice_for_each_vsi (pf, i) { -if (!pf->vsi[i]) +struct ice_vsi *vsi = pf->vsi[i]; + +if (!vsi)continue ; - ret =ice_replay_vsi (hw, pf->vsi[i]->idx); + ret =ice_replay_vsi (hw, vsi->idx);if (ret) {dev_err (&pf->pdev->dev,"VSI at index %d replay failed %d\n" , - pf->vsi[i]->idx, ret); + vsi->idx, ret);return -EIO ; }/* Re-map HW VSI number, using VSI handle that has been * previously validated in ice_replay_vsi() call above */ - pf->vsi[i]->vsi_num =ice_get_hw_vsi_num (hw, pf->vsi[i]->idx); + vsi->vsi_num =ice_get_hw_vsi_num (hw, vsi->idx);dev_info (&pf->pdev->dev,"VSI at index %d filter replayed successfully - vsi_num %i\n" , - pf->vsi[i]->idx, pf->vsi[i]->vsi_num); + vsi->idx, vsi->vsi_num); }/* Clean up replay filter after successful re-configuration */
Signature · 1 line
2.20.1
Bowers
PATCH 8/12 ice: Introduce a local variable for a VSI in the rebuild path
Quoted 10 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, July 25, 2019 2:54 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S25 08/12] ice: Introduce a local variable for a VSI in the rebuild pathFrom: Krzysztof Kazimierczak <[email protected]>
Quoted 8 lines
When a VSI is accessed inside the
ice_for_each_vsimacro in the rebuild path (ice_vsi_rebuild_all()andice_vsi_replay_all()), it is referred to as pf->vsi[i]. Introduce local variables to improve readability.Signed-off-by Krzysztof Kazimierczak <[email protected]>--- drivers/net/ethernet/intel/ice/ice_main.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
Tony Nguyen
maintainerPATCH 9/12 ice: Don't clog kernel debug log with VF MDD events errors
In reply to Tony NguyenFrom: Akeem G Abodunrin <[email protected]>
In case of MDD events on VF, don't clog kernel log with unlimited VF mdd events message "VF 0 has had 1018 MDD events since last boot" - limit events log message to 30, based on the observation in some experimenation with sending malicious packet once, and number of events reported before device stopped observing MDD events.
Also removed defunct macro "ICE_DFLT_NUM_MDD_EVENTS_ALLOWED" for tracking number of MDD events allowed before disabling the interface...
--- drivers/net/ethernet/intel/ice/ice_main.c | 6 ++++-- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +4 -2
@@ -1315,8 +1315,10 @@ static void ice_handle_mdd_event(struct ice_pf *pf)if (vf_mdd_detected) { vf->num_mdd_events++; -if (vf->num_mdd_events >1 ) -dev_info (&pf->pdev->dev,"VF %d has had %llu MDD events since last boot\n" , +if (vf->num_mdd_events && + vf->num_mdd_events <=ICE_MDD_EVENTS_THRESHOLD ) +dev_info (&pf->pdev->dev, +"VF %d has had %llu MDD events since last boot, Admin might need to reload AVF driver with this number of events\n" , i, vf->num_mdd_events); } }
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h +1 -1
@@ -15,8 +15,8 @@#define ICE_MAX_MACADDR_PER_VF 12/* Malicious Driver Detection */ -#define ICE_DFLT_NUM_MDD_EVENTS_ALLOWED 3#define ICE_DFLT_NUM_INVAL_MSGS_ALLOWED 10 +#define ICE_MDD_EVENTS_THRESHOLD 30/* Static VF transaction/status register def */ #define VF_DEVICE_STATUS 0xAA
Signature · 1 line
2.20.1
Bowers
PATCH 9/12 ice: Don't clog kernel debug log with VF MDD events errors
Quoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, July 25, 2019 2:54 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S25 09/12] ice: Don't clog kernel debug log with VF MDD events errorsFrom: Akeem G Abodunrin <[email protected]>
In case of MDD events on VF, don't clog kernel log with unlimited VF mdd events message "VF 0 has had 1018 MDD events since last boot" - limit events log message to 30, based on the observation in some experimenation with sending malicious packet once, and number of events reported before device stopped observing MDD events.
Quoted 8 lines
Also removed defunct macro "
ICE_DFLT_NUM_MDD_EVENTS_ALLOWED" for tracking number of MDD events allowed before disabling the interface...Signed-off-by Akeem G Abodunrin <[email protected]>--- drivers/net/ethernet/intel/ice/ice_main.c | 6 ++++-- drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-)
Tony Nguyen
maintainerPATCH 10/12 ice: add validation in OP_CONFIG_VSI_QUEUES VF message
In reply to Tony NguyenFrom: Michal Swiatkowski <[email protected]>
Check num_queue_pairs to avoid access to unallocated field of vsi->tx_rings/vsi->rx_rings. Without this validation we can set vsi->alloc_txq/vsi->alloc_rxq to value smaller than ICE_MAX_BASE_QS_PER_VF and send this command with num_queue_pairs greater than vsi->alloc_txq/vsi->alloc_rxq. This lead to access to unallocated memory.
In VF vsi alloc_txq and alloc_rxq should be the same. Get minimum because looks more readable.
Also add validation for ring_len param. It should be greater than 32 and be multiple of 32. Incorrect value leads to hang traffic on PF.
--- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c +24 -7
@@ -1713,6 +1713,19 @@ static bool ice_vc_isvalid_q_id(struct ice_vf *vf, u16 vsi_id, u8 qid)return (vsi && (qid < vsi->alloc_txq)); } +/** +* ice_vc_isvalid_ring_len +* @ring_len: length of ring +* +* check for the valid ring count, should be multiple of ICE_REQ_DESC_MULTIPLE +*/ +static bool ice_vc_isvalid_ring_len (u16 ring_len) +{ +return (ring_len >=ICE_MIN_NUM_DESC && + ring_len <=ICE_MAX_NUM_DESC && + !(ring_len %ICE_REQ_DESC_MULTIPLE )); +} +/** * ice_vc_config_rss_key * @vf: pointer to the VF info
@@ -2108,16 +2121,17 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg) goto error_param; } -if (qci->num_queue_pairs >ICE_MAX_BASE_QS_PER_VF ) { -dev_err (&pf->pdev->dev, -"VF-%d requesting more than supported number of queues: %d\n" , - vf->vf_id, qci->num_queue_pairs); + vsi = pf->vsi[vf->lan_vsi_idx]; +if (!vsi) { v_ret =VIRTCHNL_STATUS_ERR_PARAM ; goto error_param; } - vsi = pf->vsi[vf->lan_vsi_idx]; -if (!vsi) { +if (qci->num_queue_pairs >ICE_MAX_BASE_QS_PER_VF || + qci->num_queue_pairs >min_t (u16, vsi->alloc_txq, vsi->alloc_rxq)) { +dev_err (&pf->pdev->dev, +"VF-%d requesting more than supported number of queues: %d\n" , + vf->vf_id,min_t (u16, vsi->alloc_txq, vsi->alloc_rxq)); v_ret =VIRTCHNL_STATUS_ERR_PARAM ; goto error_param; }
@@ -2128,6 +2142,8 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg) qpi->rxq.vsi_id != qci->vsi_id || qpi->rxq.queue_id != qpi->txq.queue_id || qpi->txq.headwb_enabled || + !ice_vc_isvalid_ring_len(qpi->txq.ring_len) || + !ice_vc_isvalid_ring_len(qpi->rxq.ring_len) || !ice_vc_isvalid_q_id(vf, qci->vsi_id, qpi->txq.queue_id)) { v_ret =VIRTCHNL_STATUS_ERR_PARAM ; goto error_param;
@@ -2138,7 +2154,8 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg)/* copy Rx queue info from VF into VSI */ vsi->rx_rings[i]->dma = qpi->rxq.dma_ring_addr; vsi->rx_rings[i]->count = qpi->rxq.ring_len; -if (qpi->rxq.databuffer_size > ((16 *1024 ) -128 )) { +if (qpi->rxq.databuffer_size > ((16 *1024 ) -128 ) || + qpi->rxq.databuffer_size <1024 ) { v_ret =VIRTCHNL_STATUS_ERR_PARAM ; goto error_param; }
Signature · 1 line
2.20.1
Bowers
PATCH 10/12 ice: add validation in OP_CONFIG_VSI_QUEUES VF message
Quoted 20 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, July 25, 2019 2:54 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S25 10/12] ice: add validation inOP_CONFIG_VSI_QUEUESVF messageFrom: Michal Swiatkowski <[email protected]>
Check
num_queue_pairsto avoid access to unallocated field of vsi->tx_rings/vsi->rx_rings. Without this validation we can set vsi->alloc_txq/vsi->alloc_rxq to value smaller thanvsi->ICE_MAX_BASE_QS_PER_VF
and send this command withnum_queue_pairsgreater than vsi->alloc_txq/vsi->alloc_rxq. This lead to access to unallocated memory.In VF vsi
alloc_txqandalloc_rxqshould be the same. Get minimum because looks more readable.
Quoted 7 lines
Also add validation for
ring_lenparam. It should be greater than 32 and be multiple of 32. Incorrect value leads to hang traffic on PF.Signed-off-by Michal Swiatkowski <[email protected]>--- .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-)
Tony Nguyen
maintainerPATCH 11/12 ice: Remove ice_dev_onetime_setup()
In reply to Tony NguyenFrom: Brett Creeley <[email protected]>
ice_dev_onetime_setup contains driver workarounds needed for firmware limitations. These issues have now been resolved in newer NVMs so remove the function.
--- drivers/net/ethernet/intel/ice/ice_common.c | 16 ---------------- drivers/net/ethernet/intel/ice/ice_common.h | 2 -- drivers/net/ethernet/intel/ice/ice_lib.c | 1 - 3 files changed, 19 deletions(-)
drivers/net/ethernet/intel/ice/ice_common.c +0 -16
@@ -42,20 +42,6 @@ static enum ice_status ice_set_mac_type(struct ice_hw *hw)return 0 ; } -/** -* ice_dev_onetime_setup - Temporary HW/FW workarounds -* @hw: pointer to the HW structure -* -* This function provides temporary workarounds for certain issues -* that are expected to be fixed in the HW/FW. -*/ -void ice_dev_onetime_setup (struct ice_hw *hw) -{ -#define MBX_PF_VT_PFALLOC 0x00231E80 -/* set VFs per PF */ -wr32 (hw,MBX_PF_VT_PFALLOC ,rd32 (hw,PF_VT_PFALLOC_HIF )); -} -/** * ice_clear_pf_cfg - Clear PF configuration * @hw: pointer to the hardware structure
@@ -837,8 +823,6 @@ enum ice_status ice_init_hw(struct ice_hw *hw)if (status) goto err_unroll_sched; -ice_dev_onetime_setup (hw); -/* Get MAC information */ /* A single port can report up to two (LAN and WoL) addresses */ mac_buf = devm_kcalloc(ice_hw_to_dev(hw), 2,
drivers/net/ethernet/intel/ice/ice_common.h +0 -2
@@ -41,8 +41,6 @@ ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq,void ice_clear_pxe_mode (struct ice_hw *hw);enum ice_status ice_get_caps (struct ice_hw *hw); -void ice_dev_onetime_setup (struct ice_hw *hw); -enum ice_status ice_write_rxq_ctx (struct ice_hw *hw,struct ice_rlan_ctx *rlan_ctx,u32 rxq_index);
drivers/net/ethernet/intel/ice/ice_lib.c +0 -1
@@ -2978,7 +2978,6 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, bool init_vsi)ice_vsi_clear_rings (vsi);ice_vsi_free_arrays (vsi); -ice_dev_onetime_setup (&pf->hw);if (vsi->req_txq || vsi->req_rxq)ice_vsi_put_qs (vsi);if (vsi->type ==ICE_VSI_VF )
Signature · 1 line
2.20.1
Bowers
PATCH 11/12 ice: Remove ice_dev_onetime_setup()
Quoted 14 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, July 25, 2019 2:54 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S25 11/12] ice: Removeice_dev_onetime_setup()From: Brett Creeley <[email protected]>
ice_dev_onetime_setupcontains driver workarounds needed for firmware limitations. These issues have now been resolved in newer NVMs so remove the function.
Quoted 7 lines
Signed-off-by Brett Creeley <[email protected]>Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/ice/ice_common.c | 16 ---------------- drivers/net/ethernet/intel/ice/ice_common.h | 2 -- drivers/net/ethernet/intel/ice/ice_lib.c | 1 - 3 files changed, 19 deletions(-)
Tony Nguyen
maintainerPATCH 12/12 ice: fix ice_is_tc_ena
In reply to Tony NguyenFrom: Jacob Keller <[email protected]>
ice_is_tc_ena is used to check whether a given traffic class is enabled. Because there are only 8 traffic classes, the function took a u8 bitmap. This causes problems because it is cast to an unsigned long causing a static analysis warning regarding Out-of-bounds read.
Fix this by simply updating ice_is_tc_ena to take an unsigned long. Passing a u8 to this function should implicitly convert the value.
--- drivers/net/ethernet/intel/ice/ice_type.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_type.h +2 -2
@@ -13,9 +13,9 @@#define ICE_BYTES_PER_WORD 2#define ICE_BYTES_PER_DWORD 4 -static inline bool ice_is_tc_ena (u8 bitmap,u8 tc) +static inline bool ice_is_tc_ena (unsigned long bitmap,u8 tc) { -return test_bit (tc, (unsigned long *)&bitmap); +return test_bit (tc, &bitmap); }/* Driver always calls main vsi_handle first */
Signature · 1 line
2.20.1
Bowers
PATCH 12/12 ice: fix ice_is_tc_ena
Quoted 14 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, July 25, 2019 2:54 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S25 12/12] ice: fixice_is_tc_enaFrom: Jacob Keller <[email protected]>
ice_is_tc_enais used to check whether a given traffic class is enabled. Because there are only 8 traffic classes, the function took a u8 bitmap. This causes problems because it is cast to an unsigned long causing a static analysis warning regarding Out-of-bounds read.
Quoted 8 lines
Fix this by simply updating
ice_is_tc_enato take an unsigned long. Passing a u8 to this function should implicitly convert the value.Signed-off-by Jacob Keller <[email protected]>Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/ice/ice_type.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Allan
PATCH 1/12 ice: update ethtool stats on-demand
In reply to Tony NguyenACK
Quoted 105 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, July 25, 2019 2:54 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S25 01/12] ice: update ethtool stats on- demandFrom: Bruce Allan <[email protected]>
Users expect ethtool statistics to be updated on-demand when invoking 'ethtool -S <iface>' instead of providing a snapshot of statistics taken once a second (the frequency of the watchdog task where stats are currently updated). Update stats every time 'ethtool -S <iface>' is run.
Also, fix an indentation style issue and an unnecessary local variable initialization in
ice_get_ethtool_stats()discovered while investigating the subject issue.Signed-off-by Bruce Allan <[email protected]>--- drivers/net/ethernet/intel/ice/ice.h | 2 ++ drivers/net/ethernet/intel/ice/ice_ethtool.c | 7 +++++-- drivers/net/ethernet/intel/ice/ice_main.c | 6 ++---- 3 files changed, 9 insertions(+), 6 deletions(-)drivers/net/ethernet/intel/ice/ice.h +2
-0@@ -450,6 +450,8 @@ int ice_vsi_setup_tx_rings(struct ice_vsi *vsi);int ice_vsi_setup_rx_rings (struct ice_vsi *vsi);void ice_set_ethtool_ops (struct net_device *netdev);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);int ice_down (struct ice_vsi *vsi);int ice_vsi_cfg (struct ice_vsi *vsi);drivers/net/ethernet/intel/ice/ice_ethtool.c +5
-2@@ -1319,14 +1319,17 @@ ice_get_ethtool_stats(struct net_device *netdev,struct ice_vsi *vsi = np->vsi;struct ice_pf *pf = vsi->back;struct ice_ring *ring; -unsigned int j =0 ; +unsigned int j;int i =0 ;char *p; +ice_update_pf_stats (pf); +ice_update_vsi_stats (vsi); +for (j =0 ; j <ICE_VSI_STATS_LEN ; j++) { p = (char *)vsi + ice_gstrings_vsi_stats[j].stat_offset; data[i++] = (ice_gstrings_vsi_stats[j].sizeof_stat == -sizeof (u64)) ? *(u64 *)p : *(u32 *)p; +sizeof (u64)) ? *(u64 *)p : *(u32 *)p; }/* populate per queue stats */ drivers/net/ethernet/intel/ice/ice_main.c +1
-3@@ -34,8 +34,6 @@ static const struct net_device_ops ice_netdev_ops;static void ice_rebuild (struct ice_pf *pf);static void ice_vsi_release_all (struct ice_pf *pf); -static void ice_update_vsi_stats (struct ice_vsi *vsi); -static void ice_update_pf_stats (struct ice_pf *pf);/** * ice_get_tx_pending - returns number of Tx descriptors not processed @@ -3290,7 +3288,7 @@ static void ice_update_vsi_ring_stats(struct ice_vsi*vsi) * ice_update_vsi_stats - Update VSI stats counters * @vsi: the VSI to be updated */ -static void ice_update_vsi_stats (struct ice_vsi *vsi) +void ice_update_vsi_stats (struct ice_vsi *vsi) {struct rtnl_link_stats64 *cur_ns = &vsi->net_stats;drivers/net/ethernet/intel/ice/ice_main.c +1
-2struct ice_eth_stats *cur_es = &vsi->eth_stats;@@ -3326,7 +3324,7 @@ static void ice_update_vsi_stats(struct ice_vsi *vsi)* ice_update_pf_stats - Update PF port stats counters * @pf: PF whose stats needs to be updated */ -static void ice_update_pf_stats (struct ice_pf *pf) +void ice_update_pf_stats (struct ice_pf *pf) {struct ice_hw_port_stats *prev_ps, *cur_ps;struct ice_hw *hw = &pf->hw; --2.20.1
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Bowers
PATCH 1/12 ice: update ethtool stats on-demand
In reply to Tony NguyenQuoted 19 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, July 25, 2019 2:54 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH S25 01/12] ice: update ethtool stats on- demandFrom: Bruce Allan <[email protected]>
Users expect ethtool statistics to be updated on-demand when invoking 'ethtool -S <iface>' instead of providing a snapshot of statistics taken once a second (the frequency of the watchdog task where stats are currently updated). Update stats every time 'ethtool -S <iface>' is run.
Also, fix an indentation style issue and an unnecessary local variable initialization in
ice_get_ethtool_stats()discovered while investigating the subject issue.
Quoted 6 lines
Signed-off-by Bruce Allan <[email protected]>--- drivers/net/ethernet/intel/ice/ice.h | 2 ++ drivers/net/ethernet/intel/ice/ice_ethtool.c | 7 +++++-- drivers/net/ethernet/intel/ice/ice_main.c | 6 ++---- 3 files changed, 9 insertions(+), 6 deletions(-)