Patch "net/mlx5e: Set uplink rep as NETNS_LOCAL" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    net/mlx5e: Set uplink rep as NETNS_LOCAL

to the 6.1-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-mlx5e-set-uplink-rep-as-netns_local.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 5db503c287a3d6043e13e8f6be849a6878061010
Author: Gavin Li <gavinl@xxxxxxxxxx>
Date:   Fri Nov 25 04:15:40 2022 +0200

    net/mlx5e: Set uplink rep as NETNS_LOCAL
    
    [ Upstream commit c83172b0639c8a005c0dd3b36252dc22ddd9f19c ]
    
    Previously, NETNS_LOCAL was not set for uplink representors, inconsistent
    with VF representors, and allowed the uplink representor to be moved
    between net namespaces and separated from the VF representors it shares
    the core device with. Such usage would break the isolation model of
    namespaces, as devices in different namespaces would have access to
    shared memory.
    
    To solve this issue, set NETNS_LOCAL for uplink representors if eswitch is
    in switchdev mode.
    
    Fixes: 7a9fb35e8c3a ("net/mlx5e: Do not reload ethernet ports when changing eswitch mode")
    Signed-off-by: Gavin Li <gavinl@xxxxxxxxxx>
    Reviewed-by: Gavi Teitz <gavi@xxxxxxxxxx>
    Signed-off-by: Saeed Mahameed <saeedm@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 609a49c1e09e6..3b5c5064cfafc 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -4081,8 +4081,12 @@ static netdev_features_t mlx5e_fix_features(struct net_device *netdev,
 		}
 	}
 
-	if (mlx5e_is_uplink_rep(priv))
+	if (mlx5e_is_uplink_rep(priv)) {
 		features = mlx5e_fix_uplink_rep_features(netdev, features);
+		features |= NETIF_F_NETNS_LOCAL;
+	} else {
+		features &= ~NETIF_F_NETNS_LOCAL;
+	}
 
 	mutex_unlock(&priv->state_lock);