i40e: change log messages and error returns
Subsystems (2)
PATCH 1/2 i40e: change log messages and error returns
When VFs are being reset, there is a brief window of time when they cannot be configured because they don't have a VSI to configure. If a script is quick, it can fall through that window. To avoid defenestration, log a useful error message and return -EAGAIN.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 27 ++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +18 -9
@@ -2078,9 +2078,9 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) vf = &(pf->vf[vf_id]); vsi = pf->vsi[vf->lan_vsi_idx];if (!test_bit (I40E_VF_STAT_INIT , &vf->vf_states)) { -dev_err (&pf->pdev->dev, -"Uninitialized VF %d\n" , vf_id); - ret = -EINVAL ; +dev_err (&pf->pdev->dev,"VF %d still in reset. Try again.\n" , + vf_id); + ret = -EAGAIN ; goto error_param; }
@@ -2162,8 +2162,9 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, vf = &(pf->vf[vf_id]); vsi = pf->vsi[vf->lan_vsi_idx];if (!test_bit (I40E_VF_STAT_INIT , &vf->vf_states)) { -dev_err (&pf->pdev->dev,"Uninitialized VF %d\n" , vf_id); - ret = -EINVAL ; +dev_err (&pf->pdev->dev,"VF %d still in reset. Try again.\n" , + vf_id); + ret = -EAGAIN ; goto error_pvid; }
@@ -2282,8 +2283,9 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate, vf = &(pf->vf[vf_id]); vsi = pf->vsi[vf->lan_vsi_idx];if (!test_bit (I40E_VF_STAT_INIT , &vf->vf_states)) { -dev_err (&pf->pdev->dev,"Uninitialized VF %d.\n" , vf_id); - ret = -EINVAL ; +dev_err (&pf->pdev->dev,"VF %d still in reset. Try again.\n" , + vf_id); + ret = -EAGAIN ; goto error; }
@@ -2356,8 +2358,9 @@ int i40e_ndo_get_vf_config(struct net_device *netdev,/* first vsi is always the LAN vsi */ vsi = pf->vsi[vf->lan_vsi_idx];if (!test_bit (I40E_VF_STAT_INIT , &vf->vf_states)) { -dev_err (&pf->pdev->dev,"Uninitialized VF %d\n" , vf_id); - ret = -EINVAL ; +dev_err (&pf->pdev->dev,"VF %d still in reset. Try again.\n" , + vf_id); + ret = -EAGAIN ; goto error_param; }
@@ -2472,6 +2475,12 @@ int i40e_ndo_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool enable) } vf = &(pf->vf[vf_id]); +if (!test_bit (I40E_VF_STAT_INIT , &vf->vf_states)) { +dev_err (&pf->pdev->dev,"VF %d still in reset. Try again.\n" , + vf_id); + ret = -EAGAIN ; + goto out; + }if (enable == vf->spoofchk) goto out;
Signature · 1 line
2.5.0
PATCH 2/2 i40e: allow zero MAC address for VFs
Allow the user to specify a zero MAC address for VFs. This removes the existing MAC address and allows the VF to use a random address. Libvirt does this normally when removing a VF from a VM.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +6 -5
@@ -2084,9 +2084,9 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) goto error_param; } -if (!is_valid_ether_addr (mac)) { +if (is_multicast_ether_addr (mac)) {dev_err (&pf->pdev->dev, -"Invalid VF ethernet address\n" ); +"Invalid Ethernet address %pM for VF %d\n" , mac, vf_id); ret = -EINVAL ; goto error_param; }
@@ -2097,9 +2097,10 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)spin_lock_bh (&vsi->mac_filter_list_lock);/* delete the temporary mac address */ -i40e_del_filter (vsi, vf->default_lan_addr.addr, - vf->port_vlan_id ? vf->port_vlan_id :-1 , - true, false); +if (!is_zero_ether_addr (vf->default_lan_addr.addr)) +i40e_del_filter (vsi, vf->default_lan_addr.addr, + vf->port_vlan_id ? vf->port_vlan_id :-1 , + true, false);/* Delete all the filters for this VSI - we're going to kill it * anyway.
Signature · 1 line
2.5.0
Bowers
PATCH 2/2 i40e: allow zero MAC address for VFs
Quoted 8 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Mitch Williams
Sent: Tuesday, December 22, 2015 3:35 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH 2/2] i40e: allow zero MAC address for VFs
Quoted 8 lines
Allow the user to specify a zero MAC address for VFs. This removes the existing MAC address and allows the VF to use a random address. Libvirt does this normally when removing a VF from a VM.
Signed-off-by Mitch Williams <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
Patch code changes correctly applied, setting MAC to all zero causes driver to assign random on reload
Bowers
PATCH 1/2 i40e: change log messages and error returns
In reply to Mitch WilliamsQuoted 13 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Mitch Williams
Sent: Tuesday, December 22, 2015 3:35 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH 1/2] i40e: change log messages and error returnsWhen VFs are being reset, there is a brief window of time when they cannot be configured because they don't have a VSI to configure. If a script is quick, it can fall through that window. To avoid defenestration, log a useful error message and return
-EAGAIN.
Quoted 5 lines
Signed-off-by Mitch Williams <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 27 ++++++++++++++--- ----- 1 file changed, 18 insertions(+), 9 deletions(-)
Patch code changes correctly applied, returns error when rapidly creating and destroying VFs in a loop