mlxsw: spectrum_router: Expose router struct to internal users

The dpipe code accesses internal router data structures and acquires
RTNL to protect against their changes. Subsequent patches will remove
reliance on RTNL and introduce a dedicated lock to protect router data
structures.

Publish the router struct to internal users such as the dpipe, so that
they could acquire it instead of RTNL.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 634a9a949777d7a0b98a88aef3a47665a84d8e81..991095f66fc204d3f3a9315d731e58a96e5d7c5a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -48,39 +48,6 @@ struct mlxsw_sp_vr;
 struct mlxsw_sp_lpm_tree;
 struct mlxsw_sp_rif_ops;
 
-struct mlxsw_sp_router {
-       struct mlxsw_sp *mlxsw_sp;
-       struct mlxsw_sp_rif **rifs;
-       struct mlxsw_sp_vr *vrs;
-       struct rhashtable neigh_ht;
-       struct rhashtable nexthop_group_ht;
-       struct rhashtable nexthop_ht;
-       struct list_head nexthop_list;
-       struct {
-               /* One tree for each protocol: IPv4 and IPv6 */
-               struct mlxsw_sp_lpm_tree *proto_trees[2];
-               struct mlxsw_sp_lpm_tree *trees;
-               unsigned int tree_count;
-       } lpm;
-       struct {
-               struct delayed_work dw;
-               unsigned long interval; /* ms */
-       } neighs_update;
-       struct delayed_work nexthop_probe_dw;
-#define MLXSW_SP_UNRESOLVED_NH_PROBE_INTERVAL 5000 /* ms */
-       struct list_head nexthop_neighs_list;
-       struct list_head ipip_list;
-       bool aborted;
-       struct notifier_block fib_nb;
-       struct notifier_block netevent_nb;
-       struct notifier_block inetaddr_nb;
-       struct notifier_block inet6addr_nb;
-       const struct mlxsw_sp_rif_ops **rif_ops_arr;
-       const struct mlxsw_sp_ipip_ops **ipip_ops_arr;
-       u32 adj_discard_index;
-       bool adj_discard_index_valid;
-};
-
 struct mlxsw_sp_rif {
        struct list_head nexthop_list;
        struct list_head neigh_list;

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h
index c9b94f435cddd568d5c83a5b3d2e4373850eaf03..b2554727d8ee5cf7f1a2cc14676a62ae34bcfe3d 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h
@@ -7,6 +7,39 @@
 #include "spectrum.h"
 #include "reg.h"
 
+struct mlxsw_sp_router {
+       struct mlxsw_sp *mlxsw_sp;
+       struct mlxsw_sp_rif **rifs;
+       struct mlxsw_sp_vr *vrs;
+       struct rhashtable neigh_ht;
+       struct rhashtable nexthop_group_ht;
+       struct rhashtable nexthop_ht;
+       struct list_head nexthop_list;
+       struct {
+               /* One tree for each protocol: IPv4 and IPv6 */
+               struct mlxsw_sp_lpm_tree *proto_trees[2];
+               struct mlxsw_sp_lpm_tree *trees;
+               unsigned int tree_count;
+       } lpm;
+       struct {
+               struct delayed_work dw;
+               unsigned long interval; /* ms */
+       } neighs_update;
+       struct delayed_work nexthop_probe_dw;
+#define MLXSW_SP_UNRESOLVED_NH_PROBE_INTERVAL 5000 /* ms */
+       struct list_head nexthop_neighs_list;
+       struct list_head ipip_list;
+       bool aborted;
+       struct notifier_block fib_nb;
+       struct notifier_block netevent_nb;
+       struct notifier_block inetaddr_nb;
+       struct notifier_block inet6addr_nb;
+       const struct mlxsw_sp_rif_ops **rif_ops_arr;
+       const struct mlxsw_sp_ipip_ops **ipip_ops_arr;
+       u32 adj_discard_index;
+       bool adj_discard_index_valid;
+};
+
 struct mlxsw_sp_rif_ipip_lb;
 struct mlxsw_sp_rif_ipip_lb_config {
        enum mlxsw_reg_ritr_loopback_ipip_type lb_ipipt;