Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1354317

[RFC PATCH net-next 1/2] net: bridge: add switchdev attr for port bridging

Show all headers | View raw

Add a new SWITCHDEV_ATTR_ID_PORT_BRIDGE_IF switchdev attribute which is
set before adding a port to a bridge and deleting a port from a bridge.

The main purpose for this attribute is to provide switchdev users a
simple and common way to retrieve bridging information, instead of
implementing complex notifier blocks to listen to global netdev events.

We can also imagine a switchdev user returning an error different from
-EOPNOTSUPP in the prepare phase to prevent a port from being bridged.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
---
 include/net/switchdev.h |  2 ++
 net/bridge/br_if.c      | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index d451122..65f8514 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -46,6 +46,7 @@ enum switchdev_attr_id {
 	SWITCHDEV_ATTR_ID_PORT_PARENT_ID,
 	SWITCHDEV_ATTR_ID_PORT_STP_STATE,
 	SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS,
+	SWITCHDEV_ATTR_ID_PORT_BRIDGE_IF,
 	SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME,
 	SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING,
 };
@@ -58,6 +59,7 @@ struct switchdev_attr {
 		struct netdev_phys_item_id ppid;	/* PORT_PARENT_ID */
 		u8 stp_state;				/* PORT_STP_STATE */
 		unsigned long brport_flags;		/* PORT_BRIDGE_FLAGS */
+		bool join;				/* PORT_BRIDGE_IF */
 		u32 ageing_time;			/* BRIDGE_AGEING_TIME */
 		bool vlan_filtering;			/* BRIDGE_VLAN_FILTERING */
 	} u;
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index a73df33..105b9fd 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -28,6 +28,24 @@
 
 #include "br_private.h"
 
+static int switchdev_bridge_if(struct net_device *dev, struct net_bridge *br,
+			       bool join)
+{
+	struct switchdev_attr attr = {
+		.orig_dev = br->dev,
+		.id = SWITCHDEV_ATTR_ID_PORT_BRIDGE_IF,
+		.flags = SWITCHDEV_F_SKIP_EOPNOTSUPP,
+		.u.join = join,
+	};
+	int err;
+
+	err = switchdev_port_attr_set(dev, &attr);
+	if (err && err != -EOPNOTSUPP)
+		return err;
+
+	return 0;
+}
+
 /*
  * Determine initial path cost based on speed.
  * using recommendations from 802.1d standard
@@ -297,6 +315,10 @@ static void del_nbp(struct net_bridge_port *p)
 	br_netpoll_disable(p);
 
 	call_rcu(&p->rcu, destroy_nbp_rcu);
+
+	if (switchdev_bridge_if(dev, br, false))
+		br_warn(br, "error unbridging port %u(%s)\n",
+			(unsigned int) p->port_no, dev->name);
 }
 
 /* Delete bridge device */
@@ -347,6 +369,11 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br,
 {
 	int index;
 	struct net_bridge_port *p;
+	int err;
+
+	err = switchdev_bridge_if(dev, br, true);
+	if (err)
+		return ERR_PTR(err);
 
 	index = find_portno(br);
 	if (index < 0)
-- 
2.7.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[RFC PATCH net-next 0/2] net: switchdev: add attribute for port bridging Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-03-09 18:50 +0100
  [RFC PATCH net-next 1/2] net: bridge: add switchdev attr for port bridging Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-03-09 18:50 +0100
    Re: [RFC PATCH net-next 1/2] net: bridge: add switchdev attr for port  bridging Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-03-09 20:30 +0100
    Re: [RFC PATCH net-next 1/2] net: bridge: add switchdev attr for  port bridging Ido Schimmel <idosch@mellanox.com> - 2016-03-09 22:50 +0100
      Re: [RFC PATCH net-next 1/2] net: bridge: add switchdev attr for port bridging Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-03-10 00:00 +0100
  [RFC PATCH net-next 2/2] net: dsa: support SWITCHDEV_ATTR_ID_PORT_BRIDGE_IF Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-03-09 18:50 +0100
    Re: [RFC PATCH net-next 2/2] net: dsa: support  SWITCHDEV_ATTR_ID_PORT_BRIDGE_IF Andrew Lunn <andrew@lunn.ch> - 2016-03-09 19:40 +0100
      Re: [RFC PATCH net-next 2/2] net: dsa: support  SWITCHDEV_ATTR_ID_PORT_BRIDGE_IF Jiri Pirko <jiri@resnulli.us> - 2016-03-09 20:30 +0100
        Re: [RFC PATCH net-next 2/2] net: dsa: support SWITCHDEV_ATTR_ID_PORT_BRIDGE_IF Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-03-09 23:20 +0100
      Re: [RFC PATCH net-next 2/2] net: dsa: support SWITCHDEV_ATTR_ID_PORT_BRIDGE_IF Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2016-03-09 20:40 +0100
        Re: [RFC PATCH net-next 2/2] net: dsa: support  SWITCHDEV_ATTR_ID_PORT_BRIDGE_IF Andrew Lunn <andrew@lunn.ch> - 2016-03-09 21:10 +0100

csiph-web