Re: [PATCH net-next v4 1/6] net: bridge: Set BR_FDB_ADDED_BY_USER early in fdb_add_entry

Nikolay Aleksandrov
2023-09-20T10:44:32Z

On 9/19/23 11:12, Johannes Nixdorf wrote:
> In preparation of the following fdb limit for dynamically learned entries,
> allow fdb_create to detect that the entry was added by the user. This
> way it can skip applying the limit in this case.
>
> Signed-off-by: Johannes Nixdorf <jnixdorf-oss@avm.de>
> ---
> net/bridge/br_fdb.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
> index e69a872bfc1d..f517ea92132c 100644
> --- a/net/bridge/br_fdb.c
> +++ b/net/bridge/br_fdb.c
> @@ -1056,7 +1056,8 @@ static int fdb_add_entry(struct net_bridge *br, struct net_bridge_port *source,
> if (!(flags & NLM_F_CREATE))
> return -ENOENT;
>
> - fdb = fdb_create(br, source, addr, vid, 0);
> + fdb = fdb_create(br, source, addr, vid,
> + BIT(BR_FDB_ADDED_BY_USER));
> if (!fdb)
> return -ENOMEM;
>
> @@ -1069,6 +1070,8 @@ static int fdb_add_entry(struct net_bridge *br, struct net_bridge_port *source,
> WRITE_ONCE(fdb->dst, source);
> modified = true;
> }
> +
> + set_bit(BR_FDB_ADDED_BY_USER, &fdb->flags);
> }
>
> if (fdb_to_nud(br, fdb) != state) {
> @@ -1100,8 +1103,6 @@ static int fdb_add_entry(struct net_bridge *br, struct net_bridge_port *source,
> if (fdb_handle_notify(fdb, notify))
> modified = true;
>
> - set_bit(BR_FDB_ADDED_BY_USER, &fdb->flags);
> -
> fdb->used = jiffies;
> if (modified) {
> if (refresh)
>

Acked-by: Nikolay Aleksandrov <razor@blackwall.org>