Skip to contentSkip to conversation

net/mlx5: fix storing the synched MAC to internal table

PATCH Superseded Dey, Souvik 2 participants 4 messages Feb 12, 2021 – Feb 17, 2021 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/mlx5: fix storing the synched MAC to internal table

From: Souvik Dey <[email protected]>

[ upstream commit 493f0bb51c1144eedcff2bba199cab1b64ff9fd0 ]

As the internal MAC table is divided into Unicast and Multicast address sections, we should check the type of synched MAC address before storing it to the internal table. Currently the check is not done, and the synched MAC of 33:33:00:00:00:01 gets stored in the unicast section (mostly index 1) causing all subsequent mlx5_set_mc_addr_list() to fail with error -EADDRINUSE, as the mac_list contains the MAC 33:33:00:00:00:01. This denies adding of any new multicast address to the internal list and also fails to add the MAC address to the device in case of SR-IOV VF.

Fixes f22442cb5d42 ("net/mlx5: reduce Netlink commands dependencies")
Fixes ccdcba53a3f4 ("net/mlx5: use Netlink to add/remove MAC addresses")
---
 drivers/net/mlx5/mlx5_nl.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)
drivers/net/mlx5/mlx5_nl.c +16 -5
index 64580b9..add756d 100644
@@ -678,11 +678,22 @@ mlx5_nl_mac_addr_sync(struct rte_eth_dev *dev)
 				break;
 		if (j != MLX5_MAX_MAC_ADDRESSES)
 			continue;
-		/* Find the first entry available. */
-		for (j = 0; j != MLX5_MAX_MAC_ADDRESSES; ++j) {
-			if (rte_is_zero_ether_addr(&dev->data->mac_addrs[j])) {
-				dev->data->mac_addrs[j] = macs[i];
-				break;
+		if (rte_is_multicast_ether_addr(&macs[i])) {
+			/* Find the first entry available. */
+			for (j = MLX5_MAX_UC_MAC_ADDRESSES;
+			     j != MLX5_MAX_MAC_ADDRESSES; ++j) {
+				if (rte_is_zero_ether_addr(&mac_addrs[j])) {
+					mac_addrs[j] = macs[i];
+					break;
+				}
+			}
+		} else {
+			/* Find the first entry available. */
+			for (j = 0; j != MLX5_MAX_UC_MAC_ADDRESSES; ++j) {
+				if (rte_is_zero_ether_addr(&mac_addrs[j])) {
+					mac_addrs[j] = macs[i];
+					break;
+				}
 			}
 		}
 	}
Signature · 4 lines
2.9.3.windows.1


Notice: This e-mail together with any attachments may contain information of Ribbon Communications Inc. and its Affiliates that is confidential and/or proprietary for the sole use of the intended recipient. Any review, disclosure, reliance or distribution by others or forwarding without express permission is strictly prohibited. If you are not the intended recipient, please notify the sender immediately and then delete all copies, including any attachments.
#1 lore raw
Quoted 4 lines · Souvik

From: Souvik Dey <[email protected]>

[ upstream commit 493f0bb51c1144eedcff2bba199cab1b64ff9fd0 ]

Thanks, added

Quoted 56 lines

As the internal MAC table is divided into Unicast and Multicast address sections, we should check the type of synched MAC address before storing it to the internal table. Currently the check is not done, and the synched MAC of 33:33:00:00:00:01 gets stored in the unicast section (mostly index 1) causing all subsequent mlx5_set_mc_addr_list() to fail with error -EADDRINUSE, as the mac_list contains the MAC 33:33:00:00:00:01. This denies adding of any new multicast address to the internal list and also fails to add the MAC address to the device in case of SR-IOV VF.

Fixes f22442cb5d42 ("net/mlx5: reduce Netlink commands dependencies")
Fixes ccdcba53a3f4 ("net/mlx5: use Netlink to add/remove MAC addresses")
---
 drivers/net/mlx5/mlx5_nl.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)
drivers/net/mlx5/mlx5_nl.c +16 -6
index 64580b9..add756d 100644
@@ -678,11 +678,22 @@ mlx5_nl_mac_addr_sync(struct rte_eth_dev *dev)
                                break;
                if (j != MLX5_MAX_MAC_ADDRESSES)
                        continue;
