Skip to contentSkip to conversation

bridge: partial rtnetlink hooks

RFC In review Stephen Hemminger 4 participants 4 messages Apr 26, 2006 – Apr 27, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

RFC 1/1 bridge: partial rtnetlink hooks

This is the start of adding support for rtnetlink to the bridge code. So far it only supports accessing the list of links and notifying about link changes. It is just a prototype to get early feedback, don't use to build your own masterpiece yet.

net/bridge/Makefile +1 -1
@@ -6,7 +6,7 @@ obj-$(CONFIG_BRIDGE) += bridge.o
 
 bridge-y	:= br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \
 			br_ioctl.o br_notify.o br_stp.o br_stp_bpdu.o \
-			br_stp_if.o br_stp_timer.o
+			br_stp_if.o br_stp_timer.o br_netlink.o
 
 bridge-$(CONFIG_SYSFS) += br_sysfs_if.o br_sysfs_br.o
 
net/bridge/br.c +16 -3
@@ -30,17 +30,20 @@ static struct llc_sap *br_stp_sap;
 
 static int __init br_init(void)
 {
+	int err = -EADDRINUSE;
+
 	br_stp_sap = llc_sap_open(LLC_SAP_BSPAN, br_stp_rcv);
 	if (!br_stp_sap) {
 		printk(KERN_ERR "bridge: can't register sap for STP\n");
-		return -EBUSY;
+		goto out;
 	}
 
 	br_fdb_init();
 
 #ifdef CONFIG_BRIDGE_NETFILTER
-	if (br_netfilter_init())
-		return 1;
+	err = br_netfilter_init();
+	if (err)
+		goto unregister_sap;
 #endif
 	brioctl_set(br_ioctl_deviceless_stub);
 	br_handle_frame_hook = br_handle_frame;
@@ -50,13 +53,23 @@ static int __init br_init(void)
 
 	register_netdevice_notifier(&br_device_notifier);
 
+	br_netlink_init();
+
 	return 0;
+#ifdef CONFIG_BRIDGE_NETFILTER
+ unregister_sap:
+	llc_sap_close(br_stp_sap);
+#endif
+ out:
+	return err;
 }
 
 static void __exit br_deinit(void)
 {
 	llc_sap_close(br_stp_sap);
 
+	br_netlink_exit();
+
 #ifdef CONFIG_BRIDGE_NETFILTER
 	br_netfilter_fini();
 #endif
net/bridge/br_netlink.c new file +135 -0

135 lines not on this page · raw message

net/bridge/br_private.h +6 -1
@@ -29,7 +29,7 @@
 
 #define BR_PORT_DEBOUNCE (HZ/10)
 
-#define BR_VERSION	"2.1"
+#define BR_VERSION	"2.2"
 
 typedef struct bridge_id bridge_id;
 typedef struct mac_addr mac_addr;
@@ -232,6 +232,11 @@ extern struct net_bridge_fdb_entry *(*br
 extern void (*br_fdb_put_hook)(struct net_bridge_fdb_entry *ent);
 
 
+/* br_netlink.c */
+extern void br_netlink_init(void);
+extern void br_netlink_exit(void);
+extern void br_ifinfo_notify(int event, struct net_bridge_port *port);
+
 #ifdef CONFIG_SYSFS
 /* br_sysfs_if.c */
 extern struct sysfs_ops brport_sysfs_ops;
include/linux/rtnetlink.h +6 -0
@@ -200,6 +200,7 @@ enum
 #define RTPROT_DNROUTED	13	/* DECnet routing daemon */
 #define RTPROT_XORP	14	/* XORP */
 #define RTPROT_NTK	15	/* Netsukuku */
+#define RTPROT_STP	16	/* Bridge Spanning Tree Protocol */
 
 /* rtm_scope
 
@@ -850,6 +851,7 @@ enum
 #define RTMGRP_DECnet_ROUTE     0x4000
 
 #define RTMGRP_IPV6_PREFIX	0x20000
+
 #endif
 
 /* RTnetlink multicast groups */
@@ -889,6 +891,10 @@ enum rtnetlink_groups {
 	RTNLGRP_NOP4,
 	RTNLGRP_IPV6_PREFIX,
 #define RTNLGRP_IPV6_PREFIX	RTNLGRP_IPV6_PREFIX
+	RTNLGRP_BRIDGE_IFINFO,
+#define RTNLGRP_BRIDGE_IFINFO	RTNLGRP_BRIDGE_IFINFO
+	RTNLGRP_BRIDGE_FDB,
+#define RTNLGRP_BRIDGE_FDB	RTNLGRP_BRIDGE_FDB
 	__RTNLGRP_MAX
 };
 #define RTNLGRP_MAX	(__RTNLGRP_MAX - 1)
include/linux/if_bridge.h +5 -0
@@ -100,6 +100,11 @@ struct __fdb_entry
 	__u32 unused;
 };
 
+struct brifinfo {
+	__u8	state;
+	__u32	cost;
+};
+
 #ifdef __KERNEL__
 
 #include <linux/netdevice.h>
net/bridge/br_notify.c +2 -0
@@ -14,6 +14,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/rtnetlink.h>
 
 #include "br_private.h"
 
@@ -49,6 +50,7 @@ static int br_device_event(struct notifi
 
 	case NETDEV_CHANGEADDR:
 		br_fdb_changeaddr(p, dev->dev_addr);
+		br_ifinfo_notify(RTM_NEWLINK, p);
 		br_stp_recalculate_bridge_id(br);
 		break;
 
net/bridge/br_stp_if.c +4 -0
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/smp_lock.h>
 #include <linux/etherdevice.h>
+#include <linux/rtnetlink.h>
 
 #include "br_private.h"
 #include "br_private_stp.h"
@@ -86,6 +87,7 @@ void br_stp_disable_bridge(struct net_br
 void br_stp_enable_port(struct net_bridge_port *p)
 {
 	br_init_port(p);
+	br_ifinfo_notify(RTM_NEWLINK, p);
 	br_port_state_selection(p->br);
 }
 
@@ -99,6 +101,8 @@ void br_stp_disable_port(struct net_brid
 	printk(KERN_INFO "%s: port %i(%s) entering %s state\n",
 	       br->dev->name, p->port_no, p->dev->name, "disabled");
 
+	br_ifinfo_notify(RTM_DELLINK, p);
+
 	wasroot = br_is_root_bridge(br);
 	br_become_designated_port(p);
 	p->state = BR_STATE_DISABLED;
#1 lore raw

Stephen Hemminger <[email protected]> :
[...]

Quoted 2 lines
net/bridge/br_netlink.c new file +0 -0

[...]

Quoted 3 lines
net/bridge/br_netlink.c new file +3 -0
+static int br_fill_ifinfo(struct sk_buff *skb, const struct net_bridge_port *port,
+			  u32 pid, u32 seq, int event, unsigned int flags)
+{

[...]

net/bridge/br_netlink.c line 69

Quoted 5 lines
net/bridge/br_netlink.c new file +5 -0
+nlmsg_failure:
+rtattr_failure:
+
+	skb_trim(skb, b - skb->data);
+	return -1;
	return -EINVAL;

(see below)

Quoted 12 lines
net/bridge/br_netlink.c new file +12 -0
+}
+
+
+void br_ifinfo_notify(int event, struct net_bridge_port *port)
+{
+	struct sk_buff *skb;
+
+	printk(KERN_DEBUG "bridge notify event=%d\n", event);
+	skb = alloc_skb(NLMSG_SPACE(sizeof(struct ifinfomsg) + 128),
+			GFP_ATOMIC);
+	if (!skb) {
+		netlink_set_err(rtnl, 0, RTNLGRP_BRIDGE_IFINFO, ENOBUFS);

net/bridge/br_netlink.c line 91

Quoted 10 lines
net/bridge/br_netlink.c new file +10 -0
+		return;
+	}
+	if (br_fill_ifinfo(skb, port, current->pid, 0, event, 0) < 0) {
+		kfree_skb(skb);
+		netlink_set_err(rtnl, 0, RTNLGRP_BRIDGE_IFINFO, EINVAL);
+		return;
+	}
+	NETLINK_CB(skb).dst_group = RTNLGRP_IPV6_IFINFO;
+	netlink_broadcast(rtnl, skb, 0, RTNLGRP_BRIDGE_IFINFO, GFP_ATOMIC);
+}

void br_ifinfo_notify(int event, struct net_bridge_port *port)

{
	struct sk_buff *skb;
	int err = -ENOBUFS;

	printk(KERN_DEBUG "bridge notify event=%d\n", event);
	skb = alloc_skb(NLMSG_SPACE(sizeof(struct ifinfomsg) + 128),
			GFP_ATOMIC);
	if (!skb)
		goto err_out;

	err = br_fill_ifinfo(skb, port, current->pid, 0, event, 0);
	if (unlikely((err < 0))
		goto err_kfree;

	NETLINK_CB(skb).dst_group = RTNLGRP_IPV6_IFINFO;
	netlink_broadcast(rtnl, skb, 0, RTNLGRP_BRIDGE_IFINFO, GFP_ATOMIC);
	return;

err_kfree:

	kfree_skb(skb);
err_out:
	netlink_set_err(rtnl, 0, RTNLGRP_BRIDGE_IFINFO, -err);
}
Signature · 1 line
Ueimor
maintainer
#2 lore raw
In reply to Stephen Hemminger

From: Stephen Hemminger <[email protected]>
Date: Wed, 26 Apr 2006 10:45:21 -0700

include/linux/if_bridge.h struct __fdb_entry · line 107

Quoted 5 lines
include/linux/if_bridge.h +5 -0
+struct brifinfo {
+	__u8	state;
+	__u32	cost;
+};
+

Maybe put the __u32 first and explicitly pad out the 3 bytes after the __u8? Just to be safe.

I know you use an assignment initializer, so your current code won't leak kernel data into userspace, but a safer layout might help provide even more protection for future code using this data structure.

#3 lore raw
In reply to Stephen Hemminger
Quoted 6 lines · Stephen Hemminger

This is the start of adding support for rtnetlink to the bridge code. So far it only supports accessing the list of links and notifying about link changes. It is just a prototype to get early feedback, don't use to build your own masterpiece yet.

net/bridge/br_netlink.c line 101

Quoted 9 lines
net/bridge/br_netlink.c new file +9 -0
+static int br_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
+{
+	struct net_device *dev;
+	int idx = 0;
+	int err = 0;
+
+	printk(KERN_DEBUG "bridge dump ifinfo\n");
+	for (dev = dev_base; dev; dev = dev->next) {
+		struct net_bridge_port *p = rcu_dereference(dev->br_port);

I think using rcu_dereference (especially without rcu_read_lock()) is a bit misleading, the pointer is actually protected by the RTNL at this point.