From: sfeldma@gmail.com
To: netdev@vger.kernel.org
Cc: jiri@resnulli.us, siva.mannem.lnx@gmail.com,
pjonnala@broadcom.com, stephen@networkplumber.org,
roopa@cumulusnetworks.com, andrew@lunn.ch, f.fainelli@gmail.com,
vivien.didelot@savoirfairelinux.com
Subject: [PATCH net-next 3/4] bridge: push bridge setting ageing_time down to switchdev
Date: Thu, 24 Sep 2015 13:59:29 -0700 [thread overview]
Message-ID: <1443128370-27353-4-git-send-email-sfeldma@gmail.com> (raw)
In-Reply-To: <1443128370-27353-1-git-send-email-sfeldma@gmail.com>
From: Scott Feldman <sfeldma@gmail.com>
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 <sfeldma@gmail.com>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
---
net/bridge/br_ioctl.c | 3 +--
net/bridge/br_netlink.c | 6 +++---
net/bridge/br_private.h | 1 +
net/bridge/br_stp.c | 24 ++++++++++++++++++++++++
net/bridge/br_sysfs_br.c | 3 +--
5 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index 8d423bc..263b4de 100644
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -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:
{
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index ea748c9..6dbdd4d 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -774,9 +774,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]) {
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 74e99c7..dc4b390 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -808,6 +808,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 */
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index ed74ffa..6241bab 100644
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -566,6 +566,30 @@ 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_BRIDGE,
+ .flags = SWITCHDEV_F_SKIP_EOPNOTSUPP,
+ .u.bridge.attr = IFLA_BR_AGEING_TIME,
+ .u.bridge.val = 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;
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index 4c97fc5..04ef192 100644
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -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,
--
1.7.10.4
next prev parent reply other threads:[~2015-09-24 20:56 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-24 20:59 [PATCH net-next 0/4] switchdev: push bridge attributes down sfeldma
2015-09-24 20:59 ` [PATCH net-next 1/4] switchdev: add bridge attributes sfeldma
2015-09-25 4:32 ` Premkumar Jonnala
2015-09-25 5:51 ` David Miller
2015-09-24 20:59 ` [PATCH net-next 2/4] switchdev: skip over ports returning -EOPNOTSUPP when recursing ports sfeldma
2015-09-25 4:33 ` Premkumar Jonnala
2015-09-24 20:59 ` sfeldma [this message]
2015-09-24 20:59 ` [PATCH net-next 4/4] rocker: handle setting bridge ageing_time sfeldma
2015-09-24 21:05 ` [PATCH net-next 0/4] switchdev: push bridge attributes down Stephen Hemminger
2015-09-25 3:25 ` Scott Feldman
2015-09-25 3:47 ` Stephen Hemminger
2015-09-25 1:23 ` Florian Fainelli
2015-09-25 1:53 ` Andrew Lunn
2015-09-25 4:26 ` Scott Feldman
2015-09-29 5:22 ` Florian Fainelli
2015-09-29 5:07 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443128370-27353-4-git-send-email-sfeldma@gmail.com \
--to=sfeldma@gmail.com \
--cc=andrew@lunn.ch \
--cc=f.fainelli@gmail.com \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
--cc=pjonnala@broadcom.com \
--cc=roopa@cumulusnetworks.com \
--cc=siva.mannem.lnx@gmail.com \
--cc=stephen@networkplumber.org \
--cc=vivien.didelot@savoirfairelinux.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).