Details

Reviewers

brueffer
julian
glebius
kp

Group Reviewers

manpages
network

Commits

rGb2c14db4f8fd: netgraph/ng_vlan_rotate: IEEE 802.1ad VLAN manipulation netgraph type
rG522a0b7d029f: netgraph/ng_vlan_rotate: IEEE 802.1ad VLAN manipulation netgraph type
rGa0e2fe87031a: netgraph/ng_vlan_rotate: IEEE 802.1ad VLAN manipulation netgraph type
rGcfd6422a5217: netgraph/ng_vlan_rotate: IEEE 802.1ad VLAN manipulation netgraph type

Summary

This node is part of an A10-NSP development.

Carrier networks tend to stack three or more tags for internal purposes and therefore hiding the service tags deep inside of the stack. When decomposing such an access network frame, the processing order is typically reversed: First distinguish by service, than by other means.

This new netgragh node allows to bring the relevant VLAN in front (to the out-most position). This way other netgraph nodes (like ng_vlan) can operate on this specific type.

Test Plan

The example section of the man page contains two examples, how to use this node.
It also contains the sniffer insight of the manipulation process.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Warnings

Severity	Location	Code	Message
Warning	sys/netgraph/ng_vlan_rotate.c:314	SPELL1	Possible Spelling Mistake

Unit

No Test Coverage

Build Status

Buildable 36492
Build 33381: arc lint + arc unit

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes

kevans added inline comments.Jan 3 2020, 1:58 PM

sys/netgraph/ng_vlan_rotate.c
474	Operator belongs to the line before it, with the wrapping starting just after.

Run indent(1) on the source files.
Reduced comments from the boilerplate.
Changed hard coded ethertypes by global definitions introduced by D21846.

Harbormaster completed remote builds in B28482: Diff 66351.Jan 4 2020, 9:09 PM

donner marked 7 inline comments as done.Jan 4 2020, 9:12 PM

Rebase to r357812

Harbormaster completed remote builds in B29305: Diff 68169.Feb 12 2020, 11:35 AM

rebase to r358008.

Herald added a subscriber: melifaro. · View Herald TranscriptFeb 16 2020, 10:57 PM

Harbormaster completed remote builds in B29434: Diff 68430.Feb 16 2020, 10:58 PM

Updated to revision 358170.

Harbormaster completed remote builds in B29512: Diff 68601.Feb 20 2020, 4:24 PM

Updated to revision 358500.

Harbormaster completed remote builds in B29706: Diff 69032.Mar 1 2020, 9:05 PM

We are going to hard production now.
Any interest in reviewing it?

@brueffer Are your concerns resolved?

Rebase to r366170.

Harbormaster completed remote builds in B33829: Diff 77548.Sep 25 2020, 7:28 PM

LGTM

donner mentioned this in D26436: Add support for stacked VLANs (IEEE 802.1ad, AKA Q-in-Q)..Oct 21 2020, 3:22 PM

Updated to revision 367040.

Harbormaster completed remote builds in B34379: Diff 78742.Oct 25 2020, 4:54 PM

LGTM.

share/man/man4/ng_vlan_rotate.4
3	The "All rights reserved." should be dropped.
sys/netgraph/ng_vlan_rotate.c
6	The "All rights reserved." should be dropped.
sys/netgraph/ng_vlan_rotate.h
6	The "All rights reserved." should be dropped.

afedorov added a subscriber: afedorov.Nov 19 2020, 8:04 PM

afedorov added inline comments.

share/man/man4/ng_vlan_rotate.4
3	While we're here, maybe it should be added: "SPDX-License-Identifier: BSD-2-Clause-FreeBSD"

afedorov added a reviewer: glebius.Nov 19 2020, 8:18 PM

Updated to latest revision and fixed copyright annotations.

Harbormaster completed remote builds in B34926: Diff 79796.Nov 20 2020, 10:47 AM

Mark annotations as done.

Updated to revision 368146.

Harbormaster completed remote builds in B35104: Diff 80115.Nov 29 2020, 1:33 PM

