Commit 3f9e5c11 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: spectrum_router: Don't rely on missing extack to symbolize dump 



Currently if info->extack is NULL, mlxsw assumes that the event came
down from dump. Originally, the dump did not propagate the return value
back to the original caller (fib_notifier_register()). However, that is
now happening. So benefit from this and push the error up if it happened.
Remove rule cases in work handlers that are now dead code.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 55c894f7

drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

+1 −21
Original line number Diff line number Diff line
@@ -6019,12 +6019,6 @@ static void mlxsw_sp_router_fib4_event_work(struct work_struct *work) 
		mlxsw_sp_router_fib4_del(mlxsw_sp, &fib_work->fen_info);

		fib_info_put(fib_work->fen_info.fi);

		break;

	case FIB_EVENT_RULE_ADD:

		/* if we get here, a rule was added that we do not support.

		 * just do the fib_abort

		 */

		mlxsw_sp_router_fib_abort(mlxsw_sp);

		break;

	case FIB_EVENT_NH_ADD: /* fall through */

	case FIB_EVENT_NH_DEL:

		mlxsw_sp_nexthop4_event(mlxsw_sp, fib_work->event,
@@ -6065,12 +6059,6 @@ static void mlxsw_sp_router_fib6_event_work(struct work_struct *work) 
					 fib_work->fib6_work.nrt6);

		mlxsw_sp_router_fib6_work_fini(&fib_work->fib6_work);

		break;

	case FIB_EVENT_RULE_ADD:

		/* if we get here, a rule was added that we do not support.

		 * just do the fib_abort

		 */

		mlxsw_sp_router_fib_abort(mlxsw_sp);

		break;

	}

	rtnl_unlock();

	kfree(fib_work);
@@ -6112,12 +6100,6 @@ static void mlxsw_sp_router_fibmr_event_work(struct work_struct *work) 
					      &fib_work->ven_info);

		dev_put(fib_work->ven_info.dev);

		break;

	case FIB_EVENT_RULE_ADD:

		/* if we get here, a rule was added that we do not support.

		 * just do the fib_abort

		 */

		mlxsw_sp_router_fib_abort(mlxsw_sp);

		break;

	}

	rtnl_unlock();

	kfree(fib_work);
@@ -6262,9 +6244,7 @@ static int mlxsw_sp_router_fib_event(struct notifier_block *nb, 
	case FIB_EVENT_RULE_DEL:

		err = mlxsw_sp_router_fib_rule_event(event, info,

						     router->mlxsw_sp);

		if (!err || info->extack)

		return notifier_from_errno(err);

		break;

	case FIB_EVENT_ENTRY_ADD:

	case FIB_EVENT_ENTRY_REPLACE: /* fall through */

	case FIB_EVENT_ENTRY_APPEND:  /* fall through */

CRA Git | Maintained and supported by SUSTech CRA and CCSE