| From 280d3fda58c3364871e3734fb6acda312c4ddeaa Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 28 Aug 2018 10:16:09 -0700 |
| Subject: i40e: Prevent deleting MAC address from VF when set by PF |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Patryk Małek <patryk.malek@intel.com> |
| |
| [ Upstream commit 5907cf6c5bbe78be2ed18b875b316c6028b20634 ] |
| |
| To prevent VF from deleting MAC address that was assigned by the |
| PF we need to check for that scenario when we try to delete a MAC |
| address from a VF. |
| |
| Signed-off-by: Patryk Małek <patryk.malek@intel.com> |
| Tested-by: Andrew Bowers <andrewx.bowers@intel.com> |
| Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 ++++++++++ |
| 1 file changed, 10 insertions(+) |
| |
| diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |
| index d86f3fa7aa6a4..46a71d289bca2 100644 |
| --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |
| +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |
| @@ -2571,6 +2571,16 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen) |
| ret = I40E_ERR_INVALID_MAC_ADDR; |
| goto error_param; |
| } |
| + |
| + if (vf->pf_set_mac && |
| + ether_addr_equal(al->list[i].addr, |
| + vf->default_lan_addr.addr)) { |
| + dev_err(&pf->pdev->dev, |
| + "MAC addr %pM has been set by PF, cannot delete it for VF %d, reset VF to change MAC addr\n", |
| + vf->default_lan_addr.addr, vf->vf_id); |
| + ret = I40E_ERR_PARAM; |
| + goto error_param; |
| + } |
| } |
| vsi = pf->vsi[vf->lan_vsi_idx]; |
| |
| -- |
| 2.20.1 |
| |