Updated to revision 368820.

Harbormaster completed remote builds in B35689: Diff 81162.Dec 24 2020, 10:33 PM

Couple really minor (and mostly style(9) remarks, other than those I think it's good.

sys/modules/netgraph/vlan_rotate/Makefile
2	This tag is no longer required in the git world. If you're planning to MFC this to stable/12 it may be useful to just leave it, because it does still do something in svn.
sys/netgraph/ng_vlan_rotate.c
30	Same.
166	This line is (just) too long.
193	Or maybe just 'else' in the above if/else cascade?
238	Line length.
373	Line length.
425	Are netgraph nodes implicitly locked? If not, this could potentially miscount if two cores run the function at the same time. Not a huge issue, but perhaps counter(9) would be useful here.
sys/netgraph/ng_vlan_rotate.h
30	Same.

Converted from subversion
Switch to counter framework for statistics
Fix style(9) errors
Bump dates

Harbormaster completed remote builds in B36492: Diff 82897.Jan 26 2021, 8:44 AM

Fix spelling error.

Harbormaster completed remote builds in B36493: Diff 82898.Jan 26 2021, 8:45 AM

donner marked an inline comment as done.Jan 26 2021, 8:45 AM

donner added inline comments.

sys/modules/netgraph/vlan_rotate/Makefile
2	So I'll leave it.
sys/netgraph/ng_vlan_rotate.c
425	They are not locked automatically (which is good). So you are right, I've to switch to the counter framework.

donner marked 2 inline comments as done.Jan 26 2021, 8:47 AM

Approved by: kp (mentor)

@brueffer are your concerns still relevant?

Just two small comments, looks good otherwise.

share/man/man4/ng_vlan_rotate.4
71	Stray comma after stack.
254	This can simply be .Nm

brueffer accepted this revision.Jan 26 2021, 3:00 PM

This revision is now accepted and ready to land.Jan 26 2021, 3:00 PM

Fix man page nits.

This revision now requires review to proceed.Jan 26 2021, 3:07 PM

Harbormaster completed remote builds in B36504: Diff 82915.Jan 26 2021, 3:07 PM

brueffer added inline comments.Jan 26 2021, 3:32 PM

share/man/man4/ng_vlan_rotate.4
254	You fixed a different .Nm than the one I pointed out ;-) This one in HISTORY can be simply .Nm as well.

Fix man page nits.
Removed false history from man page.

Harbormaster completed remote builds in B36508: Diff 82919.Jan 26 2021, 3:51 PM

brueffer accepted this revision.Jan 26 2021, 3:57 PM

This revision is now accepted and ready to land.Jan 26 2021, 3:57 PM

Closed by commit rGcfd6422a5217: netgraph/ng_vlan_rotate: IEEE 802.1ad VLAN manipulation netgraph type (authored by donner). · Explain WhyJan 26 2021, 4:00 PM

This revision was automatically updated to reflect the committed changes.

Lutz Donnerhacke <donner@FreeBSD.org> added a commit: rGcfd6422a5217: netgraph/ng_vlan_rotate: IEEE 802.1ad VLAN manipulation netgraph type.

Approved by: kp (mentor)

donner added a commit: rGa0e2fe87031a: netgraph/ng_vlan_rotate: IEEE 802.1ad VLAN manipulation netgraph type.Feb 25 2021, 7:53 AM

donner added a commit: rG522a0b7d029f: netgraph/ng_vlan_rotate: IEEE 802.1ad VLAN manipulation netgraph type.Feb 25 2021, 8:05 AM

donner added a commit: rGb2c14db4f8fd: netgraph/ng_vlan_rotate: IEEE 802.1ad VLAN manipulation netgraph type.Feb 25 2021, 10:13 AM

Diff 82897

View Options

share/man/man4/Makefile

Show First 20 Lines • Show All 491 Lines • ▼ Show 20 Lines	struct l_rt_sigframe {
l_siginfo_t sf_si;		l_siginfo_t sf_si;
struct l_ucontext sf_sc;		struct l_ucontext sf_sc;
l_handler_t sf_handler;		l_handler_t sf_handler;
};		};

