iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mlxsw: spectrum_router: Introduce FIB entry update op

Browse Source 
Follow-up patchset introducing XMDR implementation is going to need
to distinguish write and update ops. Therefore introduce "update op"
and call "write op" only when new FIB entry is inserted.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jiri Pirko 2020-11-10 11:49:00 +02:00 committed by Jakub Kicinski
parent a005a7fe2f
commit 173f14cda3
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
View File

@ -4350,6 +4350,7 @@ mlxsw_sp_fib_entry_hw_flags_refresh(struct mlxsw_sp *mlxsw_sp,
{ {
switch (op) { switch (op) {
case MLXSW_SP_FIB_ENTRY_OP_WRITE: case MLXSW_SP_FIB_ENTRY_OP_WRITE:
case MLXSW_SP_FIB_ENTRY_OP_UPDATE:
mlxsw_sp_fib_entry_hw_flags_set(mlxsw_sp, fib_entry); mlxsw_sp_fib_entry_hw_flags_set(mlxsw_sp, fib_entry);
break; break;
case MLXSW_SP_FIB_ENTRY_OP_DELETE: case MLXSW_SP_FIB_ENTRY_OP_DELETE:
@ -4381,6 +4382,7 @@ mlxsw_sp_router_ll_basic_fib_entry_pack(struct mlxsw_sp_fib_entry_op_ctx *op_ctx
switch (op) { switch (op) {
case MLXSW_SP_FIB_ENTRY_OP_WRITE: case MLXSW_SP_FIB_ENTRY_OP_WRITE:
case MLXSW_SP_FIB_ENTRY_OP_UPDATE:
ralue_op = MLXSW_REG_RALUE_OP_WRITE_WRITE; ralue_op = MLXSW_REG_RALUE_OP_WRITE_WRITE;
break; break;
case MLXSW_SP_FIB_ENTRY_OP_DELETE: case MLXSW_SP_FIB_ENTRY_OP_DELETE:
@ -4699,10 +4701,12 @@ static int mlxsw_sp_fib_entry_op(struct mlxsw_sp *mlxsw_sp,
static int __mlxsw_sp_fib_entry_update(struct mlxsw_sp *mlxsw_sp, static int __mlxsw_sp_fib_entry_update(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_fib_entry_op_ctx *op_ctx, struct mlxsw_sp_fib_entry_op_ctx *op_ctx,
struct mlxsw_sp_fib_entry *fib_entry) struct mlxsw_sp_fib_entry *fib_entry,
bool is_new)
{ {
return mlxsw_sp_fib_entry_op(mlxsw_sp, op_ctx, fib_entry, return mlxsw_sp_fib_entry_op(mlxsw_sp, op_ctx, fib_entry,
MLXSW_SP_FIB_ENTRY_OP_WRITE); is_new ? MLXSW_SP_FIB_ENTRY_OP_WRITE :
MLXSW_SP_FIB_ENTRY_OP_UPDATE);
} }
static int mlxsw_sp_fib_entry_update(struct mlxsw_sp *mlxsw_sp, static int mlxsw_sp_fib_entry_update(struct mlxsw_sp *mlxsw_sp,
@ -4711,7 +4715,7 @@ static int mlxsw_sp_fib_entry_update(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_fib_entry_op_ctx *op_ctx = mlxsw_sp->router->ll_op_ctx; struct mlxsw_sp_fib_entry_op_ctx *op_ctx = mlxsw_sp->router->ll_op_ctx;
mlxsw_sp_fib_entry_op_ctx_clear(op_ctx); mlxsw_sp_fib_entry_op_ctx_clear(op_ctx);
return __mlxsw_sp_fib_entry_update(mlxsw_sp, op_ctx, fib_entry); return __mlxsw_sp_fib_entry_update(mlxsw_sp, op_ctx, fib_entry, false);
} }
static int mlxsw_sp_fib_entry_del(struct mlxsw_sp *mlxsw_sp, static int mlxsw_sp_fib_entry_del(struct mlxsw_sp *mlxsw_sp,
@ -5091,11 +5095,12 @@ static int mlxsw_sp_fib_node_entry_link(struct mlxsw_sp *mlxsw_sp,
struct mlxsw_sp_fib_entry *fib_entry) struct mlxsw_sp_fib_entry *fib_entry)
{ {
struct mlxsw_sp_fib_node *fib_node = fib_entry->fib_node; struct mlxsw_sp_fib_node *fib_node = fib_entry->fib_node;
bool is_new = !fib_node->fib_entry;
int err; int err;
fib_node->fib_entry = fib_entry; fib_node->fib_entry = fib_entry;
err = __mlxsw_sp_fib_entry_update(mlxsw_sp, op_ctx, fib_entry); err = __mlxsw_sp_fib_entry_update(mlxsw_sp, op_ctx, fib_entry, is_new);
if (err) if (err)
goto err_fib_entry_update; goto err_fib_entry_update;
@ -5509,7 +5514,8 @@ static int mlxsw_sp_nexthop6_group_update(struct mlxsw_sp *mlxsw_sp,
* currently associated with it in the device's table is that * currently associated with it in the device's table is that
* of the old group. Start using the new one instead. * of the old group. Start using the new one instead.
*/ */
err = __mlxsw_sp_fib_entry_update(mlxsw_sp, op_ctx, &fib6_entry->common); err = __mlxsw_sp_fib_entry_update(mlxsw_sp, op_ctx,
&fib6_entry->common, false);
if (err) if (err)
goto err_fib_entry_update; goto err_fib_entry_update;

1
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h
View File

@ -84,6 +84,7 @@ struct mlxsw_sp_fib_entry_priv {
enum mlxsw_sp_fib_entry_op { enum mlxsw_sp_fib_entry_op {
MLXSW_SP_FIB_ENTRY_OP_WRITE, MLXSW_SP_FIB_ENTRY_OP_WRITE,
MLXSW_SP_FIB_ENTRY_OP_UPDATE,
MLXSW_SP_FIB_ENTRY_OP_DELETE, MLXSW_SP_FIB_ENTRY_OP_DELETE,
}; };