This is a note to let you know that I've just added the patch titled
net/mlx4_core: Don't give VFs MAC addresses which are derived from the PF
MAC
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-mlx4_core-don-t-give-vfs-mac-addresses-which-are-derived-from-the-pf-mac.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 53d4517253579a520aed8c897b175b2256b517b7 Mon Sep 17 00:00:00 2001
From: Or Gerlitz <[email protected]>
Date: Thu, 1 Aug 2013 19:55:00 +0300
Subject: net/mlx4_core: Don't give VFs MAC addresses which are derived from the
PF MAC
From: Or Gerlitz <[email protected]>
[ Upstream commit 0508ad646836007e6e6b62331eee7356844eac3d ]
If the user has not assigned a MAC address to a VM, then don't give it MAC which
is based on the PF one. The current derivation scheme is wrong and leads to VM
MAC collisions when the number of cards/hypervisors becomes big enough.
Instead, just give it zeros and let them figure out what to do with that.
Signed-off-by: Or Gerlitz <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/net/ethernet/mellanox/mlx4/fw.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -840,16 +840,7 @@ int mlx4_QUERY_PORT_wrapper(struct mlx4_
MLX4_CMD_NATIVE);
if (!err && dev->caps.function != slave) {
- /* if config MAC in DB use it */
- if
(priv->mfunc.master.vf_oper[slave].vport[vhcr->in_modifier].state.mac)
- def_mac =
priv->mfunc.master.vf_oper[slave].vport[vhcr->in_modifier].state.mac;
- else {
- /* set slave default_mac address */
- MLX4_GET(def_mac, outbox->buf, QUERY_PORT_MAC_OFFSET);
- def_mac += slave << 8;
-
priv->mfunc.master.vf_admin[slave].vport[vhcr->in_modifier].mac = def_mac;
- }
-
+ def_mac =
priv->mfunc.master.vf_oper[slave].vport[vhcr->in_modifier].state.mac;
MLX4_PUT(outbox->buf, def_mac, QUERY_PORT_MAC_OFFSET);
/* get port type - currently only eth is enabled */
Patches currently in stable-queue which might be from [email protected] are
queue-3.10/net-mlx4_core-vfs-must-ignore-the-enable_64b_cqe_eqe-module-param.patch
queue-3.10/net-mlx4_core-don-t-give-vfs-mac-addresses-which-are-derived-from-the-pf-mac.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
