net: Add lag.h, net_lag_port_dev_txable() (eeed992b) · Commits · 戴 / test

LAG devices (team or bond) recognize for each one of their slave devices whether LAG traffic is going to be sent through that device. Bond calls such devices "active", team calls them "txable". When this state changes, a NETDEV_CHANGELOWERSTATE notification is distributed, together with a netdev_notifier_changelowerstate_info structure that for LAG devices includes a tx_enabled flag that refers to the new state. The notification thus makes it possible to react to the changes in txability in drivers. However there's no way to query txability from the outside on demand. That is problematic namely for mlxsw, which when resolving ERSPAN packet path, may encounter a LAG device, and needs to determine which of the slaves it should choose. To that end, introduce a new function, net_lag_port_dev_txable(), which determines whether a given slave device is "active" or "txable" (depending on the flavor of the LAG device). That function then dispatches to per-LAG-flavor helpers, bond_is_active_slave_dev() resp. team_port_dev_txable(). Because there currently is no good place where net_lag_port_dev_txable() should be added, introduce a new header file, lag.h, which should from now on hold any logic common to both team and bond. (But keep netif_is_lag_master() together with the rest of netif_is_*_master() functions). Signed-off-by:

Petr Machata <petrm@mellanox.com> Reviewed-by:

Jiri Pirko <jiri@mellanox.com> Signed-off-by:

Ido Schimmel <idosch@mellanox.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

include/linux/if_team.h

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -89,6 +89,19 @@ static inline bool team_port_txable(struct team_port *port)
	return port->linkup && team_port_enabled(port);		return port->linkup && team_port_enabled(port);
	}		}

			static inline bool team_port_dev_txable(const struct net_device *port_dev)
			{
			struct team_port *port;
			bool txable;

			rcu_read_lock();
			port = team_port_get_rcu(port_dev);
			txable = port ? team_port_txable(port) : false;
			rcu_read_unlock();

			return txable;
			}

	#ifdef CONFIG_NET_POLL_CONTROLLER		#ifdef CONFIG_NET_POLL_CONTROLLER
	static inline void team_netpoll_send_skb(struct team_port *port,		static inline void team_netpoll_send_skb(struct team_port *port,
	struct sk_buff *skb)		struct sk_buff *skb)

include/net/bonding.h

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -411,6 +411,19 @@ static inline bool bond_slave_can_tx(struct slave *slave)
	bond_is_active_slave(slave);		bond_is_active_slave(slave);
	}		}

			static inline bool bond_is_active_slave_dev(const struct net_device *slave_dev)
			{
			struct slave *slave;
			bool active;

			rcu_read_lock();
			slave = bond_slave_get_rcu(slave_dev);
			active = bond_is_active_slave(slave);
			rcu_read_unlock();

			return active;
			}

	static inline void bond_hw_addr_copy(u8 dst, const u8 src, unsigned int len)		static inline void bond_hw_addr_copy(u8 dst, const u8 src, unsigned int len)
	{		{
	if (len == ETH_ALEN) {		if (len == ETH_ALEN) {

include/net/lag.h

0 → 100644

+17 −0

Original line number	Original line	Diff line number	Diff line
			/* SPDX-License-Identifier: GPL-2.0 */
			#ifndef _LINUX_IF_LAG_H
			#define _LINUX_IF_LAG_H

			#include <linux/netdevice.h>
			#include <linux/if_team.h>
			#include <net/bonding.h>

			static inline bool net_lag_port_dev_txable(const struct net_device *port_dev)
			{
			if (netif_is_team_port(port_dev))
			return team_port_dev_txable(port_dev);
			else
			return bond_is_active_slave_dev(port_dev);
			}

			#endif /* _LINUX_IF_LAG_H */

Admin message