netdev - Re: [PATCH net-next 1/4] net: bridge: Extract a helper to handle bridge

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <d23db9cd-d9ec-4697-a851-3b395c6afae9@blackwall.org>
Date: Fri, 20 Dec 2024 14:27:30 +0200
From: Nikolay Aleksandrov <razor@...ckwall.org>
To: Petr Machata <petrm@...dia.com>, "David S. Miller" <davem@...emloft.net>,
 Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,
 Paolo Abeni <pabeni@...hat.com>, netdev@...r.kernel.org
Cc: Simon Horman <horms@...nel.org>, Roopa Prabhu <roopa@...dia.com>,
 bridge@...ts.linux.dev, Ido Schimmel <idosch@...dia.com>, mlxsw@...dia.com
Subject: Re: [PATCH net-next 1/4] net: bridge: Extract a helper to handle
 bridge_binding toggles

On 12/18/24 19:15, Petr Machata wrote:
> Currently, the BROPT_VLAN_BRIDGE_BINDING bridge option is only toggled when
> VLAN devices are added on top of a bridge or removed from it. Extract the
> toggling of the option to a function so that it could be invoked by a
> subsequent patch when the state of an upper VLAN device changes.
> 
> Signed-off-by: Petr Machata <petrm@...dia.com>
> Reviewed-by: Ido Schimmel <idosch@...dia.com>
> ---
>  net/bridge/br_vlan.c | 20 ++++++++++++++------
>  1 file changed, 14 insertions(+), 6 deletions(-)
> 
> diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
> index 89f51ea4cabe..b728b71e693f 100644
> --- a/net/bridge/br_vlan.c
> +++ b/net/bridge/br_vlan.c
> @@ -1664,6 +1664,18 @@ static void br_vlan_set_all_vlan_dev_state(struct net_bridge_port *p)
>  	}
>  }
>  
> +static void br_vlan_toggle_bridge_binding(struct net_device *br_dev,
> +					  bool enable)
> +{
> +	struct net_bridge *br = netdev_priv(br_dev);
> +
> +	if (enable)
> +		br_opt_toggle(br, BROPT_VLAN_BRIDGE_BINDING, true);
> +	else
> +		br_opt_toggle(br, BROPT_VLAN_BRIDGE_BINDING,
> +			      br_vlan_has_upper_bind_vlan_dev(br_dev));
> +}
> +
>  static void br_vlan_upper_change(struct net_device *dev,
>  				 struct net_device *upper_dev,
>  				 bool linking)
> @@ -1673,13 +1685,9 @@ static void br_vlan_upper_change(struct net_device *dev,
>  	if (!br_vlan_is_bind_vlan_dev(upper_dev))
>  		return;
>  
> -	if (linking) {
> +	br_vlan_toggle_bridge_binding(dev, linking);
> +	if (linking)
>  		br_vlan_set_vlan_dev_state(br, upper_dev);
> -		br_opt_toggle(br, BROPT_VLAN_BRIDGE_BINDING, true);
> -	} else {
> -		br_opt_toggle(br, BROPT_VLAN_BRIDGE_BINDING,
> -			      br_vlan_has_upper_bind_vlan_dev(dev));
> -	}
>  }
>  
>  struct br_vlan_link_state_walk_data {

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