linux-toradex.git/net/bridge/br_stp.c, branch v4.4.13

bridge: Allow set bridge ageing time when switchdev disabled

2016-04-20T06:42:05+00:00

[ Upstream commit 5e263f712691615fb802f06c98d7638c378f5d11 ]

When NET_SWITCHDEV=n, switchdev_port_attr_set will return -EOPNOTSUPP,
we should ignore this error code and continue to set the ageing time.

Fixes: c62987bbd8a1 ("bridge: push bridge setting ageing_time down to switchdev")
Signed-off-by: Haishuang Yan 
Acked-by: Ido Schimmel 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

bridge: allow zero ageing time

2016-04-20T06:42:02+00:00

[ Upstream commit 4c656c13b254d598e83e586b7b4d36a2043dad85 ]

This fixes a regression in the bridge ageing time caused by:
commit c62987bbd8a1 ("bridge: push bridge setting ageing_time down to switchdev")

There are users of Linux bridge which use the feature that if ageing time
is set to 0 it causes entries to never expire. See:
  https://www.linuxfoundation.org/collaborate/workgroups/networking/bridge

For a pure software bridge, it is unnecessary for the code to have
arbitrary restrictions on what values are allowable.

Signed-off-by: Stephen Hemminger 
Acked-by: Jiri Pirko 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

switchdev: bridge: Check return code is not EOPNOTSUPP

2015-11-16T19:56:03+00:00

When NET_SWITCHDEV=n, switchdev_port_attr_set simply returns EOPNOTSUPP.
In this case we should not emit errors and warnings to the kernel log.

Reported-by: Sander Eikelenboom 
Tested-by: Christian Borntraeger 
Fixes: 0bc05d585d38 ("switchdev: allow caller to explicitly request
attr_set as deferred")
Fixes: 6ac311ae8bfb ("Adding switchdev ageing notification on port
bridged")
Signed-off-by: Ido Schimmel 
Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

Revert "bridge: Allow forward delay to be cfgd when STP enabled"

2015-11-10T20:41:36+00:00

This reverts commit 34c2d9fb0498c066afbe610b15e18995fd8be792.

There are 2 reasons for this revert:
 1)  The commit in question doesn't do what it says it does.  The
     description reads: "Allow bridge forward delay to be configured
     when Spanning Tree is enabled."  This was already the case before
     the commit was made.  What the commit actually do was disallow
     invalid values or 'forward_delay' when STP was turned off.

 2)  The above change was actually a change in the user observed
     behavior and broke things like libvirt and other network configs
     that set 'forward_delay' to 0 without enabling STP.  The value
     of 0 is actually used when STP is turned off to immediately mark
     the bridge as forwarding.

Signed-off-by: Vlad Yasevich 
Signed-off-by: David S. Miller

switchdev: allow caller to explicitly request attr_set as deferred

2015-10-15T13:09:48+00:00

Caller should know if he can call attr_set directly (when holding RTNL)
or if he has to defer the att_set processing for later.

This also allows drivers to sleep inside attr_set and report operation
status back to switchdev core. Switchdev core then warns if status is
not ok, instead of silent errors happening in drivers.

Benefit from newly introduced switchdev deferred ops infrastructure.

Signed-off-by: Jiri Pirko 
Signed-off-by: David S. Miller

bridge: push bridge setting ageing_time down to switchdev

2015-10-12T12:20:20+00:00

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: Scott Feldman 
Signed-off-by: Jiri Pirko 
Acked-by: Jiri Pirko 
Signed-off-by: David S. Miller

switchdev: rename SWITCHDEV_ATTR_* enum values to SWITCHDEV_ATTR_ID_*

2015-10-03T11:49:37+00:00

To be aligned with obj.

Signed-off-by: Jiri Pirko 
Acked-by: Scott Feldman 
Reviewed-by: Vivien Didelot 
Signed-off-by: David S. Miller

bridge: Allow forward delay to be cfgd when STP enabled

2015-09-28T02:09:38+00:00

Allow bridge forward delay to be configured when Spanning Tree is enabled.

Signed-off-by: Ian Wilson 
Signed-off-by: Stephen Hemminger 
Signed-off-by: David S. Miller

bridge: stp: when using userspace stp stop kernel hello and hold timers

2015-07-29T06:33:20+00:00

These should be handled only by the respective STP which is in control.
They become problematic for devices with limited resources with many
ports because the hold_timer is per port and fires each second and the
hello timer fires each 2 seconds even though it's global. While in
user-space STP mode these timers are completely unnecessary so it's better
to keep them off.
Also ensure that when the bridge is up these timers are started only when
running with kernel STP.

Signed-off-by: Satish Ashok 
Signed-off-by: Nikolay Aleksandrov 
Signed-off-by: David S. Miller

bridge: multicast: add a comment to br_port_state_selection about blocking state

2015-06-24T12:40:54+00:00

Add a comment to explain why we're not disabling port's multicast when it
goes in blocking state. Since there's a check in the timer's function which
bypasses the timer if the port's in blocking/disabled state, the timer will
simply expire and stop without sending more queries.

Suggested-by: Herbert Xu 
Signed-off-by: Nikolay Aleksandrov 
Acked-by: Herbert Xu 
Signed-off-by: David S. Miller