Commit 446f7391 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

ipv4: Remove old route notifications and convert listeners 



Unlike mlxsw, the other listeners to the FIB notification chain do not
require any special modifications as they never considered multiple
identical routes.

This patch removes the old route notifications and converts all the
listeners to use the new replace / delete notifications.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b6a1d871

drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c

+0 −4
Original line number Diff line number Diff line
@@ -200,8 +200,6 @@ static void mlx5_lag_fib_update(struct work_struct *work) 
	rtnl_lock();

	switch (fib_work->event) {

	case FIB_EVENT_ENTRY_REPLACE: /* fall through */

	case FIB_EVENT_ENTRY_APPEND: /* fall through */

	case FIB_EVENT_ENTRY_ADD: /* fall through */

	case FIB_EVENT_ENTRY_DEL:

		mlx5_lag_fib_route_event(ldev, fib_work->event,

					 fib_work->fen_info.fi);
@@ -259,8 +257,6 @@ static int mlx5_lag_fib_event(struct notifier_block *nb, 


	switch (event) {

	case FIB_EVENT_ENTRY_REPLACE: /* fall through */

	case FIB_EVENT_ENTRY_APPEND: /* fall through */

	case FIB_EVENT_ENTRY_ADD: /* fall through */

	case FIB_EVENT_ENTRY_DEL:

		fen_info = container_of(info, struct fib_entry_notifier_info,

					info);

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

+5 −6
Original line number Diff line number Diff line
@@ -6007,14 +6007,14 @@ static void mlxsw_sp_router_fib4_event_work(struct work_struct *work) 
	mlxsw_sp_span_respin(mlxsw_sp);



	switch (fib_work->event) {

	case FIB_EVENT_ENTRY_REPLACE_TMP:

	case FIB_EVENT_ENTRY_REPLACE:

		err = mlxsw_sp_router_fib4_replace(mlxsw_sp,

						   &fib_work->fen_info);

		if (err)

			mlxsw_sp_router_fib_abort(mlxsw_sp);

		fib_info_put(fib_work->fen_info.fi);

		break;

	case FIB_EVENT_ENTRY_DEL_TMP:

	case FIB_EVENT_ENTRY_DEL:

		mlxsw_sp_router_fib4_del(mlxsw_sp, &fib_work->fen_info);

		fib_info_put(fib_work->fen_info.fi);

		break;
@@ -6111,8 +6111,8 @@ static void mlxsw_sp_router_fib4_event(struct mlxsw_sp_fib_event_work *fib_work, 
	struct fib_nh_notifier_info *fnh_info;



	switch (fib_work->event) {

	case FIB_EVENT_ENTRY_REPLACE_TMP: /* fall through */

	case FIB_EVENT_ENTRY_DEL_TMP:

	case FIB_EVENT_ENTRY_REPLACE: /* fall through */

	case FIB_EVENT_ENTRY_DEL:

		fen_info = container_of(info, struct fib_entry_notifier_info,

					info);

		fib_work->fen_info = *fen_info;
@@ -6243,8 +6243,7 @@ static int mlxsw_sp_router_fib_event(struct notifier_block *nb, 
						     router->mlxsw_sp);

		return notifier_from_errno(err);

	case FIB_EVENT_ENTRY_ADD: /* fall through */

	case FIB_EVENT_ENTRY_REPLACE: /* fall through */

	case FIB_EVENT_ENTRY_REPLACE_TMP:

	case FIB_EVENT_ENTRY_REPLACE:

		if (router->aborted) {

			NL_SET_ERR_MSG_MOD(info->extack, "FIB offload was aborted. Not configuring route");

			return notifier_from_errno(-EINVAL);

drivers/net/ethernet/rocker/rocker_main.c

+2 −2
Original line number Diff line number Diff line
@@ -2159,7 +2159,7 @@ static void rocker_router_fib_event_work(struct work_struct *work) 
	/* Protect internal structures from changes */

	rtnl_lock();

	switch (fib_work->event) {

	case FIB_EVENT_ENTRY_ADD:

	case FIB_EVENT_ENTRY_REPLACE:

		err = rocker_world_fib4_add(rocker, &fib_work->fen_info);

		if (err)

			rocker_world_fib4_abort(rocker);
@@ -2201,7 +2201,7 @@ static int rocker_router_fib_event(struct notifier_block *nb, 
	fib_work->event = event;



	switch (event) {

	case FIB_EVENT_ENTRY_ADD: /* fall through */

	case FIB_EVENT_ENTRY_REPLACE: /* fall through */

	case FIB_EVENT_ENTRY_DEL:

		if (info->family == AF_INET) {

			struct fib_entry_notifier_info *fen_info = ptr;

drivers/net/netdevsim/fib.c

+2 −2
Original line number Diff line number Diff line
@@ -177,10 +177,10 @@ static int nsim_fib_event_nb(struct notifier_block *nb, unsigned long event, 
					  event == FIB_EVENT_RULE_ADD);

		break;



	case FIB_EVENT_ENTRY_REPLACE:  /* fall through */

	case FIB_EVENT_ENTRY_ADD:  /* fall through */

	case FIB_EVENT_ENTRY_DEL:

		err = nsim_fib_event(data, info,

				     event == FIB_EVENT_ENTRY_ADD);

		err = nsim_fib_event(data, info, event != FIB_EVENT_ENTRY_DEL);

		break;

	}

include/net/fib_notifier.h

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ enum fib_event_type { 
	FIB_EVENT_NH_DEL,

	FIB_EVENT_VIF_ADD,

	FIB_EVENT_VIF_DEL,

	FIB_EVENT_ENTRY_REPLACE_TMP,

	FIB_EVENT_ENTRY_DEL_TMP,

};



struct fib_notifier_ops {

CRA Git | Maintained and supported by SUSTech CRA and CCSE