i40e: fix incorrect ethtool statistics veb and veb.tc_
Subsystems (2)
PATCH 1/9 i40e: fix incorrect ethtool statistics veb and veb.tc_
From: Dmitrii Golovanov <[email protected]>
This patch fixes missing call of i40e_update_veb_stats() in function i40e_get_ethtool_stats() to update stats data of VEB and VEB TC counters before they are written into ethtool buffer. Before the patch ethtool counters may fell behind interface counters.
--- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 8 +++++++- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +1 -0
@@ -1021,6 +1021,7 @@ i40e_find_vsi_by_type(struct i40e_pf *pf, u16 type)return NULL ; }void i40e_update_stats (struct i40e_vsi *vsi); +void i40e_update_veb_stats (struct i40e_veb *veb);void i40e_update_eth_stats (struct i40e_vsi *vsi);struct rtnl_link_stats64 *i40e_get_vsi_stats_struct (struct i40e_vsi *vsi); int i40e_fetch_switch_configuration(struct i40e_pf *pf,
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +7 -1
@@ -2250,7 +2250,7 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,struct i40e_netdev_priv *np =netdev_priv (netdev);struct i40e_vsi *vsi = np->vsi;struct i40e_pf *pf = vsi->back; -struct i40e_veb *veb = pf->veb[pf->lan_veb]; +struct i40e_veb *veb =NULL ;unsigned int i;bool veb_stats;u64 *p = data;
@@ -2273,8 +2273,14 @@ static void i40e_get_ethtool_stats(struct net_device *netdev, goto check_data_pointer; veb_stats = ((pf->lan_veb !=I40E_NO_VEB ) && + (pf->lan_veb <I40E_MAX_VEB ) && (pf->flags &I40E_FLAG_VEB_STATS_ENABLED )); +if (veb_stats) { + veb = pf->veb[pf->lan_veb]; +i40e_update_veb_stats (veb); + } +/* If veb stats aren't enabled, pass NULL instead of the veb so that * we initialize stats to zero and update the data pointer * intelligently
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -677,7 +677,7 @@ void i40e_update_eth_stats(struct i40e_vsi *vsi)* i40e_update_veb_stats - Update Switch component statistics * @veb: the VEB being updated **/ -static void i40e_update_veb_stats (struct i40e_veb *veb) +void i40e_update_veb_stats (struct i40e_veb *veb) {struct i40e_pf *pf = veb->pf;struct i40e_hw *hw = &pf->hw;
Signature · 1 line
2.21.0
PATCH 2/9 i40e: make visible changed vf mac on host
From: Aleksandr Loktionov <[email protected]>
This patch makes changed vm mac address visible on host via ip link show command. This problem is fixed by copying last unicast mac filter to vf->default_lan_addr.addr. Without this patch if vf mac was not set from host side and if you run ip link show $pf, on host side you'd always see a zero mac, not the real vf mac that vf assigned to itself.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +3 -0
@@ -2629,6 +2629,9 @@ static int i40e_vc_add_mac_addr_msg(struct i40e_vf *vf, u8 *msg) }else { vf->num_mac++; } +if (is_valid_ether_addr (al->list[i].addr)) +ether_addr_copy (vf->default_lan_addr.addr, + al->list[i].addr); } }spin_unlock_bh (&vsi->mac_filter_hash_lock);
Signature · 1 line
2.21.0
Bowers
PATCH 2/9 i40e: make visible changed vf mac on host
Quoted 14 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, July 2, 2019 5:23 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Loktionov, Aleksandr <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S7 2/9] i40e: make visible changed vf mac on hostFrom: Aleksandr Loktionov <[email protected]>
This patch makes changed vm mac address visible on host via ip link show command. This problem is fixed by copying last unicast mac filter to vf-
Quoted 8 lines
Quoted 1 line
default_lan_addr.addr. Without this patch if vf mac was not set from host
side and if you run ip link show $pf, on host side you'd always see a zero mac, not the real vf mac that vf assigned to itself.
Signed-off-by Aleksandr Loktionov <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 3 +++ 1 file changed, 3 insertions(+)
PATCH 3/9 i40e: Log disable-fw-lldp flag change by ethtool
In reply to Alice MichaelFrom: Slawomir Laba <[email protected]>
Add logging for disable-fw-lldp flag by ethtool. Added check for I40E_FLAG_DISABLE_FW_LLDP and logging state in dmesg. Without this commit there was no clear statement in dmesg about FW LLDP state in dmesg.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_main.c +5 -0
@@ -8499,6 +8499,11 @@ void i40e_do_reset(struct i40e_pf *pf, u32 reset_flags, bool lock_acquired)dev_dbg (&pf->pdev->dev,"PFR requested\n" );i40e_handle_reset_warning (pf, lock_acquired); +dev_info (&pf->pdev->dev, + pf->flags &I40E_FLAG_DISABLE_FW_LLDP ? +"FW LLDP is disabled\n" : +"FW LLDP is enabled\n" ); + }else if (reset_flags &BIT_ULL (__I40E_REINIT_REQUESTED)) {int v;
Signature · 1 line
2.21.0
Bowers
PATCH 3/9 i40e: Log disable-fw-lldp flag change by ethtool
Quoted 17 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, July 2, 2019 5:23 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Laba, SlawomirX <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S7 3/9] i40e: Log disable-fw-lldp flag change by ethtoolFrom: Slawomir Laba <[email protected]>
Add logging for disable-fw-lldp flag by ethtool. Added check for
I40E_FLAG_DISABLE_FW_LLDPand logging state in dmesg. Without this commit there was no clear statement in dmesg about FW LLDP state in dmesg.
Quoted 4 lines
Signed-off-by Slawomir Laba <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 5 +++++ 1 file changed, 5 insertions(+)
PATCH 4/9 i40e: don't report link up for a VF who hasn't enabled queues
In reply to Alice MichaelFrom: Jacob Keller <[email protected]>
Commit d3d657a90850 ("i40e: update VFs of link state after GET_VF_RESOURCES") modified the PF driver to notify a VF of its link status immediately after it requests resources.
This was intended to fix reporting on VF drivers, so that they would properly report link status.
However, some older VF drivers do not respond well to receiving a link up notification before queues are enabled. This can cause their state machine to think that it is safe to send traffic. This results in a Tx hang on the VF.
More recent versions of the old i40evf and all versions of iavf are resilient to these early link status messages. However, if a VM happens to run an older version of the VF driver, this can be problematic.
Record whether the PF has actually enabled queues for the VF. When reporting link status, always report link down if the queues aren't enabled. In this way, the VF driver will never receive a link up notification until after its queues are enabled.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 13 ++++++++++++- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 + 2 files changed, 13 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +12 -1
@@ -55,7 +55,12 @@ static void i40e_vc_notify_vf_link_state(struct i40e_vf *vf) pfe.event =VIRTCHNL_EVENT_LINK_CHANGE ; pfe.severity =PF_EVENT_SEVERITY_INFO ; -if (vf->link_forced) { + +/* Always report link is down if the VF queues aren't enabled */ +if (!vf->queues_enabled) { + pfe.event_data.link_event.link_status = false; + pfe.event_data.link_event.link_speed =0 ; + }else if (vf->link_forced) { pfe.event_data.link_event.link_status = vf->link_up; pfe.event_data.link_event.link_speed = (vf->link_up ?VIRTCHNL_LINK_SPEED_40GB :0 );
@@ -65,6 +70,7 @@ static void i40e_vc_notify_vf_link_state(struct i40e_vf *vf) pfe.event_data.link_event.link_speed =i40e_virtchnl_link_speed (ls->link_speed); } +i40e_aq_send_msg_to_vf (hw, abs_vf_id,VIRTCHNL_OP_EVENT ,0 , (u8 *)&pfe,sizeof (pfe),NULL ); }
@@ -2364,6 +2370,8 @@ static int i40e_vc_enable_queues_msg(struct i40e_vf *vf, u8 *msg) } } + vf->queues_enabled = true; + error_param:/* send the response to the VF */ return i40e_vc_send_resp_to_vf(vf, VIRTCHNL_OP_ENABLE_QUEUES,
@@ -2385,6 +2393,9 @@ static int i40e_vc_disable_queues_msg(struct i40e_vf *vf, u8 *msg)struct i40e_pf *pf = vf->pf;i40e_status aq_ret =0 ; +/* Immediately mark queues as disabled */ + vf->queues_enabled = false; +if (!test_bit (I40E_VF_STATE_ACTIVE , &vf->vf_states)) { aq_ret =I40E_ERR_PARAM ; goto error_param;
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h +1 -0
@@ -99,6 +99,7 @@ struct i40e_vf {unsigned int tx_rate;/* Tx bandwidth limit in Mbps */ bool link_forced;bool link_up;/* only valid if VF link is forced */ +bool queues_enabled;/* true if the VF queues are enabled */ bool spoofchk;u16 num_mac;u16 num_vlan;
Signature · 1 line
2.21.0
Bowers
PATCH 4/9 i40e: don't report link up for a VF who hasn't enabled queues
Quoted 31 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, July 2, 2019 5:23 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S7 4/9] i40e: don't report link up for a VF who hasn't enabled queuesFrom: Jacob Keller <[email protected]>
Commit
d3d657a90850("i40e: update VFs of link state afterGET_VF_RESOURCES") modified the PF driver to notify a VF of its link status immediately after it requests resources.This was intended to fix reporting on VF drivers, so that they would properly report link status.
However, some older VF drivers do not respond well to receiving a link up notification before queues are enabled. This can cause their state machine to think that it is safe to send traffic. This results in a Tx hang on the VF.
More recent versions of the old i40evf and all versions of iavf are resilient to these early link status messages. However, if a VM happens to run an older version of the VF driver, this can be problematic.
Record whether the PF has actually enabled queues for the VF. When reporting link status, always report link down if the queues aren't enabled. In this way, the VF driver will never receive a link up notification until after its queues are enabled.
Quoted 5 lines
Signed-off-by Jacob Keller <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 13 ++++++++++++- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 + 2 files changed, 13 insertions(+), 1 deletion(-)
PATCH 5/9 i40e: fix code comments
In reply to Alice MichaelFrom: Jeff Kirsher <[email protected]>
Found a code comment that needed TLC to correct their formatting.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +1 -1
@@ -2159,7 +2159,7 @@ static int i40e_vc_config_queues_msg(struct i40e_vf *vf, u8 *msg)* VF does not know about these additional VSIs and all * it cares is about its own queues. PF configures these queues * to its appropriate VSIs based on TC mapping -**/ +*/ if (vf->adq_enabled) {if (idx >=ARRAY_SIZE (vf->ch)) { aq_ret =I40E_ERR_NO_AVAILABLE_VSI ;
Signature · 1 line
2.21.0
Bowers
PATCH 5/9 i40e: fix code comments
Quoted 8 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, July 2, 2019 5:23 AM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S7 5/9] i40e: fix code comments
Quoted 8 lines
From: Jeff Kirsher <[email protected]>
Found a code comment that needed TLC to correct their formatting.
Signed-off-by Jeff Kirsher <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH 6/9 i40e: Update visual effect for advertised FEC mode.
In reply to Alice MichaelFrom: Czeslaw Zagorski <[email protected]>
Updates visual effect for advertised mode after setting desired mode. The mode appears in advertised FEC mode correctly, when ethtool interface command is called. Without this commit advertised FEC is displayed regardless of the settings as "None BaseR RS".
--- .../net/ethernet/intel/i40e/i40e_ethtool.c | 63 ++++++++++--------- 1 file changed, 35 insertions(+), 28 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +35 -28
@@ -710,6 +710,35 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf, } } +/** +* i40e_get_settings_link_up_fec - Get the FEC mode encoding from mask +* @req_fec_info: mask request fec info +* @ks: ethtool ksettings to fill in +**/ +static void i40e_get_settings_link_up_fec (u8 req_fec_info, +struct ethtool_link_ksettings *ks) +{ +ethtool_link_ksettings_add_link_mode (ks, supported,FEC_NONE ); +ethtool_link_ksettings_add_link_mode (ks, supported,FEC_RS ); +ethtool_link_ksettings_add_link_mode (ks, supported,FEC_BASER ); + +if (I40E_AQ_SET_FEC_REQUEST_RS & req_fec_info) { +ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_RS ); + }else if (I40E_AQ_SET_FEC_REQUEST_KR & req_fec_info) { +ethtool_link_ksettings_add_link_mode (ks, advertising, +FEC_BASER ); + }else { +ethtool_link_ksettings_add_link_mode (ks, advertising, +FEC_NONE ); +if (I40E_AQ_SET_FEC_AUTO & req_fec_info) { +ethtool_link_ksettings_add_link_mode (ks, advertising, +FEC_RS ); +ethtool_link_ksettings_add_link_mode (ks, advertising, +FEC_BASER ); + } + } +} +/** * i40e_get_settings_link_up - Get the Link settings for when link is up * @hw: hw structure
@@ -769,13 +798,7 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 25000baseSR_Full);ethtool_link_ksettings_add_link_mode (ks, advertising, 25000baseSR_Full); -ethtool_link_ksettings_add_link_mode (ks, supported,FEC_NONE ); -ethtool_link_ksettings_add_link_mode (ks, supported,FEC_RS ); -ethtool_link_ksettings_add_link_mode (ks, supported,FEC_BASER ); -ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_NONE ); -ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_RS ); -ethtool_link_ksettings_add_link_mode (ks, advertising, -FEC_BASER ); +i40e_get_settings_link_up_fec (hw_link_info->req_fec_info, ks);ethtool_link_ksettings_add_link_mode (ks, supported, 10000baseSR_Full); ethtool_link_ksettings_add_link_mode(ks, advertising,
@@ -892,9 +915,6 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 40000baseKR4_Full);ethtool_link_ksettings_add_link_mode (ks, supported, 25000baseKR_Full); -ethtool_link_ksettings_add_link_mode (ks, supported,FEC_NONE ); -ethtool_link_ksettings_add_link_mode (ks, supported,FEC_RS ); -ethtool_link_ksettings_add_link_mode (ks, supported,FEC_BASER );ethtool_link_ksettings_add_link_mode (ks, supported, 20000baseKR2_Full); ethtool_link_ksettings_add_link_mode(ks, supported,
@@ -908,10 +928,7 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 40000baseKR4_Full);ethtool_link_ksettings_add_link_mode (ks, advertising, 25000baseKR_Full); -ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_NONE ); -ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_RS ); -ethtool_link_ksettings_add_link_mode (ks, advertising, -FEC_BASER ); +i40e_get_settings_link_up_fec (hw_link_info->req_fec_info, ks);ethtool_link_ksettings_add_link_mode (ks, advertising, 20000baseKR2_Full); ethtool_link_ksettings_add_link_mode(ks, advertising,
@@ -929,13 +946,8 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 25000baseCR_Full);ethtool_link_ksettings_add_link_mode (ks, advertising, 25000baseCR_Full); -ethtool_link_ksettings_add_link_mode (ks, supported,FEC_NONE ); -ethtool_link_ksettings_add_link_mode (ks, supported,FEC_RS ); -ethtool_link_ksettings_add_link_mode (ks, supported,FEC_BASER ); -ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_NONE ); -ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_RS ); -ethtool_link_ksettings_add_link_mode (ks, advertising, -FEC_BASER ); +i40e_get_settings_link_up_fec (hw_link_info->req_fec_info, ks); +break ;case I40E_PHY_TYPE_25GBASE_AOC :case I40E_PHY_TYPE_25GBASE_ACC :
@@ -945,13 +957,8 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 25000baseCR_Full);ethtool_link_ksettings_add_link_mode (ks, advertising, 25000baseCR_Full); -ethtool_link_ksettings_add_link_mode (ks, supported,FEC_NONE ); -ethtool_link_ksettings_add_link_mode (ks, supported,FEC_RS ); -ethtool_link_ksettings_add_link_mode (ks, supported,FEC_BASER ); -ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_NONE ); -ethtool_link_ksettings_add_link_mode (ks, advertising,FEC_RS ); -ethtool_link_ksettings_add_link_mode (ks, advertising, -FEC_BASER ); +i40e_get_settings_link_up_fec (hw_link_info->req_fec_info, ks); +ethtool_link_ksettings_add_link_mode (ks, supported, 10000baseCR_Full); ethtool_link_ksettings_add_link_mode(ks, advertising,
Signature · 1 line
2.21.0
Bowers
PATCH 6/9 i40e: Update visual effect for advertised FEC mode.
Quoted 17 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, July 2, 2019 5:23 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Zagorski, CzeslawX <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S7 6/9] i40e: Update visual effect for advertised FEC mode.From: Czeslaw Zagorski <[email protected]>
Updates visual effect for advertised mode after setting desired mode. The mode appears in advertised FEC mode correctly, when ethtool interface command is called. Without this commit advertised FEC is displayed regardless of the settings as "None BaseR RS".
Quoted 4 lines
Signed-off-by Czeslaw Zagorski <[email protected]>--- .../net/ethernet/intel/i40e/i40e_ethtool.c | 63 ++++++++++--------- 1 file changed, 35 insertions(+), 28 deletions(-)
PATCH 7/9 i40e: Log info when PF is entering and leaving Allmulti mode.
In reply to Alice MichaelFrom: Czeslaw Zagorski <[email protected]>
Add log when PF is entering and leaving Allmulti mode. The change of PF state is visible in dmesg now. Without this commit, entering and leaving Allmulti mode is not logged in dmesg.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_main.c +4 -0
@@ -2530,6 +2530,10 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi) vsi_name,i40e_stat_str (hw, aq_ret), i40e_aq_str(hw, hw->aq.asq_last_status)); + }else { +dev_info (&pf->pdev->dev,"%s is %s allmulti mode.\n" , + vsi->netdev->name, + cur_multipromisc ?"entering" :"leaving" ); } }
Signature · 1 line
2.21.0
Bowers
PATCH 7/9 i40e: Log info when PF is entering and leaving Allmulti mode.
Quoted 12 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, July 2, 2019 5:23 AM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Cc: Zagorski, CzeslawX <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S7 7/9] i40e: Log info when PF is entering and leaving Allmulti mode.From: Czeslaw Zagorski <[email protected]>
Quoted 8 lines
Add log when PF is entering and leaving Allmulti mode. The change of PF state is visible in dmesg now. Without this commit, entering and leaving Allmulti mode is not logged in dmesg.
Signed-off-by Czeslaw Zagorski <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++++ 1 file changed, 4 insertions(+)
PATCH 8/9 i40e: verify string count matches even on early return
In reply to Alice MichaelFrom: Jacob Keller <[email protected]>
Similar to i40e_get_ethtool_stats, add a goto to verify that the data pointer for the strings lines up with the expected stats count. This helps ensure that bugs are not introduced when adding stats.
--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +2 -1
@@ -2342,7 +2342,7 @@ static void i40e_get_stat_strings(struct net_device *netdev, u8 *data) }if (vsi != pf->vsi[pf->lan_vsi] || pf->hw.partition_id !=1 ) -return ; + goto check_data_pointer;i40e_add_stat_strings (&data, i40e_gstrings_veb_stats);
@@ -2354,6 +2354,7 @@ static void i40e_get_stat_strings(struct net_device *netdev, u8 *data)for (i =0 ; i <I40E_MAX_USER_PRIORITY ; i++)i40e_add_stat_strings (&data, i40e_gstrings_pfc_stats, i); +check_data_pointer:WARN_ONCE (data - p !=i40e_get_stats_count (netdev) *ETH_GSTRING_LEN ,"stat strings count mismatch!" ); }
Signature · 1 line
2.21.0
Bowers
PATCH 8/9 i40e: verify string count matches even on early return
Quoted 11 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, July 2, 2019 5:23 AM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S7 8/9] i40e: verify string count matches even on early returnFrom: Jacob Keller <[email protected]>
Quoted 8 lines
Similar to
i40e_get_ethtool_stats, add a goto to verify that the data pointer for the strings lines up with the expected stats count. This helps ensure that bugs are not introduced when adding stats.Signed-off-by Jacob Keller <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
PATCH 9/9 i40e: Remove unicast log when VF is leaving multicast mode.
In reply to Alice MichaelFrom: Czeslaw Zagorski <[email protected]>
This patch removes unicast log when VF is leaving multicast mode. Added check of vf->vf_states & I40E_VF_STATE_MC_PROMISC/I40E_VF_STATE_UC_PROMISC. Without this commit, leaving multicast mode logs "unset unicast" in dmsg.
--- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +21 -18
@@ -2043,30 +2043,33 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf, u8 *msg) alluni = true; aq_ret =i40e_config_vf_promiscuous_mode (vf, info->vsi_id, allmulti, alluni); -if (!aq_ret) { -if (allmulti) { +if (aq_ret) + goto err_out; + +if (allmulti) { +if (!test_and_set_bit (I40E_VF_STATE_MC_PROMISC , + &vf->vf_states))dev_info (&pf->pdev->dev,"VF %d successfully set multicast promiscuous mode\n" , vf->vf_id); -set_bit (I40E_VF_STATE_MC_PROMISC , &vf->vf_states); - }else { -dev_info (&pf->pdev->dev, -"VF %d successfully unset multicast promiscuous mode\n" , - vf->vf_id); -clear_bit (I40E_VF_STATE_MC_PROMISC , &vf->vf_states); - } -if (alluni) { + }else if (test_and_clear_bit (I40E_VF_STATE_MC_PROMISC , + &vf->vf_states)) +dev_info (&pf->pdev->dev, +"VF %d successfully unset multicast promiscuous mode\n" , + vf->vf_id); + +if (alluni) { +if (!test_and_set_bit (I40E_VF_STATE_UC_PROMISC , + &vf->vf_states))dev_info (&pf->pdev->dev,"VF %d successfully set unicast promiscuous mode\n" , vf->vf_id); -set_bit (I40E_VF_STATE_UC_PROMISC , &vf->vf_states); - }else { -dev_info (&pf->pdev->dev, -"VF %d successfully unset unicast promiscuous mode\n" , - vf->vf_id); -clear_bit (I40E_VF_STATE_UC_PROMISC , &vf->vf_states); - } - } + }else if (test_and_clear_bit (I40E_VF_STATE_UC_PROMISC , + &vf->vf_states)) +dev_info (&pf->pdev->dev, +"VF %d successfully unset unicast promiscuous mode\n" , + vf->vf_id); + err_out:/* send the response to the VF */ return i40e_vc_send_resp_to_vf(vf,
Signature · 1 line
2.21.0
Bowers
PATCH 9/9 i40e: Remove unicast log when VF is leaving multicast mode.
Quoted 18 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, July 2, 2019 5:23 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Zagorski, CzeslawX <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S7 9/9] i40e: Remove unicast log when VF is leaving multicast mode.From: Czeslaw Zagorski <[email protected]>
This patch removes unicast log when VF is leaving multicast mode. Added check of
vf->vf_states& I40E_VF_STATE_MC_PROMISC/I40E_VF_STATE_UC_PROMISC. Without this commit, leaving multicast mode logs "unset unicast" in dmsg.
Quoted 4 lines
Signed-off-by Czeslaw Zagorski <[email protected]>--- .../ethernet/intel/i40e/i40e_virtchnl_pf.c | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-)
Bowers
PATCH 1/9 i40e: fix incorrect ethtool statistics veb and veb.tc_
In reply to Alice MichaelQuoted 17 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, July 2, 2019 5:23 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Golovanov, Dmitrii <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S7 1/9] i40e: fix incorrect ethtool statistics veb and veb.tc_From: Dmitrii Golovanov <[email protected]>
This patch fixes missing call of
i40e_update_veb_stats()in functioni40e_get_ethtool_stats()to update stats data of VEB and VEB TC counters before they are written into ethtool buffer.
Before the patch ethtool counters may fell behind interface counters.
Quoted 6 lines
Signed-off-by Dmitrii Golovanov <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 8 +++++++- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)