Allow to specify PCP on packets not belonging to any VLAN.

According to 802.1Q-2014, VLAN tagged packets with VLAN id 0 should be
considered as untagged, and only PCP and DEI values from the VLAN tag
are meaningful.  See for instance
https://www.cisco.com/c/en/us/td/docs/switches/connectedgrid/cg-switch-sw-master/software/configuration/guide/vlan0/b_vlan_0.html.

Make it possible to specify PCP value for outgoing packets on an
ethernet interface.  When PCP is supplied, the tag is appended, VLAN
id set to 0, and PCP is filled by the supplied value.  The code to do
VLAN tag encapsulation is refactored from the if_vlan.c and moved into
if_ethersubr.c.

Drivers might have issues with filtering VID 0 packets on
receive.  This bug should be fixed for each driver.

Reviewed by:	ae (previous version), hselasky, melifaro
Sponsored by:	Mellanox Technologies
MFC after:	2 weeks
Differential revision:	https://reviews.freebsd.org/D14702
This commit is contained in:
kib 2018-03-27 15:29:32 +00:00 committed by Sebastian Huber
parent 9cea1c4489
commit b0250c7356
2 changed files with 6 additions and 0 deletions

View File

@ -416,6 +416,7 @@ struct ifreq {
#define ifr_index ifr_ifru.ifru_index /* interface index */ #define ifr_index ifr_ifru.ifru_index /* interface index */
#define ifr_fib ifr_ifru.ifru_fib /* interface fib */ #define ifr_fib ifr_ifru.ifru_fib /* interface fib */
#define ifr_vlan_pcp ifr_ifru.ifru_vlan_pcp /* VLAN priority */ #define ifr_vlan_pcp ifr_ifru.ifru_vlan_pcp /* VLAN priority */
#define ifr_lan_pcp ifr_ifru.ifru_vlan_pcp /* VLAN priority */
}; };
#define _SIZEOF_ADDR_IFREQ(ifr) \ #define _SIZEOF_ADDR_IFREQ(ifr) \
@ -565,6 +566,8 @@ struct ifrsshash {
uint32_t ifrh_types; /* RSS_TYPE_ */ uint32_t ifrh_types; /* RSS_TYPE_ */
}; };
#define IFNET_PCP_NONE 0xff /* PCP disabled */
#endif /* __BSD_VISIBLE */ #endif /* __BSD_VISIBLE */
#ifdef _KERNEL #ifdef _KERNEL

View File

@ -140,4 +140,7 @@
#define SIOCGIFRSSHASH _IOWR('i', 151, struct ifrsshash)/* get the current RSS #define SIOCGIFRSSHASH _IOWR('i', 151, struct ifrsshash)/* get the current RSS
type/func settings */ type/func settings */
#define SIOCGLANPCP _IOWR('i', 152, struct ifreq) /* Get (V)LAN PCP */
#define SIOCSLANPCP _IOW('i', 153, struct ifreq) /* Set (V)LAN PCP */
#endif /* !_SYS_SOCKIO_H_ */ #endif /* !_SYS_SOCKIO_H_ */