Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c62987bb authored by Scott Feldman's avatar Scott Feldman Committed by David S. Miller
Browse files

bridge: push bridge setting ageing_time down to switchdev 



Use SWITCHDEV_F_SKIP_EOPNOTSUPP to skip over ports in bridge that don't
support setting ageing_time (or setting bridge attrs in general).

If push fails, don't update ageing_time in bridge and return err to user.

If push succeeds, update ageing_time in bridge and run gc_timer now to
recalabrate when to run gc_timer next, based on new ageing_time.

Signed-off-by: default avatarScott Feldman <sfeldma@gmail.com>
Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 464314ea

net/bridge/br_ioctl.c

+1 −2
Original line number Diff line number Diff line
@@ -200,8 +200,7 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
		if (!ns_capable(dev_net(dev)->user_ns, CAP_NET_ADMIN))

			return -EPERM;



		br->ageing_time = clock_t_to_jiffies(args[1]);

		return 0;

		return br_set_ageing_time(br, args[1]);



	case BRCTL_GET_PORT_INFO:

	{

net/bridge/br_netlink.c

+3 −3
Original line number Diff line number Diff line
@@ -870,9 +870,9 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[], 
	}



	if (data[IFLA_BR_AGEING_TIME]) {

		u32 ageing_time = nla_get_u32(data[IFLA_BR_AGEING_TIME]);



		br->ageing_time = clock_t_to_jiffies(ageing_time);

		err = br_set_ageing_time(br, nla_get_u32(data[IFLA_BR_AGEING_TIME]));

		if (err)

			return err;

	}



	if (data[IFLA_BR_STP_STATE]) {

net/bridge/br_private.h

+1 −0
Original line number Diff line number Diff line
@@ -882,6 +882,7 @@ void __br_set_forward_delay(struct net_bridge *br, unsigned long t); 
int br_set_forward_delay(struct net_bridge *br, unsigned long x);

int br_set_hello_time(struct net_bridge *br, unsigned long x);

int br_set_max_age(struct net_bridge *br, unsigned long x);

int br_set_ageing_time(struct net_bridge *br, u32 ageing_time);





/* br_stp_if.c */

net/bridge/br_stp.c

+23 −0
Original line number Diff line number Diff line
@@ -566,6 +566,29 @@ int br_set_max_age(struct net_bridge *br, unsigned long val) 


}



int br_set_ageing_time(struct net_bridge *br, u32 ageing_time)

{

	struct switchdev_attr attr = {

		.id = SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME,

		.flags = SWITCHDEV_F_SKIP_EOPNOTSUPP,

		.u.ageing_time = ageing_time,

	};

	unsigned long t = clock_t_to_jiffies(ageing_time);

	int err;



	if (t < BR_MIN_AGEING_TIME || t > BR_MAX_AGEING_TIME)

		return -ERANGE;



	err = switchdev_port_attr_set(br->dev, &attr);

	if (err)

		return err;



	br->ageing_time = t;

	mod_timer(&br->gc_timer, jiffies);



	return 0;

}



void __br_set_forward_delay(struct net_bridge *br, unsigned long t)

{

	br->bridge_forward_delay = t;

net/bridge/br_sysfs_br.c

+1 −2
Original line number Diff line number Diff line
@@ -102,8 +102,7 @@ static ssize_t ageing_time_show(struct device *d, 


static int set_ageing_time(struct net_bridge *br, unsigned long val)

{

	br->ageing_time = clock_t_to_jiffies(val);

	return 0;

	return br_set_ageing_time(br, val);

}



static ssize_t ageing_time_store(struct device *d,