net/mlx5e: Store eswitch uplink representor state on a dedicated struct

Currently only a single field in the representor private structure
is relevant for uplink representors.  As a pre-step to allow adding
additional uplink representor fields, introduce uplink representor
private structure.

This is prepration step towards replacing egdev logic with the
indirect block notification mechanism. This patch doesn't change
any functionality.

Signed-off-by: Oz Shlomo <[email protected]>
Reviewed-by: Eli Britstein <[email protected]>
Acked-by: Or Gerlitz <[email protected]>
Signed-off-by: Saeed Mahameed <[email protected]>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index a137540b84bf0cc634438464a5a40f1054c373be..25a656b50264cddefdc70140f83229bbffed98cb 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -1244,7 +1244,7 @@ mlx5e_nic_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)
 {
        struct mlx5e_rep_priv *rpriv = mlx5e_rep_to_rep_priv(rep);
        struct mlx5e_priv *priv = netdev_priv(rpriv->netdev);
-
+       struct mlx5_rep_uplink_priv *uplink_priv = &rpriv->uplink_priv;
        int err;
 
        if (test_bit(MLX5E_STATE_OPENED, &priv->state)) {
@@ -1258,7 +1258,7 @@ mlx5e_nic_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)
                goto err_remove_sqs;
 
        /* init shared tc flow table */
-       err = mlx5e_tc_esw_init(&rpriv->tc_ht);
+       err = mlx5e_tc_esw_init(&uplink_priv->tc_ht);
        if (err)
                goto  err_neigh_cleanup;
 
@@ -1281,7 +1281,7 @@ mlx5e_nic_rep_unload(struct mlx5_eswitch_rep *rep)
                mlx5e_remove_sqs_fwd_rules(priv);
 
        /* clean uplink offloaded TC rules, delete shared tc flow table */
-       mlx5e_tc_esw_cleanup(&rpriv->tc_ht);
+       mlx5e_tc_esw_cleanup(&rpriv->uplink_priv.tc_ht);
 
        mlx5e_rep_neigh_cleanup(rpriv);
 }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
index 844d32d5c29f051386c525c0a8f89063340c7550..8d39c5c59aebddf97b682ae9565ac536ee8a27a7 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.h
@@ -53,13 +53,20 @@ struct mlx5e_neigh_update_table {
        unsigned long           min_interval; /* jiffies */
 };
 
+struct mlx5_rep_uplink_priv {
+       /* Filters DB - instantiated by the uplink representor and shared by
+        * the uplink's VFs
+        */
+       struct rhashtable  tc_ht;
+};
+
 struct mlx5e_rep_priv {
        struct mlx5_eswitch_rep *rep;
        struct mlx5e_neigh_update_table neigh_update;
        struct net_device      *netdev;
        struct mlx5_flow_handle *vport_rx_rule;
        struct list_head       vport_sqs_list;
-       struct rhashtable      tc_ht; /* valid for uplink rep */
+       struct mlx5_rep_uplink_priv uplink_priv; /* valid for uplink rep */
 };
 
 static inline

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index a3ff2492646d7a29b53d1003f98df85e218d3c8d..42eb6ee377549fbf82528eed55c683a47095b1ef 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -3018,7 +3018,7 @@ static struct rhashtable *get_tc_ht(struct mlx5e_priv *priv)
 
        if (MLX5_VPORT_MANAGER(priv->mdev) && esw->mode == SRIOV_OFFLOADS) {
                uplink_rpriv = mlx5_eswitch_get_uplink_priv(esw, REP_ETH);
-               return &uplink_rpriv->tc_ht;
+               return &uplink_rpriv->uplink_priv.tc_ht;
        } else
                return &priv->fs.tc.ht;
 }