-               /* Find the first entry available. */
-               for (j = 0; j != MLX5_MAX_MAC_ADDRESSES; ++j) {
-                       if (rte_is_zero_ether_addr(&dev->data->mac_addrs[j])) {
-                               dev->data->mac_addrs[j] = macs[i];
-                               break;
+               if (rte_is_multicast_ether_addr(&macs[i])) {
+                       /* Find the first entry available. */
+                       for (j = MLX5_MAX_UC_MAC_ADDRESSES;
+                            j != MLX5_MAX_MAC_ADDRESSES; ++j) {
+                               if (rte_is_zero_ether_addr(&mac_addrs[j])) {
+                                       mac_addrs[j] = macs[i];
+                                       break;
+                               }
+                       }
+               } else {
+                       /* Find the first entry available. */
+                       for (j = 0; j != MLX5_MAX_UC_MAC_ADDRESSES; ++j) {
+                               if (rte_is_zero_ether_addr(&mac_addrs[j])) {
+                                       mac_addrs[j] = macs[i];
+                                       break;
+                               }
                        }
                }
        }
--

2.9.3.windows.1

Notice: This e-mail together with any attachments may contain information of Ribbon Communications Inc. and its Affiliates that is confidential and/or proprietary for the sole use of the intended recipient. Any review, disclosure, reliance or distribution by others or forwarding without express permission is strictly prohibited. If you are not the intended recipient, please notify the sender immediately and then delete all copies, including any attachments.

Signature · 3 lines
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd
#2 lore raw
Quoted 28 lines · Christian Ehrhardt
Quoted 4 lines · Souvik

From: Souvik Dey <[email protected]>

[ upstream commit 493f0bb51c1144eedcff2bba199cab1b64ff9fd0 ]

Thanks, added

Quoted 19 lines

As the internal MAC table is divided into Unicast and Multicast address sections, we should check the type of synched MAC address before storing it to the internal table. Currently the check is not done, and the synched MAC of 33:33:00:00:00:01 gets stored in the unicast section (mostly index 1) causing all subsequent mlx5_set_mc_addr_list() to fail with error -EADDRINUSE, as the mac_list contains the MAC 33:33:00:00:00:01. This denies adding of any new multicast address to the internal list and also fails to add the MAC address to the device in case of SR-IOV VF.

Fixes f22442cb5d42 ("net/mlx5: reduce Netlink commands dependencies")
Fixes ccdcba53a3f4 ("net/mlx5: use Netlink to add/remove MAC addresses")
---
 drivers/net/mlx5/mlx5_nl.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)
Quoted 12 lines

drivers/net/mlx5/mlx5_nl.c mlx5_nl_mac_addr_sync(struct rte_eth_dev *dev) · line 684

Quoted 12 lines
drivers/net/mlx5/mlx5_nl.c +0 -4
index 64580b9..add756d 100644
@@ -678,11 +678,22 @@ mlx5_nl_mac_addr_sync(struct rte_eth_dev *dev)
                                break;
                if (j != MLX5_MAX_MAC_ADDRESSES)
                        continue;
