From: Ido Schimmel <idosch@nvidia.com>
Date: Wed, 25 Nov 2020 19:35:03 +0000 (+0200)
Subject: mlxsw: spectrum_router: Rollback virtual router adjacency pointer update
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9a4ab10c74a0badeed2085ad42513d3f3c44ff7a;p=linux.git

mlxsw: spectrum_router: Rollback virtual router adjacency pointer update

In the rare case where the adjacency pointer cannot be updated for a
given virtual router, rollback the operation so that virtual routers
that are already using the new index will use the old one again.

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index b229f28f62096..316182d6c1e3f 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -3279,9 +3279,22 @@ static int mlxsw_sp_adj_index_mass_update(struct mlxsw_sp *mlxsw_sp,
 							nhgi->adj_index,
 							nhgi->ecmp_size);
 		if (err)
-			return err;
+			goto err_mass_update_vr;
 	}
 	return 0;
+
+err_mass_update_vr:
+	list_for_each_entry_continue_reverse(fib_entry, &nh_grp->fib_list,
+					     nexthop_group_node) {
+		struct mlxsw_sp_nexthop_group_info *nhgi = nh_grp->nhgi;
+
+		fib = fib_entry->fib_node->fib;
+		mlxsw_sp_adj_index_mass_update_vr(mlxsw_sp, fib->proto,
+						  fib->vr->id, nhgi->adj_index,
+						  nhgi->ecmp_size,
+						  old_adj_index, old_ecmp_size);
+	}
+	return err;
 }
 
 static int __mlxsw_sp_nexthop_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index,