i40e: Check and set the PF driver state first in i40e_ndo_set_vf_mac
Subsystems (2)
PATCH 1/1 i40e: Check and set the PF driver state first in i40e_ndo_set_vf_mac
The PF driver state flag __I40E_VIRTCHNL_OP_PENDING needs to be checked and set at the beginning of i40e_ndo_set_vf_mac. Otherwise, if there are error conditions before it, the flag will be cleared unexpectedly by this function to cause potential race conditions. Hence move the check to the top of this function.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +5 -5
@@ -3940,6 +3940,11 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)int bkt;u8 i; +if (test_and_set_bit (__I40E_VIRTCHNL_OP_PENDING, pf->state)) { +dev_warn (&pf->pdev->dev,"Unable to configure VFs, other operation is pending.\n" ); +return -EAGAIN ; + } +/* validate the request */ ret =i40e_validate_vf (pf, vf_id);if (ret)
@@ -3964,11 +3969,6 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) goto error_param; } -if (test_and_set_bit (__I40E_VIRTCHNL_OP_PENDING, pf->state)) { -dev_warn (&pf->pdev->dev,"Unable to configure VFs, other operation is pending.\n" ); -return -EAGAIN ; - } -if (is_multicast_ether_addr (mac)) {dev_err (&pf->pdev->dev,"Invalid Ethernet address %pM for VF %d\n" , mac, vf_id);
Signature · 1 line
2.20.1
Bowers
PATCH 1/1 i40e: Check and set the PF driver state first in i40e_ndo_set_vf_mac
Quoted 14 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Lihong Yang
Sent: Wednesday, May 29, 2019 4:07 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH] i40e: Check and set the PF driver state first ini40e_ndo_set_vf_macThe PF driver state flag
__I40E_VIRTCHNL_OP_PENDINGneeds to be checked and set at the beginning ofi40e_ndo_set_vf_mac. Otherwise, if there are error conditions before it, the flag will be cleared unexpectedly by this function to cause potential race conditions.
Hence move the check to the top of this function.
Quoted 4 lines
Signed-off-by Lihong Yang <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)