extern struct sysentvec linux_sysvec;		extern struct sysentvec linux_sysvec;

/*		/*
* open/fcntl flags		* arch specific open/fcntl flags
*/		*/
#define LINUX_O_RDONLY 00000000
#define LINUX_O_WRONLY 00000001
#define LINUX_O_RDWR 00000002
#define LINUX_O_ACCMODE 00000003
#define LINUX_O_CREAT 00000100
#define LINUX_O_EXCL 00000200
#define LINUX_O_NOCTTY 00000400
#define LINUX_O_TRUNC 00001000
#define LINUX_O_APPEND 00002000
#define LINUX_O_NONBLOCK 00004000
#define LINUX_O_NDELAY LINUX_O_NONBLOCK
#define LINUX_O_SYNC 00010000
#define LINUX_FASYNC 00020000
#define LINUX_O_DIRECT 00040000 /* Direct disk access hint */
#define LINUX_O_LARGEFILE 00100000
#define LINUX_O_DIRECTORY 00200000 /* Must be a directory */
#define LINUX_O_NOFOLLOW 00400000 /* Do not follow links */
#define LINUX_O_NOATIME 01000000
#define LINUX_O_CLOEXEC 02000000

#define LINUX_F_DUPFD 0
#define LINUX_F_GETFD 1
#define LINUX_F_SETFD 2
#define LINUX_F_GETFL 3
#define LINUX_F_SETFL 4
#define LINUX_F_GETLK 5
#define LINUX_F_SETLK 6
#define LINUX_F_SETLKW 7
#define LINUX_F_SETOWN 8
#define LINUX_F_GETOWN 9

#define LINUX_F_GETLK64 12		#define LINUX_F_GETLK64 12
#define LINUX_F_SETLK64 13		#define LINUX_F_SETLK64 13
#define LINUX_F_SETLKW64 14		#define LINUX_F_SETLKW64 14

#define LINUX_F_RDLCK 0
#define LINUX_F_WRLCK 1
#define LINUX_F_UNLCK 2

union l_semun {		union l_semun {
l_int val;		l_int val;
struct l_semid_ds *buf;		struct l_semid_ds *buf;
l_ushort *array;		l_ushort *array;
struct l_seminfo *__buf;		struct l_seminfo *__buf;
void *__pad;		void *__pad;
};		};
▲ Show 20 Lines • Show All 213 Lines • Show Last 20 Lines

View Options

share/man/man4/ng_vlan_rotate.4

Show First 20 Lines • Show All 491 Lines • ▼ Show 20 Lines	struct l_rt_sigframe {
l_siginfo_t sf_si;		l_siginfo_t sf_si;
struct l_ucontext sf_sc;		struct l_ucontext sf_sc;
l_handler_t sf_handler;		l_handler_t sf_handler;
};		};

extern struct sysentvec linux_sysvec;		extern struct sysentvec linux_sysvec;

/*		/*
* open/fcntl flags		* arch specific open/fcntl flags
*/		*/
#define LINUX_O_RDONLY 00000000
#define LINUX_O_WRONLY 00000001
#define LINUX_O_RDWR 00000002
#define LINUX_O_ACCMODE 00000003
#define LINUX_O_CREAT 00000100
#define LINUX_O_EXCL 00000200
#define LINUX_O_NOCTTY 00000400
#define LINUX_O_TRUNC 00001000
#define LINUX_O_APPEND 00002000
#define LINUX_O_NONBLOCK 00004000
#define LINUX_O_NDELAY LINUX_O_NONBLOCK
#define LINUX_O_SYNC 00010000
#define LINUX_FASYNC 00020000
#define LINUX_O_DIRECT 00040000 /* Direct disk access hint */
#define LINUX_O_LARGEFILE 00100000
#define LINUX_O_DIRECTORY 00200000 /* Must be a directory */
#define LINUX_O_NOFOLLOW 00400000 /* Do not follow links */
#define LINUX_O_NOATIME 01000000
#define LINUX_O_CLOEXEC 02000000

