License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 15:07:57 +01:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0 */
|
2005-04-16 15:20:36 -07:00
|
|
|
#ifndef __BEN_VLAN_802_1Q_INC__
|
|
|
|
|
#define __BEN_VLAN_802_1Q_INC__
|
|
|
|
|
|
|
|
|
|
#include <linux/if_vlan.h>
|
2010-06-24 00:55:06 +00:00
|
|
|
#include <linux/u64_stats_sync.h>
|
2011-12-08 04:11:18 +00:00
|
|
|
#include <linux/list.h>
|
2005-04-16 15:20:36 -07:00
|
|
|
|
2011-12-08 04:11:18 +00:00
|
|
|
/* if this changes, algorithm will have to be reworked because this
|
|
|
|
|
* depends on completely exhausting the VLAN identifier space. Thus
|
|
|
|
|
* it gives constant time look-up, but in many cases it wastes memory.
|
|
|
|
|
*/
|
|
|
|
|
#define VLAN_GROUP_ARRAY_SPLIT_PARTS 8
|
|
|
|
|
#define VLAN_GROUP_ARRAY_PART_LEN (VLAN_N_VID/VLAN_GROUP_ARRAY_SPLIT_PARTS)
|
|
|
|
|
|
2013-04-19 02:04:29 +00:00
|
|
|
enum vlan_protos {
|
|
|
|
|
VLAN_PROTO_8021Q = 0,
|
net: vlan: add 802.1ad support
Add support for 802.1ad VLAN devices. This mainly consists of checking for
ETH_P_8021AD in addition to ETH_P_8021Q in a couple of places and check
offloading capabilities based on the used protocol.
Configuration is done using "ip link":
# ip link add link eth0 eth0.1000 \
type vlan proto 802.1ad id 1000
# ip link add link eth0.1000 eth0.1000.1000 \
type vlan proto 802.1q id 1000
52:54:00:12:34:56 > 92:b1:54:28:e4:8c, ethertype 802.1Q (0x8100), length 106: vlan 1000, p 0, ethertype 802.1Q, vlan 1000, p 0, ethertype IPv4, (tos 0x0, ttl 64, id 0, offset 0, flags [DF], proto ICMP (1), length 84)
20.1.0.2 > 20.1.0.1: ICMP echo request, id 3003, seq 8, length 64
92:b1:54:28:e4:8c > 52:54:00:12:34:56, ethertype 802.1Q-QinQ (0x88a8), length 106: vlan 1000, p 0, ethertype 802.1Q, vlan 1000, p 0, ethertype IPv4, (tos 0x0, ttl 64, id 47944, offset 0, flags [none], proto ICMP (1), length 84)
20.1.0.1 > 20.1.0.2: ICMP echo reply, id 3003, seq 8, length 64
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-19 02:04:31 +00:00
|
|
|
VLAN_PROTO_8021AD,
|
2013-04-19 02:04:29 +00:00
|
|
|
VLAN_PROTO_NUM,
|
|
|
|
|
};
|
|
|
|
|
|
2011-12-08 04:11:18 +00:00
|
|
|
struct vlan_group {
|
|
|
|
|
unsigned int nr_vlan_devs;
|
|
|
|
|
struct hlist_node hlist; /* linked list */
|
2013-04-19 02:04:29 +00:00
|
|
|
struct net_device **vlan_devices_arrays[VLAN_PROTO_NUM]
|
|
|
|
|
[VLAN_GROUP_ARRAY_SPLIT_PARTS];
|
2011-12-08 04:11:18 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct vlan_info {
|
|
|
|
|
struct net_device *real_dev; /* The ethernet(like) device
|
|
|
|
|
* the vlan is attached to.
|
|
|
|
|
*/
|
|
|
|
|
struct vlan_group grp;
|
|
|
|
|
struct list_head vid_list;
|
|
|
|
|
unsigned int nr_vids;
|
net: vlan: fix VLAN 0 refcount imbalance of toggling filtering during runtime
Assuming the "rx-vlan-filter" feature is enabled on a net device, the
8021q module will automatically add or remove VLAN 0 when the net device
is put administratively up or down, respectively. There are a couple of
problems with the above scheme.
The first problem is a memory leak that can happen if the "rx-vlan-filter"
feature is disabled while the device is running:
# ip link add bond1 up type bond mode 0
# ethtool -K bond1 rx-vlan-filter off
# ip link del dev bond1
When the device is put administratively down the "rx-vlan-filter"
feature is disabled, so the 8021q module will not remove VLAN 0 and the
memory will be leaked [1].
Another problem that can happen is that the kernel can automatically
delete VLAN 0 when the device is put administratively down despite not
adding it when the device was put administratively up since during that
time the "rx-vlan-filter" feature was disabled. null-ptr-unref or
bug_on[2] will be triggered by unregister_vlan_dev() for refcount
imbalance if toggling filtering during runtime:
$ ip link add bond0 type bond mode 0
$ ip link add link bond0 name vlan0 type vlan id 0 protocol 802.1q
$ ethtool -K bond0 rx-vlan-filter off
$ ifconfig bond0 up
$ ethtool -K bond0 rx-vlan-filter on
$ ifconfig bond0 down
$ ip link del vlan0
Root cause is as below:
step1: add vlan0 for real_dev, such as bond, team.
register_vlan_dev
vlan_vid_add(real_dev,htons(ETH_P_8021Q),0) //refcnt=1
step2: disable vlan filter feature and enable real_dev
step3: change filter from 0 to 1
vlan_device_event
vlan_filter_push_vids
ndo_vlan_rx_add_vid //No refcnt added to real_dev vlan0
step4: real_dev down
vlan_device_event
vlan_vid_del(dev, htons(ETH_P_8021Q), 0); //refcnt=0
vlan_info_rcu_free //free vlan0
step5: delete vlan0
unregister_vlan_dev
BUG_ON(!vlan_info); //vlan_info is null
Fix both problems by noting in the VLAN info whether VLAN 0 was
automatically added upon NETDEV_UP and based on that decide whether it
should be deleted upon NETDEV_DOWN, regardless of the state of the
"rx-vlan-filter" feature.
[1]
unreferenced object 0xffff8880068e3100 (size 256):
comm "ip", pid 384, jiffies 4296130254
hex dump (first 32 bytes):
00 20 30 0d 80 88 ff ff 00 00 00 00 00 00 00 00 . 0.............
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace (crc 81ce31fa):
__kmalloc_cache_noprof+0x2b5/0x340
vlan_vid_add+0x434/0x940
vlan_device_event.cold+0x75/0xa8
notifier_call_chain+0xca/0x150
__dev_notify_flags+0xe3/0x250
rtnl_configure_link+0x193/0x260
rtnl_newlink_create+0x383/0x8e0
__rtnl_newlink+0x22c/0xa40
rtnl_newlink+0x627/0xb00
rtnetlink_rcv_msg+0x6fb/0xb70
netlink_rcv_skb+0x11f/0x350
netlink_unicast+0x426/0x710
netlink_sendmsg+0x75a/0xc20
__sock_sendmsg+0xc1/0x150
____sys_sendmsg+0x5aa/0x7b0
___sys_sendmsg+0xfc/0x180
[2]
kernel BUG at net/8021q/vlan.c:99!
Oops: invalid opcode: 0000 [#1] SMP KASAN PTI
CPU: 0 UID: 0 PID: 382 Comm: ip Not tainted 6.16.0-rc3 #61 PREEMPT(voluntary)
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996),
BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014
RIP: 0010:unregister_vlan_dev (net/8021q/vlan.c:99 (discriminator 1))
RSP: 0018:ffff88810badf310 EFLAGS: 00010246
RAX: 0000000000000000 RBX: ffff88810da84000 RCX: ffffffffb47ceb9a
RDX: dffffc0000000000 RSI: 0000000000000008 RDI: ffff88810e8b43c8
RBP: 0000000000000000 R08: 0000000000000000 R09: fffffbfff6cefe80
R10: ffffffffb677f407 R11: ffff88810badf3c0 R12: ffff88810e8b4000
R13: 0000000000000000 R14: ffff88810642a5c0 R15: 000000000000017e
FS: 00007f1ff68c20c0(0000) GS:ffff888163a24000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f1ff5dad240 CR3: 0000000107e56000 CR4: 00000000000006f0
Call Trace:
<TASK>
rtnl_dellink (net/core/rtnetlink.c:3511 net/core/rtnetlink.c:3553)
rtnetlink_rcv_msg (net/core/rtnetlink.c:6945)
netlink_rcv_skb (net/netlink/af_netlink.c:2535)
netlink_unicast (net/netlink/af_netlink.c:1314 net/netlink/af_netlink.c:1339)
netlink_sendmsg (net/netlink/af_netlink.c:1883)
____sys_sendmsg (net/socket.c:712 net/socket.c:727 net/socket.c:2566)
___sys_sendmsg (net/socket.c:2622)
__sys_sendmsg (net/socket.c:2652)
do_syscall_64 (arch/x86/entry/syscall_64.c:63 arch/x86/entry/syscall_64.c:94)
Fixes: ad1afb003939 ("vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)")
Reported-by: syzbot+a8b046e462915c65b10b@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=a8b046e462915c65b10b
Suggested-by: Ido Schimmel <idosch@idosch.org>
Signed-off-by: Dong Chenchen <dongchenchen2@huawei.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Link: https://patch.msgid.link/20250716034504.2285203-2-dongchenchen2@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2025-07-16 11:45:03 +08:00
|
|
|
bool auto_vid0;
|
2011-12-08 04:11:18 +00:00
|
|
|
struct rcu_head rcu;
|
|
|
|
|
};
|
|
|
|
|
|
2020-09-24 17:27:44 -07:00
|
|
|
static inline int vlan_proto_idx(__be16 proto)
|
2013-04-19 02:04:29 +00:00
|
|
|
{
|
|
|
|
|
switch (proto) {
|
2014-03-12 10:04:15 -07:00
|
|
|
case htons(ETH_P_8021Q):
|
2013-04-19 02:04:29 +00:00
|
|
|
return VLAN_PROTO_8021Q;
|
2014-03-12 10:04:15 -07:00
|
|
|
case htons(ETH_P_8021AD):
|
net: vlan: add 802.1ad support
Add support for 802.1ad VLAN devices. This mainly consists of checking for
ETH_P_8021AD in addition to ETH_P_8021Q in a couple of places and check
offloading capabilities based on the used protocol.
Configuration is done using "ip link":
# ip link add link eth0 eth0.1000 \
type vlan proto 802.1ad id 1000
# ip link add link eth0.1000 eth0.1000.1000 \
type vlan proto 802.1q id 1000
52:54:00:12:34:56 > 92:b1:54:28:e4:8c, ethertype 802.1Q (0x8100), length 106: vlan 1000, p 0, ethertype 802.1Q, vlan 1000, p 0, ethertype IPv4, (tos 0x0, ttl 64, id 0, offset 0, flags [DF], proto ICMP (1), length 84)
20.1.0.2 > 20.1.0.1: ICMP echo request, id 3003, seq 8, length 64
92:b1:54:28:e4:8c > 52:54:00:12:34:56, ethertype 802.1Q-QinQ (0x88a8), length 106: vlan 1000, p 0, ethertype 802.1Q, vlan 1000, p 0, ethertype IPv4, (tos 0x0, ttl 64, id 47944, offset 0, flags [none], proto ICMP (1), length 84)
20.1.0.1 > 20.1.0.2: ICMP echo reply, id 3003, seq 8, length 64
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-19 02:04:31 +00:00
|
|
|
return VLAN_PROTO_8021AD;
|
2013-04-19 02:04:29 +00:00
|
|
|
default:
|
2020-09-24 17:27:44 -07:00
|
|
|
WARN(1, "invalid VLAN protocol: 0x%04x\n", ntohs(proto));
|
|
|
|
|
return -EINVAL;
|
2013-04-19 02:04:29 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline struct net_device *__vlan_group_get_device(struct vlan_group *vg,
|
|
|
|
|
unsigned int pidx,
|
|
|
|
|
u16 vlan_id)
|
2011-07-20 04:54:49 +00:00
|
|
|
{
|
|
|
|
|
struct net_device **array;
|
2013-04-19 02:04:29 +00:00
|
|
|
|
|
|
|
|
array = vg->vlan_devices_arrays[pidx]
|
|
|
|
|
[vlan_id / VLAN_GROUP_ARRAY_PART_LEN];
|
2021-04-19 21:56:41 +08:00
|
|
|
|
|
|
|
|
/* paired with smp_wmb() in vlan_group_prealloc_vid() */
|
|
|
|
|
smp_rmb();
|
|
|
|
|
|
2011-07-20 04:54:49 +00:00
|
|
|
return array ? array[vlan_id % VLAN_GROUP_ARRAY_PART_LEN] : NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2013-04-19 02:04:29 +00:00
|
|
|
static inline struct net_device *vlan_group_get_device(struct vlan_group *vg,
|
|
|
|
|
__be16 vlan_proto,
|
|
|
|
|
u16 vlan_id)
|
|
|
|
|
{
|
2020-09-24 17:27:44 -07:00
|
|
|
int pidx = vlan_proto_idx(vlan_proto);
|
|
|
|
|
|
|
|
|
|
if (pidx < 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
return __vlan_group_get_device(vg, pidx, vlan_id);
|
2013-04-19 02:04:29 +00:00
|
|
|
}
|
|
|
|
|
|
2011-07-20 04:54:49 +00:00
|
|
|
static inline void vlan_group_set_device(struct vlan_group *vg,
|
2013-04-19 02:04:29 +00:00
|
|
|
__be16 vlan_proto, u16 vlan_id,
|
2011-07-20 04:54:49 +00:00
|
|
|
struct net_device *dev)
|
|
|
|
|
{
|
2020-09-24 17:27:44 -07:00
|
|
|
int pidx = vlan_proto_idx(vlan_proto);
|
2011-07-20 04:54:49 +00:00
|
|
|
struct net_device **array;
|
2020-09-24 17:27:44 -07:00
|
|
|
|
|
|
|
|
if (!vg || pidx < 0)
|
2011-07-20 04:54:49 +00:00
|
|
|
return;
|
2020-09-24 17:27:44 -07:00
|
|
|
array = vg->vlan_devices_arrays[pidx]
|
2013-04-19 02:04:29 +00:00
|
|
|
[vlan_id / VLAN_GROUP_ARRAY_PART_LEN];
|
2011-07-20 04:54:49 +00:00
|
|
|
array[vlan_id % VLAN_GROUP_ARRAY_PART_LEN] = dev;
|
|
|
|
|
}
|
|
|
|
|
|
2011-07-17 08:53:12 +00:00
|
|
|
/* Must be invoked with rcu_read_lock or with RTNL. */
|
|
|
|
|
static inline struct net_device *vlan_find_dev(struct net_device *real_dev,
|
2013-04-19 02:04:29 +00:00
|
|
|
__be16 vlan_proto, u16 vlan_id)
|
2011-07-17 08:53:12 +00:00
|
|
|
{
|
2011-12-08 04:11:18 +00:00
|
|
|
struct vlan_info *vlan_info = rcu_dereference_rtnl(real_dev->vlan_info);
|
2011-07-17 08:53:12 +00:00
|
|
|
|
2011-12-08 04:11:18 +00:00
|
|
|
if (vlan_info)
|
2013-04-19 02:04:29 +00:00
|
|
|
return vlan_group_get_device(&vlan_info->grp,
|
|
|
|
|
vlan_proto, vlan_id);
|
2011-07-17 08:53:12 +00:00
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2018-11-07 11:28:18 +01:00
|
|
|
static inline netdev_features_t vlan_tnl_features(struct net_device *real_dev)
|
|
|
|
|
{
|
|
|
|
|
netdev_features_t ret;
|
|
|
|
|
|
|
|
|
|
ret = real_dev->hw_enc_features &
|
2021-06-17 21:55:56 -07:00
|
|
|
(NETIF_F_CSUM_MASK | NETIF_F_GSO_SOFTWARE |
|
|
|
|
|
NETIF_F_GSO_ENCAP_ALL);
|
2018-11-07 11:28:18 +01:00
|
|
|
|
|
|
|
|
if ((ret & NETIF_F_GSO_ENCAP_ALL) && (ret & NETIF_F_CSUM_MASK))
|
|
|
|
|
return (ret & ~NETIF_F_CSUM_MASK) | NETIF_F_HW_CSUM;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2013-04-19 02:04:29 +00:00
|
|
|
#define vlan_group_for_each_dev(grp, i, dev) \
|
|
|
|
|
for ((i) = 0; i < VLAN_PROTO_NUM * VLAN_N_VID; i++) \
|
|
|
|
|
if (((dev) = __vlan_group_get_device((grp), (i) / VLAN_N_VID, \
|
|
|
|
|
(i) % VLAN_N_VID)))
|
|
|
|
|
|
2018-03-28 17:46:54 +03:00
|
|
|
int vlan_filter_push_vids(struct vlan_info *vlan_info, __be16 proto);
|
|
|
|
|
void vlan_filter_drop_vids(struct vlan_info *vlan_info, __be16 proto);
|
|
|
|
|
|
2005-04-16 15:20:36 -07:00
|
|
|
/* found in vlan_dev.c */
|
2007-06-13 12:05:22 -07:00
|
|
|
void vlan_dev_set_ingress_priority(const struct net_device *dev,
|
2008-07-08 03:24:44 -07:00
|
|
|
u32 skb_prio, u16 vlan_prio);
|
2007-06-13 12:05:22 -07:00
|
|
|
int vlan_dev_set_egress_priority(const struct net_device *dev,
|
2008-07-08 03:24:44 -07:00
|
|
|
u32 skb_prio, u16 vlan_prio);
|
2022-02-09 03:19:55 -05:00
|
|
|
void vlan_dev_free_egress_priority(const struct net_device *dev);
|
2008-07-05 21:26:27 -07:00
|
|
|
int vlan_dev_change_flags(const struct net_device *dev, u32 flag, u32 mask);
|
2021-06-02 13:27:41 -07:00
|
|
|
void vlan_dev_get_realdev_name(const struct net_device *dev, char *result,
|
|
|
|
|
size_t size);
|
2005-04-16 15:20:36 -07:00
|
|
|
|
2013-04-19 02:04:29 +00:00
|
|
|
int vlan_check_real_dev(struct net_device *real_dev,
|
2018-05-17 12:29:47 -07:00
|
|
|
__be16 protocol, u16 vlan_id,
|
|
|
|
|
struct netlink_ext_ack *extack);
|
2007-06-13 12:07:54 -07:00
|
|
|
void vlan_setup(struct net_device *dev);
|
2017-10-04 17:48:47 -07:00
|
|
|
int register_vlan_dev(struct net_device *dev, struct netlink_ext_ack *extack);
|
2009-10-27 07:06:36 +00:00
|
|
|
void unregister_vlan_dev(struct net_device *dev, struct list_head *head);
|
2016-05-27 17:45:07 +01:00
|
|
|
bool vlan_dev_inherit_address(struct net_device *dev,
|
|
|
|
|
struct net_device *real_dev);
|
2007-06-13 12:07:54 -07:00
|
|
|
|
2008-07-08 03:23:36 -07:00
|
|
|
static inline u32 vlan_get_ingress_priority(struct net_device *dev,
|
2008-07-08 03:24:44 -07:00
|
|
|
u16 vlan_tci)
|
2008-07-08 03:23:36 -07:00
|
|
|
{
|
2011-12-08 04:11:15 +00:00
|
|
|
struct vlan_dev_priv *vip = vlan_dev_priv(dev);
|
2008-07-08 03:23:36 -07:00
|
|
|
|
2009-10-26 18:40:35 -07:00
|
|
|
return vip->ingress_priority_map[(vlan_tci >> VLAN_PRIO_SHIFT) & 0x7];
|
2008-07-08 03:23:36 -07:00
|
|
|
}
|
|
|
|
|
|
2008-07-05 21:26:57 -07:00
|
|
|
#ifdef CONFIG_VLAN_8021Q_GVRP
|
2013-10-18 13:48:22 -07:00
|
|
|
int vlan_gvrp_request_join(const struct net_device *dev);
|
|
|
|
|
void vlan_gvrp_request_leave(const struct net_device *dev);
|
|
|
|
|
int vlan_gvrp_init_applicant(struct net_device *dev);
|
|
|
|
|
void vlan_gvrp_uninit_applicant(struct net_device *dev);
|
|
|
|
|
int vlan_gvrp_init(void);
|
|
|
|
|
void vlan_gvrp_uninit(void);
|
2008-07-05 21:26:57 -07:00
|
|
|
#else
|
|
|
|
|
static inline int vlan_gvrp_request_join(const struct net_device *dev) { return 0; }
|
|
|
|
|
static inline void vlan_gvrp_request_leave(const struct net_device *dev) {}
|
|
|
|
|
static inline int vlan_gvrp_init_applicant(struct net_device *dev) { return 0; }
|
|
|
|
|
static inline void vlan_gvrp_uninit_applicant(struct net_device *dev) {}
|
|
|
|
|
static inline int vlan_gvrp_init(void) { return 0; }
|
|
|
|
|
static inline void vlan_gvrp_uninit(void) {}
|
|
|
|
|
#endif
|
|
|
|
|
|
2013-02-08 17:17:07 +00:00
|
|
|
#ifdef CONFIG_VLAN_8021Q_MVRP
|
2013-10-18 13:48:22 -07:00
|
|
|
int vlan_mvrp_request_join(const struct net_device *dev);
|
|
|
|
|
void vlan_mvrp_request_leave(const struct net_device *dev);
|
|
|
|
|
int vlan_mvrp_init_applicant(struct net_device *dev);
|
|
|
|
|
void vlan_mvrp_uninit_applicant(struct net_device *dev);
|
|
|
|
|
int vlan_mvrp_init(void);
|
|
|
|
|
void vlan_mvrp_uninit(void);
|
2013-02-08 17:17:07 +00:00
|
|
|
#else
|
|
|
|
|
static inline int vlan_mvrp_request_join(const struct net_device *dev) { return 0; }
|
|
|
|
|
static inline void vlan_mvrp_request_leave(const struct net_device *dev) {}
|
|
|
|
|
static inline int vlan_mvrp_init_applicant(struct net_device *dev) { return 0; }
|
|
|
|
|
static inline void vlan_mvrp_uninit_applicant(struct net_device *dev) {}
|
|
|
|
|
static inline int vlan_mvrp_init(void) { return 0; }
|
|
|
|
|
static inline void vlan_mvrp_uninit(void) {}
|
|
|
|
|
#endif
|
|
|
|
|
|
2008-10-28 22:12:36 -07:00
|
|
|
extern const char vlan_fullname[];
|
|
|
|
|
extern const char vlan_version[];
|
2013-10-18 13:48:22 -07:00
|
|
|
int vlan_netlink_init(void);
|
|
|
|
|
void vlan_netlink_fini(void);
|
2007-06-13 12:07:54 -07:00
|
|
|
|
|
|
|
|
extern struct rtnl_link_ops vlan_link_ops;
|
|
|
|
|
|
netns: make struct pernet_operations::id unsigned int
Make struct pernet_operations::id unsigned.
There are 2 reasons to do so:
1)
This field is really an index into an zero based array and
thus is unsigned entity. Using negative value is out-of-bound
access by definition.
2)
On x86_64 unsigned 32-bit data which are mixed with pointers
via array indexing or offsets added or subtracted to pointers
are preffered to signed 32-bit data.
"int" being used as an array index needs to be sign-extended
to 64-bit before being used.
void f(long *p, int i)
{
g(p[i]);
}
roughly translates to
movsx rsi, esi
mov rdi, [rsi+...]
call g
MOVSX is 3 byte instruction which isn't necessary if the variable is
unsigned because x86_64 is zero extending by default.
Now, there is net_generic() function which, you guessed it right, uses
"int" as an array index:
static inline void *net_generic(const struct net *net, int id)
{
...
ptr = ng->ptr[id - 1];
...
}
And this function is used a lot, so those sign extensions add up.
Patch snipes ~1730 bytes on allyesconfig kernel (without all junk
messing with code generation):
add/remove: 0/0 grow/shrink: 70/598 up/down: 396/-2126 (-1730)
Unfortunately some functions actually grow bigger.
This is a semmingly random artefact of code generation with register
allocator being used differently. gcc decides that some variable
needs to live in new r8+ registers and every access now requires REX
prefix. Or it is shifted into r12, so [r12+0] addressing mode has to be
used which is longer than [r8]
However, overall balance is in negative direction:
add/remove: 0/0 grow/shrink: 70/598 up/down: 396/-2126 (-1730)
function old new delta
nfsd4_lock 3886 3959 +73
tipc_link_build_proto_msg 1096 1140 +44
mac80211_hwsim_new_radio 2776 2808 +32
tipc_mon_rcv 1032 1058 +26
svcauth_gss_legacy_init 1413 1429 +16
tipc_bcbase_select_primary 379 392 +13
nfsd4_exchange_id 1247 1260 +13
nfsd4_setclientid_confirm 782 793 +11
...
put_client_renew_locked 494 480 -14
ip_set_sockfn_get 730 716 -14
geneve_sock_add 829 813 -16
nfsd4_sequence_done 721 703 -18
nlmclnt_lookup_host 708 686 -22
nfsd4_lockt 1085 1063 -22
nfs_get_client 1077 1050 -27
tcf_bpf_init 1106 1076 -30
nfsd4_encode_fattr 5997 5930 -67
Total: Before=154856051, After=154854321, chg -0.00%
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-11-17 04:58:21 +03:00
|
|
|
extern unsigned int vlan_net_id;
|
2008-04-16 00:49:09 -07:00
|
|
|
|
2008-04-16 00:51:51 -07:00
|
|
|
struct proc_dir_entry;
|
|
|
|
|
|
2008-04-16 00:49:09 -07:00
|
|
|
struct vlan_net {
|
2008-04-16 00:51:51 -07:00
|
|
|
/* /proc/net/vlan */
|
|
|
|
|
struct proc_dir_entry *proc_vlan_dir;
|
|
|
|
|
/* /proc/net/vlan/config */
|
|
|
|
|
struct proc_dir_entry *proc_vlan_conf;
|
2008-04-16 00:54:39 -07:00
|
|
|
/* Determines interface naming scheme. */
|
|
|
|
|
unsigned short name_type;
|
2008-04-16 00:49:09 -07:00
|
|
|
};
|
|
|
|
|
|
2005-04-16 15:20:36 -07:00
|
|
|
#endif /* !(__BEN_VLAN_802_1Q_INC__) */
|