mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-18 18:23:53 +08:00
ed2d265d12
"[RFC - PATCH 0/7] consolidation of BUG support code." https://lkml.org/lkml/2012/1/26/525 -- The changes shown here are to unify linux's BUG support under the one <linux/bug.h> file. Due to historical reasons, we have some BUG code in bug.h and some in kernel.h -- i.e. the support for BUILD_BUG in linux/kernel.h predates the addition of linux/bug.h, but old code in kernel.h wasn't moved to bug.h at that time. As a band-aid, kernel.h was including <asm/bug.h> to pseudo link them. This has caused confusion[1] and general yuck/WTF[2] reactions. Here is an example that violates the principle of least surprise: CC lib/string.o lib/string.c: In function 'strlcat': lib/string.c:225:2: error: implicit declaration of function 'BUILD_BUG_ON' make[2]: *** [lib/string.o] Error 1 $ $ grep linux/bug.h lib/string.c #include <linux/bug.h> $ We've included <linux/bug.h> for the BUG infrastructure and yet we still get a compile fail! [We've not kernel.h for BUILD_BUG_ON.] Ugh - very confusing for someone who is new to kernel development. With the above in mind, the goals of this changeset are: 1) find and fix any include/*.h files that were relying on the implicit presence of BUG code. 2) find and fix any C files that were consuming kernel.h and hence relying on implicitly getting some/all BUG code. 3) Move the BUG related code living in kernel.h to <linux/bug.h> 4) remove the asm/bug.h from kernel.h to finally break the chain. During development, the order was more like 3-4, build-test, 1-2. But to ensure that git history for bisect doesn't get needless build failures introduced, the commits have been reorderd to fix the problem areas in advance. [1] https://lkml.org/lkml/2012/1/3/90 [2] https://lkml.org/lkml/2012/1/17/414 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPbNwpAAoJEOvOhAQsB9HWrqYP/A0t9VB0nK6e42F0OR2P14MZ GJFtf1B++wwioIrx+KSWSRfSur1C5FKhDbxLR3I/pvkAYl4+T4JvRdMG6xJwxyip CC1kVQQNDjWVVqzjz2x6rYkOffx6dUlw/ERyIyk+OzP+1HzRIsIrugMqbzGLlX0X y0v2Tbd0G6xg1DV8lcRdp95eIzcGuUvdb2iY2LGadWZczEOeSXx64Jz3QCFxg3aL LFU4oovsg8Nb7MRJmqDvHK/oQf5vaTm9WSrS0pvVte0msSQRn8LStYdWC0G9BPCS GwL86h/eLXlUXQlC5GpgWg1QQt5i2QpjBFcVBIG0IT5SgEPMx+gXyiqZva2KwbHu LKicjKtfnzPitQnyEV/N6JyV1fb1U6/MsB7ebU5nCCzt9Gr7MYbjZ44peNeprAtu HMvJ/BNnRr4Ha6nPQNu952AdASPKkxmeXFUwBL1zUbLkOX/bK/vy1ujlcdkFxCD7 fP3t7hghYa737IHk0ehUOhrE4H67hvxTSCKioLUAy/YeN1IcfH/iOQiCBQVLWmoS AqYV6ou9cqgdYoyila2UeAqegb+8xyubPIHt+lebcaKxs5aGsTg+r3vq5juMDAPs iwSVYUDcIw9dHer1lJfo7QCy3QUTRDTxh+LB9VlHXQICgeCK02sLBOi9hbEr4/H8 Ko9g8J3BMxcMkXLHT9ud =PYQT -----END PGP SIGNATURE----- Merge tag 'bug-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux Pull <linux/bug.h> cleanup from Paul Gortmaker: "The changes shown here are to unify linux's BUG support under the one <linux/bug.h> file. Due to historical reasons, we have some BUG code in bug.h and some in kernel.h -- i.e. the support for BUILD_BUG in linux/kernel.h predates the addition of linux/bug.h, but old code in kernel.h wasn't moved to bug.h at that time. As a band-aid, kernel.h was including <asm/bug.h> to pseudo link them. This has caused confusion[1] and general yuck/WTF[2] reactions. Here is an example that violates the principle of least surprise: CC lib/string.o lib/string.c: In function 'strlcat': lib/string.c:225:2: error: implicit declaration of function 'BUILD_BUG_ON' make[2]: *** [lib/string.o] Error 1 $ $ grep linux/bug.h lib/string.c #include <linux/bug.h> $ We've included <linux/bug.h> for the BUG infrastructure and yet we still get a compile fail! [We've not kernel.h for BUILD_BUG_ON.] Ugh - very confusing for someone who is new to kernel development. With the above in mind, the goals of this changeset are: 1) find and fix any include/*.h files that were relying on the implicit presence of BUG code. 2) find and fix any C files that were consuming kernel.h and hence relying on implicitly getting some/all BUG code. 3) Move the BUG related code living in kernel.h to <linux/bug.h> 4) remove the asm/bug.h from kernel.h to finally break the chain. During development, the order was more like 3-4, build-test, 1-2. But to ensure that git history for bisect doesn't get needless build failures introduced, the commits have been reorderd to fix the problem areas in advance. [1] https://lkml.org/lkml/2012/1/3/90 [2] https://lkml.org/lkml/2012/1/17/414" Fix up conflicts (new radeon file, reiserfs header cleanups) as per Paul and linux-next. * tag 'bug-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: kernel.h: doesn't explicitly use bug.h, so don't include it. bug: consolidate BUILD_BUG_ON with other bug code BUG: headers with BUG/BUG_ON etc. need linux/bug.h bug.h: add include of it to various implicit C users lib: fix implicit users of kernel.h for TAINT_WARN spinlock: macroize assert_spin_locked to avoid bug.h dependency x86: relocate get/set debugreg fcns to include/asm/debugreg.
408 lines
10 KiB
C
408 lines
10 KiB
C
/*
|
|
* VLAN An implementation of 802.1Q VLAN tagging.
|
|
*
|
|
* Authors: Ben Greear <greearb@candelatech.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*
|
|
*/
|
|
|
|
#ifndef _LINUX_IF_VLAN_H_
|
|
#define _LINUX_IF_VLAN_H_
|
|
|
|
#ifdef __KERNEL__
|
|
#include <linux/netdevice.h>
|
|
#include <linux/etherdevice.h>
|
|
#include <linux/rtnetlink.h>
|
|
#include <linux/bug.h>
|
|
|
|
#define VLAN_HLEN 4 /* The additional bytes required by VLAN
|
|
* (in addition to the Ethernet header)
|
|
*/
|
|
#define VLAN_ETH_HLEN 18 /* Total octets in header. */
|
|
#define VLAN_ETH_ZLEN 64 /* Min. octets in frame sans FCS */
|
|
|
|
/*
|
|
* According to 802.3ac, the packet can be 4 bytes longer. --Klika Jan
|
|
*/
|
|
#define VLAN_ETH_DATA_LEN 1500 /* Max. octets in payload */
|
|
#define VLAN_ETH_FRAME_LEN 1518 /* Max. octets in frame sans FCS */
|
|
|
|
/*
|
|
* struct vlan_hdr - vlan header
|
|
* @h_vlan_TCI: priority and VLAN ID
|
|
* @h_vlan_encapsulated_proto: packet type ID or len
|
|
*/
|
|
struct vlan_hdr {
|
|
__be16 h_vlan_TCI;
|
|
__be16 h_vlan_encapsulated_proto;
|
|
};
|
|
|
|
/**
|
|
* struct vlan_ethhdr - vlan ethernet header (ethhdr + vlan_hdr)
|
|
* @h_dest: destination ethernet address
|
|
* @h_source: source ethernet address
|
|
* @h_vlan_proto: ethernet protocol (always 0x8100)
|
|
* @h_vlan_TCI: priority and VLAN ID
|
|
* @h_vlan_encapsulated_proto: packet type ID or len
|
|
*/
|
|
struct vlan_ethhdr {
|
|
unsigned char h_dest[ETH_ALEN];
|
|
unsigned char h_source[ETH_ALEN];
|
|
__be16 h_vlan_proto;
|
|
__be16 h_vlan_TCI;
|
|
__be16 h_vlan_encapsulated_proto;
|
|
};
|
|
|
|
#include <linux/skbuff.h>
|
|
|
|
static inline struct vlan_ethhdr *vlan_eth_hdr(const struct sk_buff *skb)
|
|
{
|
|
return (struct vlan_ethhdr *)skb_mac_header(skb);
|
|
}
|
|
|
|
#define VLAN_PRIO_MASK 0xe000 /* Priority Code Point */
|
|
#define VLAN_PRIO_SHIFT 13
|
|
#define VLAN_CFI_MASK 0x1000 /* Canonical Format Indicator */
|
|
#define VLAN_TAG_PRESENT VLAN_CFI_MASK
|
|
#define VLAN_VID_MASK 0x0fff /* VLAN Identifier */
|
|
#define VLAN_N_VID 4096
|
|
|
|
/* found in socket.c */
|
|
extern void vlan_ioctl_set(int (*hook)(struct net *, void __user *));
|
|
|
|
struct vlan_info;
|
|
|
|
static inline int is_vlan_dev(struct net_device *dev)
|
|
{
|
|
return dev->priv_flags & IFF_802_1Q_VLAN;
|
|
}
|
|
|
|
#define vlan_tx_tag_present(__skb) ((__skb)->vlan_tci & VLAN_TAG_PRESENT)
|
|
#define vlan_tx_tag_get(__skb) ((__skb)->vlan_tci & ~VLAN_TAG_PRESENT)
|
|
|
|
#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
|
|
|
|
extern struct net_device *__vlan_find_dev_deep(struct net_device *real_dev,
|
|
u16 vlan_id);
|
|
extern struct net_device *vlan_dev_real_dev(const struct net_device *dev);
|
|
extern u16 vlan_dev_vlan_id(const struct net_device *dev);
|
|
|
|
extern bool vlan_do_receive(struct sk_buff **skb, bool last_handler);
|
|
extern struct sk_buff *vlan_untag(struct sk_buff *skb);
|
|
|
|
extern int vlan_vid_add(struct net_device *dev, unsigned short vid);
|
|
extern void vlan_vid_del(struct net_device *dev, unsigned short vid);
|
|
|
|
extern int vlan_vids_add_by_dev(struct net_device *dev,
|
|
const struct net_device *by_dev);
|
|
extern void vlan_vids_del_by_dev(struct net_device *dev,
|
|
const struct net_device *by_dev);
|
|
#else
|
|
static inline struct net_device *
|
|
__vlan_find_dev_deep(struct net_device *real_dev, u16 vlan_id)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static inline struct net_device *vlan_dev_real_dev(const struct net_device *dev)
|
|
{
|
|
BUG();
|
|
return NULL;
|
|
}
|
|
|
|
static inline u16 vlan_dev_vlan_id(const struct net_device *dev)
|
|
{
|
|
BUG();
|
|
return 0;
|
|
}
|
|
|
|
static inline bool vlan_do_receive(struct sk_buff **skb, bool last_handler)
|
|
{
|
|
if (((*skb)->vlan_tci & VLAN_VID_MASK) && last_handler)
|
|
(*skb)->pkt_type = PACKET_OTHERHOST;
|
|
return false;
|
|
}
|
|
|
|
static inline struct sk_buff *vlan_untag(struct sk_buff *skb)
|
|
{
|
|
return skb;
|
|
}
|
|
|
|
static inline int vlan_vid_add(struct net_device *dev, unsigned short vid)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void vlan_vid_del(struct net_device *dev, unsigned short vid)
|
|
{
|
|
}
|
|
|
|
static inline int vlan_vids_add_by_dev(struct net_device *dev,
|
|
const struct net_device *by_dev)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void vlan_vids_del_by_dev(struct net_device *dev,
|
|
const struct net_device *by_dev)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
/**
|
|
* vlan_insert_tag - regular VLAN tag inserting
|
|
* @skb: skbuff to tag
|
|
* @vlan_tci: VLAN TCI to insert
|
|
*
|
|
* Inserts the VLAN tag into @skb as part of the payload
|
|
* Returns a VLAN tagged skb. If a new skb is created, @skb is freed.
|
|
*
|
|
* Following the skb_unshare() example, in case of error, the calling function
|
|
* doesn't have to worry about freeing the original skb.
|
|
*
|
|
* Does not change skb->protocol so this function can be used during receive.
|
|
*/
|
|
static inline struct sk_buff *vlan_insert_tag(struct sk_buff *skb, u16 vlan_tci)
|
|
{
|
|
struct vlan_ethhdr *veth;
|
|
|
|
if (skb_cow_head(skb, VLAN_HLEN) < 0) {
|
|
kfree_skb(skb);
|
|
return NULL;
|
|
}
|
|
veth = (struct vlan_ethhdr *)skb_push(skb, VLAN_HLEN);
|
|
|
|
/* Move the mac addresses to the beginning of the new header. */
|
|
memmove(skb->data, skb->data + VLAN_HLEN, 2 * ETH_ALEN);
|
|
skb->mac_header -= VLAN_HLEN;
|
|
|
|
/* first, the ethernet type */
|
|
veth->h_vlan_proto = htons(ETH_P_8021Q);
|
|
|
|
/* now, the TCI */
|
|
veth->h_vlan_TCI = htons(vlan_tci);
|
|
|
|
return skb;
|
|
}
|
|
|
|
/**
|
|
* __vlan_put_tag - regular VLAN tag inserting
|
|
* @skb: skbuff to tag
|
|
* @vlan_tci: VLAN TCI to insert
|
|
*
|
|
* Inserts the VLAN tag into @skb as part of the payload
|
|
* Returns a VLAN tagged skb. If a new skb is created, @skb is freed.
|
|
*
|
|
* Following the skb_unshare() example, in case of error, the calling function
|
|
* doesn't have to worry about freeing the original skb.
|
|
*/
|
|
static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, u16 vlan_tci)
|
|
{
|
|
skb = vlan_insert_tag(skb, vlan_tci);
|
|
if (skb)
|
|
skb->protocol = htons(ETH_P_8021Q);
|
|
return skb;
|
|
}
|
|
|
|
/**
|
|
* __vlan_hwaccel_put_tag - hardware accelerated VLAN inserting
|
|
* @skb: skbuff to tag
|
|
* @vlan_tci: VLAN TCI to insert
|
|
*
|
|
* Puts the VLAN TCI in @skb->vlan_tci and lets the device do the rest
|
|
*/
|
|
static inline struct sk_buff *__vlan_hwaccel_put_tag(struct sk_buff *skb,
|
|
u16 vlan_tci)
|
|
{
|
|
skb->vlan_tci = VLAN_TAG_PRESENT | vlan_tci;
|
|
return skb;
|
|
}
|
|
|
|
#define HAVE_VLAN_PUT_TAG
|
|
|
|
/**
|
|
* vlan_put_tag - inserts VLAN tag according to device features
|
|
* @skb: skbuff to tag
|
|
* @vlan_tci: VLAN TCI to insert
|
|
*
|
|
* Assumes skb->dev is the target that will xmit this frame.
|
|
* Returns a VLAN tagged skb.
|
|
*/
|
|
static inline struct sk_buff *vlan_put_tag(struct sk_buff *skb, u16 vlan_tci)
|
|
{
|
|
if (skb->dev->features & NETIF_F_HW_VLAN_TX) {
|
|
return __vlan_hwaccel_put_tag(skb, vlan_tci);
|
|
} else {
|
|
return __vlan_put_tag(skb, vlan_tci);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* __vlan_get_tag - get the VLAN ID that is part of the payload
|
|
* @skb: skbuff to query
|
|
* @vlan_tci: buffer to store vlaue
|
|
*
|
|
* Returns error if the skb is not of VLAN type
|
|
*/
|
|
static inline int __vlan_get_tag(const struct sk_buff *skb, u16 *vlan_tci)
|
|
{
|
|
struct vlan_ethhdr *veth = (struct vlan_ethhdr *)skb->data;
|
|
|
|
if (veth->h_vlan_proto != htons(ETH_P_8021Q)) {
|
|
return -EINVAL;
|
|
}
|
|
|
|
*vlan_tci = ntohs(veth->h_vlan_TCI);
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* __vlan_hwaccel_get_tag - get the VLAN ID that is in @skb->cb[]
|
|
* @skb: skbuff to query
|
|
* @vlan_tci: buffer to store vlaue
|
|
*
|
|
* Returns error if @skb->vlan_tci is not set correctly
|
|
*/
|
|
static inline int __vlan_hwaccel_get_tag(const struct sk_buff *skb,
|
|
u16 *vlan_tci)
|
|
{
|
|
if (vlan_tx_tag_present(skb)) {
|
|
*vlan_tci = vlan_tx_tag_get(skb);
|
|
return 0;
|
|
} else {
|
|
*vlan_tci = 0;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
#define HAVE_VLAN_GET_TAG
|
|
|
|
/**
|
|
* vlan_get_tag - get the VLAN ID from the skb
|
|
* @skb: skbuff to query
|
|
* @vlan_tci: buffer to store vlaue
|
|
*
|
|
* Returns error if the skb is not VLAN tagged
|
|
*/
|
|
static inline int vlan_get_tag(const struct sk_buff *skb, u16 *vlan_tci)
|
|
{
|
|
if (skb->dev->features & NETIF_F_HW_VLAN_TX) {
|
|
return __vlan_hwaccel_get_tag(skb, vlan_tci);
|
|
} else {
|
|
return __vlan_get_tag(skb, vlan_tci);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* vlan_get_protocol - get protocol EtherType.
|
|
* @skb: skbuff to query
|
|
*
|
|
* Returns the EtherType of the packet, regardless of whether it is
|
|
* vlan encapsulated (normal or hardware accelerated) or not.
|
|
*/
|
|
static inline __be16 vlan_get_protocol(const struct sk_buff *skb)
|
|
{
|
|
__be16 protocol = 0;
|
|
|
|
if (vlan_tx_tag_present(skb) ||
|
|
skb->protocol != cpu_to_be16(ETH_P_8021Q))
|
|
protocol = skb->protocol;
|
|
else {
|
|
__be16 proto, *protop;
|
|
protop = skb_header_pointer(skb, offsetof(struct vlan_ethhdr,
|
|
h_vlan_encapsulated_proto),
|
|
sizeof(proto), &proto);
|
|
if (likely(protop))
|
|
protocol = *protop;
|
|
}
|
|
|
|
return protocol;
|
|
}
|
|
|
|
static inline void vlan_set_encap_proto(struct sk_buff *skb,
|
|
struct vlan_hdr *vhdr)
|
|
{
|
|
__be16 proto;
|
|
unsigned char *rawp;
|
|
|
|
/*
|
|
* Was a VLAN packet, grab the encapsulated protocol, which the layer
|
|
* three protocols care about.
|
|
*/
|
|
|
|
proto = vhdr->h_vlan_encapsulated_proto;
|
|
if (ntohs(proto) >= 1536) {
|
|
skb->protocol = proto;
|
|
return;
|
|
}
|
|
|
|
rawp = skb->data;
|
|
if (*(unsigned short *) rawp == 0xFFFF)
|
|
/*
|
|
* This is a magic hack to spot IPX packets. Older Novell
|
|
* breaks the protocol design and runs IPX over 802.3 without
|
|
* an 802.2 LLC layer. We look for FFFF which isn't a used
|
|
* 802.2 SSAP/DSAP. This won't work for fault tolerant netware
|
|
* but does for the rest.
|
|
*/
|
|
skb->protocol = htons(ETH_P_802_3);
|
|
else
|
|
/*
|
|
* Real 802.2 LLC
|
|
*/
|
|
skb->protocol = htons(ETH_P_802_2);
|
|
}
|
|
#endif /* __KERNEL__ */
|
|
|
|
/* VLAN IOCTLs are found in sockios.h */
|
|
|
|
/* Passed in vlan_ioctl_args structure to determine behaviour. */
|
|
enum vlan_ioctl_cmds {
|
|
ADD_VLAN_CMD,
|
|
DEL_VLAN_CMD,
|
|
SET_VLAN_INGRESS_PRIORITY_CMD,
|
|
SET_VLAN_EGRESS_PRIORITY_CMD,
|
|
GET_VLAN_INGRESS_PRIORITY_CMD,
|
|
GET_VLAN_EGRESS_PRIORITY_CMD,
|
|
SET_VLAN_NAME_TYPE_CMD,
|
|
SET_VLAN_FLAG_CMD,
|
|
GET_VLAN_REALDEV_NAME_CMD, /* If this works, you know it's a VLAN device, btw */
|
|
GET_VLAN_VID_CMD /* Get the VID of this VLAN (specified by name) */
|
|
};
|
|
|
|
enum vlan_flags {
|
|
VLAN_FLAG_REORDER_HDR = 0x1,
|
|
VLAN_FLAG_GVRP = 0x2,
|
|
VLAN_FLAG_LOOSE_BINDING = 0x4,
|
|
};
|
|
|
|
enum vlan_name_types {
|
|
VLAN_NAME_TYPE_PLUS_VID, /* Name will look like: vlan0005 */
|
|
VLAN_NAME_TYPE_RAW_PLUS_VID, /* name will look like: eth1.0005 */
|
|
VLAN_NAME_TYPE_PLUS_VID_NO_PAD, /* Name will look like: vlan5 */
|
|
VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, /* Name will look like: eth0.5 */
|
|
VLAN_NAME_TYPE_HIGHEST
|
|
};
|
|
|
|
struct vlan_ioctl_args {
|
|
int cmd; /* Should be one of the vlan_ioctl_cmds enum above. */
|
|
char device1[24];
|
|
|
|
union {
|
|
char device2[24];
|
|
int VID;
|
|
unsigned int skb_priority;
|
|
unsigned int name_type;
|
|
unsigned int bind_type;
|
|
unsigned int flag; /* Matches vlan_dev_priv flags */
|
|
} u;
|
|
|
|
short vlan_qos;
|
|
};
|
|
|
|
#endif /* !(_LINUX_IF_VLAN_H_) */
|