#define LINUX_F_DUPFD 0
#define LINUX_F_GETFD 1
#define LINUX_F_SETFD 2
#define LINUX_F_GETFL 3
#define LINUX_F_SETFL 4
#define LINUX_F_GETLK 5
#define LINUX_F_SETLK 6
#define LINUX_F_SETLKW 7
#define LINUX_F_SETOWN 8
#define LINUX_F_GETOWN 9

#define LINUX_F_GETLK64 12		#define LINUX_F_GETLK64 12
#define LINUX_F_SETLK64 13		#define LINUX_F_SETLK64 13
#define LINUX_F_SETLKW64 14		#define LINUX_F_SETLKW64 14

#define LINUX_F_RDLCK 0
#define LINUX_F_WRLCK 1
#define LINUX_F_UNLCK 2

union l_semun {		union l_semun {
l_int val;		l_int val;
struct l_semid_ds *buf;		struct l_semid_ds *buf;
l_ushort *array;		l_ushort *array;
struct l_seminfo *__buf;		struct l_seminfo *__buf;
void *__pad;		void *__pad;
};		};
▲ Show 20 Lines • Show All 213 Lines • Show Last 20 Lines

View Options

sys/conf/files

Show First 20 Lines • Show All 491 Lines • ▼ Show 20 Lines	struct l_rt_sigframe {
l_siginfo_t sf_si;		l_siginfo_t sf_si;
struct l_ucontext sf_sc;		struct l_ucontext sf_sc;
l_handler_t sf_handler;		l_handler_t sf_handler;
};		};

extern struct sysentvec linux_sysvec;		extern struct sysentvec linux_sysvec;

/*		/*
* open/fcntl flags		* arch specific open/fcntl flags
*/		*/
#define LINUX_O_RDONLY 00000000
#define LINUX_O_WRONLY 00000001
#define LINUX_O_RDWR 00000002
#define LINUX_O_ACCMODE 00000003
#define LINUX_O_CREAT 00000100
#define LINUX_O_EXCL 00000200
#define LINUX_O_NOCTTY 00000400
#define LINUX_O_TRUNC 00001000
#define LINUX_O_APPEND 00002000
#define LINUX_O_NONBLOCK 00004000
#define LINUX_O_NDELAY LINUX_O_NONBLOCK
#define LINUX_O_SYNC 00010000
#define LINUX_FASYNC 00020000
#define LINUX_O_DIRECT 00040000 /* Direct disk access hint */
#define LINUX_O_LARGEFILE 00100000
#define LINUX_O_DIRECTORY 00200000 /* Must be a directory */
#define LINUX_O_NOFOLLOW 00400000 /* Do not follow links */
#define LINUX_O_NOATIME 01000000
#define LINUX_O_CLOEXEC 02000000

#define LINUX_F_DUPFD 0
#define LINUX_F_GETFD 1
#define LINUX_F_SETFD 2
#define LINUX_F_GETFL 3
#define LINUX_F_SETFL 4
#define LINUX_F_GETLK 5
#define LINUX_F_SETLK 6
#define LINUX_F_SETLKW 7
#define LINUX_F_SETOWN 8
#define LINUX_F_GETOWN 9

#define LINUX_F_GETLK64 12		#define LINUX_F_GETLK64 12
#define LINUX_F_SETLK64 13		#define LINUX_F_SETLK64 13
#define LINUX_F_SETLKW64 14		#define LINUX_F_SETLKW64 14

#define LINUX_F_RDLCK 0
#define LINUX_F_WRLCK 1
#define LINUX_F_UNLCK 2

union l_semun {		union l_semun {
l_int val;		l_int val;
struct l_semid_ds *buf;		struct l_semid_ds *buf;
l_ushort *array;		l_ushort *array;
struct l_seminfo *__buf;		struct l_seminfo *__buf;
void *__pad;		void *__pad;
};		};
▲ Show 20 Lines • Show All 213 Lines • Show Last 20 Lines

