Skip to contentSkip to conversation

Bridge VLAN support

PATCH In review Vlad Yasevich 2 participants 6 messages Feb 28, 2013 – Mar 6, 2013

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

v2 cover Bridge VLAN support

This series adds VLAN configuration to the bridge command. With this series, one can specify vlans in FDB entries as well as to configure VLAN configuration on the bridge ports.

Since v1:
- Rebased.
- Call rtnl_wilddump_req_filter from rtnl_wilddump_request. Preserve always setting the RTEXT_FILTER_VF filter.

Vlad Yasevich (3):
bridge: Add vlan support to fdb entries
bridge: Add vlan configuration support
bridge: Update bridge man pages to include vlan command

 bridge/Makefile      |    2 +-
 bridge/br_common.h   |    1 +
 bridge/bridge.c      |    3 +-
 bridge/fdb.c         |   16 ++++-
 bridge/vlan.c        |  220 ++++++++++++++++++++++++++++++++++++++++++++++++++
 include/libnetlink.h |    2 +
 lib/libnetlink.c     |    8 ++-
 man/man8/bridge.8    |   73 ++++++++++++++++-
 8 files changed, 320 insertions(+), 5 deletions(-)
 create mode 100644 bridge/vlan.c
Signature · 1 line
1.7.7.6
#1 lore raw

PATCH v2 1/3 bridge: Add vlan support to fdb entries

Provide the ability to set and show vlans on FDB entries.

---
 bridge/fdb.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)
bridge/fdb.c +15 -1
index 4ca4861..447045e 100644
@@ -29,7 +29,7 @@ int filter_index;
 
 static void usage(void)
 {
-	fprintf(stderr, "Usage: bridge fdb { add | del } ADDR dev DEV {self|master} [ temp ] [ dst IPADDR]\n");
+	fprintf(stderr, "Usage: bridge fdb { add | del } ADDR dev DEV {self|master} [ temp ] [ dst IPADDR] [ vlan VID ]\n");
 	fprintf(stderr, "       bridge fdb {show} [ dev DEV ]\n");
 	exit(-1);
 }
@@ -107,6 +107,11 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 				    abuf, sizeof(abuf)));
 	}
 