-               /* Find the first entry available. */
-               for (j = 0; j != MLX5_MAX_MAC_ADDRESSES; ++j) {
-                       if (rte_is_zero_ether_addr(&dev->data->mac_addrs[j])) {
-                               dev->data->mac_addrs[j] = macs[i];

When built this fails, thereby for now I've dequeued this from 19.11.7

[ 708s] ../drivers/net/mlx5/mlx5_nl.c: In function ‘mlx5_nl_mac_addr_sync’:
[ 708s] ../drivers/net/mlx5/mlx5_nl.c:685:33: error: ‘mac_addrs’ undeclared (first use in this function); did you mean ‘vec_adds’?

[  708s]      if (rte_is_zero_ether_addr(&mac_addrs[j])) {
[  708s]                                  ^~~~~~~~~
[  708s]                                  vec_adds
[  708s] ../drivers/net/mlx5/mlx5_nl.c:685:33: note: each undeclared

identifier is reported only once for each function it appears in [ 708s] ninja: build stopped: subcommand failed.

If you have a chance to refresh your backport with the 19.11 codebase in mind that would be great.
Looking for an updated backport and thanks in advance.

Quoted 32 lines
Quoted 24 lines
drivers/net/mlx5/mlx5_nl.c +16 -2
-                               break;
+               if (rte_is_multicast_ether_addr(&macs[i])) {
+                       /* Find the first entry available. */
+                       for (j = MLX5_MAX_UC_MAC_ADDRESSES;
+                            j != MLX5_MAX_MAC_ADDRESSES; ++j) {
+                               if (rte_is_zero_ether_addr(&mac_addrs[j])) {
+                                       mac_addrs[j] = macs[i];
+                                       break;
+                               }
+                       }
+               } else {
+                       /* Find the first entry available. */
+                       for (j = 0; j != MLX5_MAX_UC_MAC_ADDRESSES; ++j) {
+                               if (rte_is_zero_ether_addr(&mac_addrs[j])) {
+                                       mac_addrs[j] = macs[i];
+                                       break;
+                               }
                        }
                }
        }
--

2.9.3.windows.1

Quoted 1 line

Notice: This e-mail together with any attachments may contain information of Ribbon Communications Inc. and its Affiliates that is confidential and/or proprietary for the sole use of the intended recipient. Any review, disclosure, reliance or distribution by others or forwarding without express permission is strictly prohibited. If you are not the intended recipient, please notify the sender immediately and then delete all copies, including any attachments.

--
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd

Signature · 3 lines
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd
#3 lore raw

PATCH v2 1/1 net/mlx5: fix storing the synched MAC to internal table

In reply to Dey, Souvik

From: Souvik Dey <[email protected]>

[ upstream commit 493f0bb51c1144eedcff2bba199cab1b64ff9fd0 ]

As the internal MAC table is divided into Unicast and Multicast address sections, we should check the type of synched MAC address before storing it to the internal table. Currently the check is not done, and the synched MAC of 33:33:00:00:00:01 gets stored in the unicast section (mostly index 1) causing all subsequent mlx5_set_mc_addr_list() to fail with error -EADDRINUSE, as the mac_list contains the MAC 33:33:00:00:00:01. This denies adding of any new multicast address to the internal list and also fails to add the MAC address to the device in case of SR-IOV VF.

Fixes f22442cb5d42 ("net/mlx5: reduce Netlink commands dependencies")
Fixes ccdcba53a3f4 ("net/mlx5: use Netlink to add/remove MAC addresses")

---

v2:
* Fixing the compilation errors.

---
 drivers/net/mlx5/mlx5_nl.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)
drivers/net/mlx5/mlx5_nl.c +18 -5
index 64580b9..6db372e 100644
@@ -678,11 +678,24 @@ mlx5_nl_mac_addr_sync(struct rte_eth_dev *dev)
 				break;
 		if (j != MLX5_MAX_MAC_ADDRESSES)
 			continue;
-		/* Find the first entry available. */
-		for (j = 0; j != MLX5_MAX_MAC_ADDRESSES; ++j) {
-			if (rte_is_zero_ether_addr(&dev->data->mac_addrs[j])) {
-				dev->data->mac_addrs[j] = macs[i];
-				break;
+		if (rte_is_multicast_ether_addr(&dev->data->mac_addrs[j])) {
+			/* Find the first entry available. */
+			for (j = MLX5_MAX_UC_MAC_ADDRESSES;
+					j != MLX5_MAX_MAC_ADDRESSES; ++j) {
+				if (rte_is_zero_ether_addr(
+						&dev->data->mac_addrs[j])) {
+					dev->data->mac_addrs[j] = macs[i];
+					break;
+				}
+			}
+		} else {
+			/* Find the first entry available. */
+			for (j = 0; j != MLX5_MAX_UC_MAC_ADDRESSES; ++j) {
+				if (rte_is_zero_ether_addr(
+						&dev->data->mac_addrs[j])) {
+					dev->data->mac_addrs[j] = macs[i];
+					break;
+				}
 			}
 		}
 	}
Signature · 4 lines
2.9.3.windows.1


Notice: This e-mail together with any attachments may contain information of Ribbon Communications Inc. and its Affiliates that is confidential and/or proprietary for the sole use of the intended recipient. Any review, disclosure, reliance or distribution by others or forwarding without express permission is strictly prohibited. If you are not the intended recipient, please notify the sender immediately and then delete all copies, including any attachments.