Skip to contentSkip to conversation

net/ixgbe: fix setting VF MAC address

PATCH Superseded Guinan Sun 2 participants 4 messages Mar 10, 2020 – Mar 13, 2020 Network drivers

lore
Share & tools
lore

Guinan Sun

author
#0 lore raw

PATCH 1/1 net/ixgbe: fix setting VF MAC address

This problem occurs because clear_rar is executed at the wrong time,
so PF cannot receive data normally.
This patch is used to modify the calling logic of clear_rar.

Fixes 3c4270187518 ("net/ixgbe: support VF MAC address add/remove")
---
 drivers/net/ixgbe/ixgbe_pf.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ixgbe/ixgbe_pf.c +4 -2
index afae21f81..67b5bef44 100644
@@ -783,8 +783,10 @@ ixgbe_set_vf_macvlan_msg(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
 		hw->mac.ops.set_rar(hw, vf_info[vf].mac_count,
 				new_mac, vf, IXGBE_RAH_AV);
 	} else {
-		hw->mac.ops.clear_rar(hw, vf_info[vf].mac_count);
-		vf_info[vf].mac_count = 0;
+		if (vf_info[vf].mac_count) {
+			hw->mac.ops.clear_rar(hw, vf_info[vf].mac_count);
+			vf_info[vf].mac_count = 0;
+		}
 	}
 	return 0;
 }
Signature · 1 line
2.17.1
#1 lore raw

Hi, Guinan

Quoted 2 lines · Guinan Sun

This problem occurs because clear_rar is executed at the wrong time, so PF cannot receive data normally.

Could you elaborate what problem you've encountered, and how this patch solves it?

Thanks,
Xiaolong

Quoted 30 lines

This patch is used to modify the calling logic of clear_rar.

Fixes 3c4270187518 ("net/ixgbe: support VF MAC address add/remove")

---
drivers/net/ixgbe/ixgbe_pf.c | 6 ++++--

1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ixgbe/ixgbe_pf.c +4 -2
index afae21f81..67b5bef44 100644
@@ -783,8 +783,10 @@ ixgbe_set_vf_macvlan_msg(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
 		hw->mac.ops.set_rar(hw, vf_info[vf].mac_count,
 				new_mac, vf, IXGBE_RAH_AV);
 	} else {
-		hw->mac.ops.clear_rar(hw, vf_info[vf].mac_count);
-		vf_info[vf].mac_count = 0;
+		if (vf_info[vf].mac_count) {
+			hw->mac.ops.clear_rar(hw, vf_info[vf].mac_count);
+			vf_info[vf].mac_count = 0;
+		}
 	}
 	return 0;
 }
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH v2 1/1 net/ixgbe: fix setting VF MAC address

In reply to Guinan Sun

The reason why PF cannot receive data normally is that vf performed the clear_rar operation through dev close without adding a mac address.
This will cause the association between the index and rx address set by VMDq to be cancelled,thus affecting the data reception of PF.
The correction method is to add a check action, and do not perform the set_rar operation without adding a mac address to prevent affecting the reception of data.

Fixes 3c4270187518 ("net/ixgbe: support VF MAC address add/remove")

---
v2 changes:
* Modify commit log

---
 drivers/net/ixgbe/ixgbe_pf.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ixgbe/ixgbe_pf.c +4 -2
index afae21f81..67b5bef44 100644
@@ -783,8 +783,10 @@ ixgbe_set_vf_macvlan_msg(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
 		hw->mac.ops.set_rar(hw, vf_info[vf].mac_count,
 				new_mac, vf, IXGBE_RAH_AV);
 	} else {
-		hw->mac.ops.clear_rar(hw, vf_info[vf].mac_count);
-		vf_info[vf].mac_count = 0;
+		if (vf_info[vf].mac_count) {
+			hw->mac.ops.clear_rar(hw, vf_info[vf].mac_count);
+			vf_info[vf].mac_count = 0;
+		}
 	}
 	return 0;
 }
Signature · 1 line
2.17.1
Acked-by on v2 1/1 Applied
#3 lore raw
Quoted 41 lines · Guinan Sun

The reason why PF cannot receive data normally is that vf performed the clear_rar operation through dev close without adding a mac address.
This will cause the association between the index and rx address set by VMDq to be cancelled,thus affecting the data reception of PF.
The correction method is to add a check action, and do not perform the set_rar operation without adding a mac address to prevent affecting the reception of data.

Fixes 3c4270187518 ("net/ixgbe: support VF MAC address add/remove")

---
v2 changes:
* Modify commit log
---
drivers/net/ixgbe/ixgbe_pf.c | 6 ++++--

1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ixgbe/ixgbe_pf.c +4 -2
index afae21f81..67b5bef44 100644
@@ -783,8 +783,10 @@ ixgbe_set_vf_macvlan_msg(struct rte_eth_dev *dev, uint32_t vf, uint32_t *msgbuf)
 		hw->mac.ops.set_rar(hw, vf_info[vf].mac_count,
 				new_mac, vf, IXGBE_RAH_AV);
 	} else {
-		hw->mac.ops.clear_rar(hw, vf_info[vf].mac_count);
-		vf_info[vf].mac_count = 0;
+		if (vf_info[vf].mac_count) {
+			hw->mac.ops.clear_rar(hw, vf_info[vf].mac_count);
+			vf_info[vf].mac_count = 0;
+		}
 	}
 	return 0;
 }
Signature · 1 line
2.17.1

Applied to dpdk-next-net-intel, Thanks.