+	if (tb[NDA_VLAN]) {
+		__u16 vid = rta_getattr_u16(tb[NDA_VLAN]);
+		fprintf(fp, "vlan %hu ", vid);
+	}
+
 	if (show_stats && tb[NDA_CACHEINFO]) {
 		struct nda_cacheinfo *ci = RTA_DATA(tb[NDA_CACHEINFO]);
 		int hz = get_user_hz();
@@ -171,6 +176,7 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
 	char abuf[ETH_ALEN];
 	int dst_ok = 0;
 	inet_prefix dst;
+	short vid = -1;
 
 	memset(&req, 0, sizeof(req));
 
@@ -199,6 +205,11 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
 			req.ndm.ndm_state |= NUD_PERMANENT;
 		} else if (matches(*argv, "temp") == 0) {
 			req.ndm.ndm_state |= NUD_REACHABLE;
+		} else if (matches(*argv, "vlan") == 0) {
+			if (vid >= 0)
+				duparg2("vlan", *argv);
+			NEXT_ARG();
+			vid = atoi(*argv);
 		} else {
 			if (strcmp(*argv, "to") == 0) {
 				NEXT_ARG();
@@ -236,6 +247,9 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
 	if (dst_ok)
 		addattr_l(&req.n, sizeof(req), NDA_DST, &dst.data, dst.bytelen);
 
+	if (vid >= 0)
+		addattr16(&req.n, sizeof(req), NDA_VLAN, vid); 
+
 	req.ndm.ndm_ifindex = ll_name_to_index(d);
 	if (req.ndm.ndm_ifindex == 0) {
 		fprintf(stderr, "Cannot find device \"%s\"\n", d);
Signature · 1 line
1.7.7.6
#2 lore raw

PATCH v2 2/3 bridge: Add vlan configuration support

In reply to Vlad Yasevich

Recent kernel patches added support for VLAN filtering on the bridge. This functionality allows one to turn a basic bridge into a VLAN bridge, where VLANs dicatate packet forwarding and header transformation.

To configure the VLANs on the bridge and its ports a new command is added to the 'bridge' utility.

   # bridge vlan add dev eth0 vid 10 pvid untagged brdev
   # bridge vlan add
   # bridge vlan delete dev eth0 vid 10
   # bridge vlan show

This command supports the following flags:
master - peform the operation on the software bridge device. This is
the default behavior.
self - perform the operation on the hardware associated with the port.
This flag is required when the device is the bridge device and the configuration is desired on the bridge device itself (not one of the ports).
pvid - Set the PVID (port vlan id) for a given port. Any untagged
frames arriving on the port will be assigned to this vlan.
untagged - Sets the egress policy of for a given vlan. Default port
egress policy is tagged. Set this flag if you wish traffic associated with this VLAN to exit the port untagged.

---
 bridge/Makefile      |    2 +-
 bridge/br_common.h   |    1 +
 bridge/bridge.c      |    3 +-
 bridge/vlan.c        |  220 ++++++++++++++++++++++++++++++++++++++++++++++++++
 include/libnetlink.h |    2 +
 lib/libnetlink.c     |    8 ++-
 6 files changed, 233 insertions(+), 3 deletions(-)
 create mode 100644 bridge/vlan.c
bridge/Makefile +1 -1
index 67aceb4..1fb8320 100644
@@ -1,4 +1,4 @@
-BROBJ = bridge.o fdb.o monitor.o link.o mdb.o
+BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
 
 include ../Config
 
bridge/br_common.h +1 -0
index 10f6ce9..8764563 100644
@@ -9,6 +9,7 @@ extern int print_mdb(const struct sockaddr_nl *who,
 extern int do_fdb(int argc, char **argv);
 extern int do_mdb(int argc, char **argv);
 extern int do_monitor(int argc, char **argv);
+extern int do_vlan(int argc, char **argv);
 
 extern int preferred_family;
 extern int show_stats;
bridge/bridge.c +2 -1
index 1d59a1e..06b7a54 100644
@@ -27,7 +27,7 @@ static void usage(void)
 {
 	fprintf(stderr,
 "Usage: bridge [ OPTIONS ] OBJECT { COMMAND | help }\n"
-"where  OBJECT := { fdb |  mdb | monitor }\n"
+"where  OBJECT := { fdb | mdb | vlan | monitor }\n"
 "       OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails]\n" );
 	exit(-1);
 }
@@ -44,6 +44,7 @@ static const struct cmd {
 } cmds[] = {
 	{ "fdb", 	do_fdb },
 	{ "mdb", 	do_mdb },
+	{ "vlan",	do_vlan },
 	{ "monitor",	do_monitor },
 	{ "help",	do_help },
 	{ 0 }
bridge/vlan.c new file +220 -0

220 lines not on this page · raw message

include/libnetlink.h +2 -0
index 41e6ed1..8d15ee5 100644
@@ -26,6 +26,8 @@ extern int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions);
 extern int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions, int protocol);
 extern void rtnl_close(struct rtnl_handle *rth);
 extern int rtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type);
+extern int rtnl_wilddump_req_filter(struct rtnl_handle *rth, int fam, int type,
+				    __u32 filt_mask);
 extern int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len);
 
 typedef int (*rtnl_filter_t)(const struct sockaddr_nl *,
lib/libnetlink.c +7 -1
index 09b4277..67f046f 100644
@@ -91,6 +91,12 @@ int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions)
 
 int rtnl_wilddump_request(struct rtnl_handle *rth, int family, int type)
 {
+	return rtnl_wilddump_req_filter(rth, family, type, RTEXT_FILTER_VF);
+}
+
+int rtnl_wilddump_req_filter(struct rtnl_handle *rth, int family, int type,
+			    __u32 filt_mask)
+{
 	struct {
 		struct nlmsghdr nlh;
 		struct rtgenmsg g;
@@ -109,7 +115,7 @@ int rtnl_wilddump_request(struct rtnl_handle *rth, int family, int type)
 
 	req.ext_req.rta_type = IFLA_EXT_MASK;
 	req.ext_req.rta_len = RTA_LENGTH(sizeof(__u32));
-	req.ext_filter_mask = RTEXT_FILTER_VF;
+	req.ext_filter_mask = filt_mask;
 
 	return send(rth->fd, (void*)&req, sizeof(req), 0);
 }
Signature · 1 line
1.7.7.6
#3 lore raw

PATCH v2 3/3 bridge: Update bridge man pages to include vlan command

In reply to Vlad Yasevich

Add the vlan command documentation to bridge man page.

---
 man/man8/bridge.8 |   73 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 72 insertions(+), 1 deletions(-)
man/man8/bridge.8 +72 -1
index fd91618..d34e3cf 100644
@@ -13,7 +13,7 @@ bridge \- show / manipulate bridge addresses and devices
 
 .ti -8
 .IR OBJECT " := { "
-.BR fdb " | " monitor " }"
+.BR fdb " | " vlan " | " monitor " }"
 .sp
 
 .ti -8
@@ -35,6 +35,20 @@ bridge \- show / manipulate bridge addresses and devices
 .IR DEV " ]"
 
 .ti -8
+.BR "bridge vlan" " { " add " | " del " } "
+.B  dev
+.IR DEV
+.B  vid 
+.IR VID " [ "
+.BR  pvid " ] [ " untagged " ]  [ "
+.BR  self " ]  [ " master " ] "
+
+.ti -8
+.BR "bridge vlan" " [ " show " ] [ "
+.B  dev
+.IR DEV " ]"
+
+.ti -8
 .BR "bridge monitor" " [ " all " | " neigh " | " link " ]"
 
 .SH OPTIONS
@@ -61,6 +75,10 @@ As a rule, the information is statistics or some time values.
 .B fdb 
 - Forwarding Database entry.
 
+.TP
+.B vlan
+- VLAN filter list.
+
 .SS
 .I COMMAND
 
@@ -143,6 +161,59 @@ With the
 option, the command becomes verbose.  It prints out the last updated
 and last used time for each entry.
 
+.SH bridge vlan - VLAN filter list
+
+.B vlan
+objects contain known VLAN IDs for a link.
+
+.P
+The corresponding commands display vlan filter entries, add new entries,
+and delete old ones.
+
+.SS bridge vlan add - add a new vlan filter entry
+
+This command creates a new vlan filter entry.
+
+.TP
+.BI dev " NAME"
+the interface with which this vlan is associated.
+
+.TP
+.BI vid " VID"
+the VLAN ID that identifies the vlan.
+
+.TP
+.BI pvid
+the vlan specified is to be considered a PVID at ingress.
+Any untagged frames will be assigned to this VLAN.
+
+.TP
+.BI untagged
+the vlan specified is to be treated as untagged on egress.
+
+.TP
+.BI self
+the vlan is configured on the specified physical device.  Required if the
+device is the bridge device.
+
+.TP
+.BI master
+the vlan is configured on the sofware bridge (default).
+
+.SS bridge vlan delete - delete a forwarding database entry
+This command removes an existing fdb entry.
+
+.PP
+The arguments are the same as with
+.BR "bridge vlan add".
+The
+.BR "pvid " and " untagged"
+flags are ignored.
+
+.SS bridge vlan show - list vlan configuration.
+
+This command displays the current VLAN filter table.
+
 .SH bridge monitor - state monitoring
 
 The
Signature · 1 line
1.7.7.6
#4 lore raw
In reply to Vlad Yasevich
Quoted 4 lines · Vlad Yasevich

This series adds VLAN configuration to the bridge command. With this series, one can specify vlans in FDB entries as well as to configure VLAN configuration on the bridge ports.

Stephen

This wad resent after you reopened iproute2. Did you see it? Do you have any further comments?

Thanks
-vlad

Quoted 21 lines

Since v1:
- Rebased.
- Call rtnl_wilddump_req_filter from rtnl_wilddump_request. Preserve always setting the RTEXT_FILTER_VF filter.

Vlad Yasevich (3):
bridge: Add vlan support to fdb entries
bridge: Add vlan configuration support
bridge: Update bridge man pages to include vlan command

  bridge/Makefile      |    2 +-
  bridge/br_common.h   |    1 +
  bridge/bridge.c      |    3 +-
  bridge/fdb.c         |   16 ++++-
  bridge/vlan.c        |  220 ++++++++++++++++++++++++++++++++++++++++++++++++++
  include/libnetlink.h |    2 +
  lib/libnetlink.c     |    8 ++-
  man/man8/bridge.8    |   73 ++++++++++++++++-
  8 files changed, 320 insertions(+), 5 deletions(-)

create mode 100644 bridge/vlan.c

#5 lore raw
In reply to Vlad Yasevich
Quoted 14 lines · On Thu, 28 Feb 2013 15:04:03 -0500 Vlad Yasevich <[email protected]> wrote:

This series adds VLAN configuration to the bridge command. With this series, one can specify vlans in FDB entries as well as to configure VLAN configuration on the bridge ports.

Since v1:
- Rebased.
- Call rtnl_wilddump_req_filter from rtnl_wilddump_request. Preserve always setting the RTEXT_FILTER_VF filter.

Vlad Yasevich (3):
bridge: Add vlan support to fdb entries
bridge: Add vlan configuration support
bridge: Update bridge man pages to include vlan command

Quoted 11 lines
 bridge/Makefile      |    2 +-
 bridge/br_common.h   |    1 +
 bridge/bridge.c      |    3 +-
 bridge/fdb.c         |   16 ++++-
 bridge/vlan.c        |  220 ++++++++++++++++++++++++++++++++++++++++++++++++++
 include/libnetlink.h |    2 +
 lib/libnetlink.c     |    8 ++-
 man/man8/bridge.8    |   73 ++++++++++++++++-
 8 files changed, 320 insertions(+), 5 deletions(-)
 create mode 100644 bridge/vlan.c

Applied now in HEAD of iproute2 git