From b6562244b4f356e37f3214185f17c6903b178fe1 Mon Sep 17 00:00:00 2001 From: Ivan Boule Date: Mon, 12 May 2014 16:11:36 +0200 Subject: [PATCH] ixgbevf: skip null and permanent mac addresses On a 82599 VF, the deletion of a dynamically added MAC address consists in first flushing all added MAC addresses, then in adding again all remaining MAC addresses. For this purpose, the function ixgbevf_remove_mac_addr() parses the pool of MAC addresses associated with a VF, and must skip the VF permanent MAC address that is stored into it, as well as all NULL MAC addresses. Signed-off-by: Ivan Boule Acked-by: Thomas Monjalon --- lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 34 ++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c index cf7914d200..6f57a3b16d 100644 --- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c +++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c @@ -3113,7 +3113,8 @@ static void ixgbevf_remove_mac_addr(struct rte_eth_dev *dev, uint32_t index) { struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); - struct ether_addr *dev_mac_addrs; + struct ether_addr *perm_addr = (struct ether_addr *) hw->mac.perm_addr; + struct ether_addr *mac_addr; uint32_t i; int diag; @@ -3121,20 +3122,37 @@ ixgbevf_remove_mac_addr(struct rte_eth_dev *dev, uint32_t index) * The IXGBE_VF_SET_MACVLAN command of the ixgbe-pf driver does * not support the deletion of a given MAC address. * Instead, it imposes to delete all MAC addresses, then to add again - * all MAC address with the exception of the one to be deleted. + * all MAC addresses with the exception of the one to be deleted. */ (void) ixgbevf_set_uc_addr_vf(hw, 0, NULL); - /* Add again all MAC addresses, excepted the deleted one. */ - dev_mac_addrs = dev->data->mac_addrs; - for (i = 0; i < hw->mac.num_rar_entries; i++) { + /* + * Add again all MAC addresses, with the exception of the deleted one + * and of the permanent MAC address. + */ + for (i = 0, mac_addr = dev->data->mac_addrs; + i < hw->mac.num_rar_entries; i++, mac_addr++) { /* Skip the deleted MAC address */ if (i == index) continue; - diag = ixgbevf_set_uc_addr_vf(hw, 2, - dev_mac_addrs[i].addr_bytes); + /* Skip NULL MAC addresses */ + if (is_zero_ether_addr(mac_addr)) + continue; + /* Skip the permanent MAC address */ + if (memcmp(perm_addr, mac_addr, sizeof(struct ether_addr)) == 0) + continue; + diag = ixgbevf_set_uc_addr_vf(hw, 2, mac_addr->addr_bytes); if (diag != 0) - PMD_DRV_LOG(ERR, "Adding MAC address failed diag=%d", + PMD_DRV_LOG(ERR, + "Adding again MAC address " + "%02x:%02x:%02x:%02x:%02x:%02x failed " + "diag=%d", + mac_addr->addr_bytes[0], + mac_addr->addr_bytes[1], + mac_addr->addr_bytes[2], + mac_addr->addr_bytes[3], + mac_addr->addr_bytes[4], + mac_addr->addr_bytes[5], diag); } } -- 2.20.1