View Options

sys/modules/netgraph/Makefile

Show First 20 Lines • Show All 491 Lines • ▼ Show 20 Lines	struct l_rt_sigframe {
l_siginfo_t sf_si;		l_siginfo_t sf_si;
struct l_ucontext sf_sc;		struct l_ucontext sf_sc;
l_handler_t sf_handler;		l_handler_t sf_handler;
};		};

extern struct sysentvec linux_sysvec;		extern struct sysentvec linux_sysvec;

/*		/*
* open/fcntl flags		* arch specific open/fcntl flags
*/		*/
#define LINUX_O_RDONLY 00000000
#define LINUX_O_WRONLY 00000001
#define LINUX_O_RDWR 00000002
#define LINUX_O_ACCMODE 00000003
#define LINUX_O_CREAT 00000100
#define LINUX_O_EXCL 00000200
#define LINUX_O_NOCTTY 00000400
#define LINUX_O_TRUNC 00001000
#define LINUX_O_APPEND 00002000
#define LINUX_O_NONBLOCK 00004000
#define LINUX_O_NDELAY LINUX_O_NONBLOCK
#define LINUX_O_SYNC 00010000
#define LINUX_FASYNC 00020000
#define LINUX_O_DIRECT 00040000 /* Direct disk access hint */
#define LINUX_O_LARGEFILE 00100000
#define LINUX_O_DIRECTORY 00200000 /* Must be a directory */
#define LINUX_O_NOFOLLOW 00400000 /* Do not follow links */
#define LINUX_O_NOATIME 01000000
#define LINUX_O_CLOEXEC 02000000

#define LINUX_F_DUPFD 0
#define LINUX_F_GETFD 1
#define LINUX_F_SETFD 2
#define LINUX_F_GETFL 3
#define LINUX_F_SETFL 4
#define LINUX_F_GETLK 5
#define LINUX_F_SETLK 6
#define LINUX_F_SETLKW 7
#define LINUX_F_SETOWN 8
#define LINUX_F_GETOWN 9

#define LINUX_F_GETLK64 12		#define LINUX_F_GETLK64 12
#define LINUX_F_SETLK64 13		#define LINUX_F_SETLK64 13
#define LINUX_F_SETLKW64 14		#define LINUX_F_SETLKW64 14

#define LINUX_F_RDLCK 0
#define LINUX_F_WRLCK 1
#define LINUX_F_UNLCK 2

union l_semun {		union l_semun {
l_int val;		l_int val;
struct l_semid_ds *buf;		struct l_semid_ds *buf;
l_ushort *array;		l_ushort *array;
struct l_seminfo *__buf;		struct l_seminfo *__buf;
void *__pad;		void *__pad;
};		};
▲ Show 20 Lines • Show All 213 Lines • Show Last 20 Lines

View Options

sys/modules/netgraph/vlan_rotate/Makefile

View Options

sys/netgraph/ng_vlan_rotate.h

View Options

sys/netgraph/ng_vlan_rotate.c

netgraph/ng_vlan_rotate: IEEE 802.1ad VLAN manipulation netgraph node type (new type)
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 82897

share/man/man4/Makefile

share/man/man4/ng_vlan_rotate.4

sys/conf/files

sys/modules/netgraph/Makefile

sys/modules/netgraph/vlan_rotate/Makefile

sys/netgraph/ng_vlan_rotate.h

sys/netgraph/ng_vlan_rotate.c

netgraph/ng_vlan_rotate: IEEE 802.1ad VLAN manipulation netgraph node type (new type)ClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 82897

share/man/man4/Makefile

share/man/man4/ng_vlan_rotate.4

sys/conf/files

sys/modules/netgraph/Makefile

sys/modules/netgraph/vlan_rotate/Makefile

sys/netgraph/ng_vlan_rotate.h

sys/netgraph/ng_vlan_rotate.c

netgraph/ng_vlan_rotate: IEEE 802.1ad VLAN manipulation netgraph node type (new type)
ClosedPublic
Actions

Revision Contents
Changeset List