From: sfeldma@gmail.com
To: netdev@vger.kernel.org
Cc: jiri@resnulli.us, roopa@cumulusnetworks.com, linux@roeck-us.net,
f.fainelli@gmail.com, sridhar.samudrala@intel.com,
ronen.arad@intel.com
Subject: [PATCH net-next v2 09/26] switchdev: add new swdev bridge setlink
Date: Wed, 1 Apr 2015 03:07:45 -0700 [thread overview]
Message-ID: <1427882882-2533-10-git-send-email-sfeldma@gmail.com> (raw)
In-Reply-To: <1427882882-2533-1-git-send-email-sfeldma@gmail.com>
From: Scott Feldman <sfeldma@gmail.com>
Add new swdev_port_bridge_setlink that can be used by drivers implementing
.ndo_bridge_setlink to set swdev bridge attributes. Basically turn the raw
rtnl_bridge_setlink netlink into swdev attr sets. Proper netlink attr policy
checking is done on the protinfo part of the netlink msg.
Currently, for protinfo, only bridge port attrs BR_LEARNING and
BR_LEARNING_SYNC are parsed and passed to port driver.
For afspec, VLAN objs are passed so swdev driver can set VLANs assigned to
SELF. To illustrate with iproute2 cmd, we have:
bridge vlan add vid 10 dev sw1p1 self master
To add VLAN 10 to port sw1p1 for both the bridge (master) and the device
(self).
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
---
include/net/switchdev.h | 8 +++
net/switchdev/switchdev.c | 150 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 158 insertions(+)
diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index f1fa5fc..96489d7 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -113,6 +113,8 @@ int swdev_port_attr_get(struct net_device *dev, struct swdev_attr *attr);
int swdev_port_attr_set(struct net_device *dev, struct swdev_attr *attr);
int swdev_port_obj_add(struct net_device *dev, struct swdev_obj *obj);
int swdev_port_obj_del(struct net_device *dev, struct swdev_obj *obj);
+int swdev_port_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,
+ u16 flags);
int register_netdev_switch_notifier(struct notifier_block *nb);
int unregister_netdev_switch_notifier(struct notifier_block *nb);
int call_netdev_switch_notifiers(unsigned long val, struct net_device *dev,
@@ -157,6 +159,12 @@ static inline int swdev_port_obj_del(struct net_device *dev,
return -EOPNOTSUPP;
}
+static inline int swdev_port_bridge_setlink(struct net_device *dev,
+ struct nlmsghdr *nlh, u16 flags)
+{
+ return -EOPNOTSUPP;
+}
+
static inline int register_netdev_switch_notifier(struct notifier_block *nb)
{
return 0;
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 6a527f5..5426a36 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -15,6 +15,7 @@
#include <linux/mutex.h>
#include <linux/notifier.h>
#include <linux/netdevice.h>
+#include <linux/if_bridge.h>
#include <net/ip_fib.h>
#include <net/switchdev.h>
@@ -282,6 +283,155 @@ int netdev_switch_port_bridge_setlink(struct net_device *dev,
}
EXPORT_SYMBOL_GPL(netdev_switch_port_bridge_setlink);
+static int swdev_port_br_setflag(struct net_device *dev, struct nlattr *nlattr,
+ unsigned long brport_flag)
+{
+ struct swdev_attr attr = {
+ .id = SWDEV_ATTR_PORT_BRIDGE_FLAGS,
+ };
+ u8 flag = nla_get_u8(nlattr);
+ int err;
+
+ err = swdev_port_attr_get(dev, &attr);
+ if (err)
+ return err;
+
+ if (flag)
+ attr.brport_flags |= brport_flag;
+ else
+ attr.brport_flags &= ~brport_flag;
+
+ return swdev_port_attr_set(dev, &attr);
+}
+
+static const struct nla_policy swdev_port_bridge_policy[IFLA_BRPORT_MAX + 1] = {
+ [IFLA_BRPORT_STATE] = { .type = NLA_U8 },
+ [IFLA_BRPORT_COST] = { .type = NLA_U32 },
+ [IFLA_BRPORT_PRIORITY] = { .type = NLA_U16 },
+ [IFLA_BRPORT_MODE] = { .type = NLA_U8 },
+ [IFLA_BRPORT_GUARD] = { .type = NLA_U8 },
+ [IFLA_BRPORT_PROTECT] = { .type = NLA_U8 },
+ [IFLA_BRPORT_FAST_LEAVE] = { .type = NLA_U8 },
+ [IFLA_BRPORT_LEARNING] = { .type = NLA_U8 },
+ [IFLA_BRPORT_LEARNING_SYNC] = { .type = NLA_U8 },
+ [IFLA_BRPORT_UNICAST_FLOOD] = { .type = NLA_U8 },
+};
+
+static int swdev_port_br_protinfo(struct net_device *dev,
+ struct nlattr *protinfo)
+{
+ struct nlattr *attr;
+ int rem;
+ int err;
+
+ err = nla_validate_nested(protinfo, IFLA_BRPORT_MAX,
+ swdev_port_bridge_policy);
+ if (err)
+ return err;
+
+ nla_for_each_nested(attr, protinfo, rem) {
+ switch (nla_type(attr)) {
+ case IFLA_BRPORT_LEARNING:
+ err = swdev_port_br_setflag(dev, attr,
+ BR_LEARNING);
+ break;
+ case IFLA_BRPORT_LEARNING_SYNC:
+ err = swdev_port_br_setflag(dev, attr,
+ BR_LEARNING_SYNC);
+ break;
+ default:
+ err = -EOPNOTSUPP;
+ break;
+ }
+ if (err)
+ return err;
+ }
+
+ return 0;
+}
+
+static int swdev_port_br_afspec(struct net_device *dev, struct nlattr *afspec,
+ int (*f)(struct net_device *dev,
+ struct swdev_obj *obj))
+{
+ struct nlattr *attr;
+ struct bridge_vlan_info *vinfo;
+ struct swdev_obj obj = {
+ .id = SWDEV_OBJ_PORT_VLAN,
+ };
+ int rem;
+ int err;
+
+ nla_for_each_nested(attr, afspec, rem) {
+ if (nla_type(attr) != IFLA_BRIDGE_VLAN_INFO)
+ continue;
+ if (nla_len(attr) != sizeof(struct bridge_vlan_info))
+ return -EINVAL;
+ vinfo = nla_data(attr);
+ obj.vlan.flags = vinfo->flags;
+ if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) {
+ if (obj.vlan.vid_start)
+ return -EINVAL;
+ obj.vlan.vid_start = vinfo->vid;
+ } else if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_END) {
+ if (!obj.vlan.vid_start)
+ return -EINVAL;
+ obj.vlan.vid_end = vinfo->vid;
+ if (obj.vlan.vid_end <= obj.vlan.vid_start)
+ return -EINVAL;
+ err = f(dev, &obj);
+ if (err)
+ return err;
+ memset(&obj.vlan, 0, sizeof(obj.vlan));
+ } else {
+ if (obj.vlan.vid_start)
+ return -EINVAL;
+ obj.vlan.vid_start = vinfo->vid;
+ obj.vlan.vid_end = vinfo->vid;
+ err = f(dev, &obj);
+ if (err)
+ return err;
+ memset(&obj.vlan, 0, sizeof(obj.vlan));
+ }
+ }
+
+ return 0;
+}
+
+/**
+ * swdev_port_bridge_setlink - Set bridge port attributes
+ *
+ * @dev: port device
+ * @nlh: netlink header
+ * @flags: netlink flags
+ *
+ * Called for SELF on rtnl_bridge_setlink to set bridge port
+ * attributes.
+ */
+int swdev_port_bridge_setlink(struct net_device *dev,
+ struct nlmsghdr *nlh, u16 flags)
+{
+ struct nlattr *protinfo;
+ struct nlattr *afspec;
+ int err = 0;
+
+ protinfo = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg),
+ IFLA_PROTINFO);
+ if (protinfo) {
+ err = swdev_port_br_protinfo(dev, protinfo);
+ if (err)
+ return err;
+ }
+
+ afspec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg),
+ IFLA_AF_SPEC);
+ if (afspec)
+ err = swdev_port_br_afspec(dev, afspec, swdev_port_obj_add);
+
+ return err;
+}
+EXPORT_SYMBOL_GPL(swdev_port_bridge_setlink);
+
/**
* netdev_switch_port_bridge_dellink - Notify switch device port of bridge
* port attribute delete
--
1.7.10.4
next prev parent reply other threads:[~2015-04-01 10:06 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-01 10:07 [PATCH net-next v2 00/26] switchdev: spring cleanup sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 01/26] switchdev: introduce get/set attrs ops sfeldma
2015-04-01 12:19 ` Jamal Hadi Salim
2015-04-01 18:08 ` David Miller
2015-04-02 7:43 ` Scott Feldman
2015-04-02 16:05 ` David Miller
2015-04-02 17:38 ` Scott Feldman
2015-04-02 17:54 ` David Miller
2015-04-02 18:43 ` Andrew Lunn
2015-04-01 10:07 ` [PATCH net-next v2 02/26] switchdev: convert parent_id_get to swdev attr get sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 03/26] switchdev: convert STP update to swdev attr set sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 04/26] switchdev: add bridge port flags attr sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 05/26] rocker: use swdev get/set attr for bridge port flags sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 06/26] switchdev: introduce swdev add/del obj ops sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 07/26] switchdev: add port vlan obj sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 08/26] rocker: use swdev add/del obj for bridge port vlans sfeldma
2015-04-01 10:07 ` sfeldma [this message]
2015-04-01 10:07 ` [PATCH net-next v2 10/26] rocker: cut over to new swdev_port_bridge_setlink sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 11/26] bonding: " sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 12/26] team: " sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 13/26] switchdev: remove old netdev_switch_port_bridge_setlink sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 14/26] switchdev: add new swdev_port_bridge_dellink sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 15/26] rocker: cut over to " sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 16/26] bonding: " sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 17/26] team: " sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 18/26] switchdev: remove unused netdev_switch_port_bridge_dellink sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 19/26] switchdev: add new swdev_port_bridge_getlink sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 20/26] rocker: cut over to " sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 21/26] bonding: " sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 22/26] team: " sfeldma
2015-04-01 10:07 ` [PATCH net-next v2 23/26] switchdev: rename netdev_switch_fib_* to swdev_fib_* sfeldma
2015-04-01 10:08 ` [PATCH net-next v2 24/26] switchdev: rename netdev_switch_notifier_* to swdev_notifier_* sfeldma
2015-04-01 10:08 ` [PATCH net-next v2 25/26] switchdev: convert swdev_fib_ipv4_add/del over to swdev_port_obj_add/del sfeldma
2015-04-01 11:47 ` Jiri Pirko
2015-04-01 15:05 ` roopa
2015-04-01 16:05 ` Jiri Pirko
2015-04-03 18:00 ` Florian Fainelli
2015-04-06 21:56 ` Scott Feldman
2015-04-01 10:08 ` [PATCH net-next v2 26/26] switchdev: bring documentation up-to-date sfeldma
2015-04-01 11:40 ` [PATCH net-next v2 00/26] switchdev: spring cleanup Jiri Pirko
2015-04-01 18:02 ` Scott Feldman
2015-04-02 6:06 ` Jiri Pirko
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=1427882882-2533-10-git-send-email-sfeldma@gmail.com \
--to=sfeldma@gmail.com \
--cc=f.fainelli@gmail.com \
--cc=jiri@resnulli.us \
--cc=linux@roeck-us.net \
--cc=netdev@vger.kernel.org \
--cc=ronen.arad@intel.com \
--cc=roopa@cumulusnetworks.com \
--cc=sridhar.samudrala@intel.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).