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 22:07:57 +08:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0 */
|
2005-04-17 06:20:36 +08:00
|
|
|
#ifndef _NET_IP6_TUNNEL_H
|
|
|
|
|
#define _NET_IP6_TUNNEL_H
|
|
|
|
|
|
|
|
|
|
#include <linux/ipv6.h>
|
|
|
|
|
#include <linux/netdevice.h>
|
2013-03-25 22:49:35 +08:00
|
|
|
#include <linux/if_tunnel.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/ip6_tunnel.h>
|
2015-12-25 06:34:54 +08:00
|
|
|
#include <net/ip_tunnels.h>
|
2016-02-12 22:43:54 +08:00
|
|
|
#include <net/dst_cache.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2012-08-10 08:51:50 +08:00
|
|
|
#define IP6TUNNEL_ERR_TIMEO (30*HZ)
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* capable of sending packets */
|
|
|
|
|
#define IP6_TNL_F_CAP_XMIT 0x10000
|
|
|
|
|
/* capable of receiving packets */
|
|
|
|
|
#define IP6_TNL_F_CAP_RCV 0x20000
|
2012-06-29 02:15:52 +08:00
|
|
|
/* determine capability on a per-packet basis */
|
|
|
|
|
#define IP6_TNL_F_CAP_PER_PACKET 0x40000
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2012-08-10 08:51:50 +08:00
|
|
|
struct __ip6_tnl_parm {
|
|
|
|
|
char name[IFNAMSIZ]; /* name of tunnel device */
|
|
|
|
|
int link; /* ifindex of underlying L2 interface */
|
|
|
|
|
__u8 proto; /* tunnel protocol */
|
|
|
|
|
__u8 encap_limit; /* encapsulation limit for tunnel */
|
|
|
|
|
__u8 hop_limit; /* hop limit for tunnel */
|
2016-09-16 04:00:30 +08:00
|
|
|
bool collect_md;
|
2012-08-10 08:51:50 +08:00
|
|
|
__be32 flowinfo; /* traffic class and flowlabel for tunnel */
|
|
|
|
|
__u32 flags; /* tunnel flags */
|
|
|
|
|
struct in6_addr laddr; /* local tunnel end-point address */
|
|
|
|
|
struct in6_addr raddr; /* remote tunnel end-point address */
|
|
|
|
|
|
|
|
|
|
__be16 i_flags;
|
|
|
|
|
__be16 o_flags;
|
|
|
|
|
__be32 i_key;
|
|
|
|
|
__be32 o_key;
|
2017-04-20 00:30:53 +08:00
|
|
|
|
|
|
|
|
__u32 fwmark;
|
2017-12-01 03:51:29 +08:00
|
|
|
__u32 index; /* ERSPAN type II index */
|
2012-08-10 08:51:50 +08:00
|
|
|
};
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2012-08-10 08:51:50 +08:00
|
|
|
/* IPv6 tunnel */
|
2005-04-17 06:20:36 +08:00
|
|
|
struct ip6_tnl {
|
2010-10-25 05:33:16 +08:00
|
|
|
struct ip6_tnl __rcu *next; /* next tunnel in list */
|
2005-04-17 06:20:36 +08:00
|
|
|
struct net_device *dev; /* virtual device associated with tunnel */
|
2013-08-13 23:51:12 +08:00
|
|
|
struct net *net; /* netns for packet i/o */
|
2012-08-10 08:51:50 +08:00
|
|
|
struct __ip6_tnl_parm parms; /* tunnel configuration parameters */
|
2005-04-17 06:20:36 +08:00
|
|
|
struct flowi fl; /* flowi template for xmit */
|
2016-02-12 22:43:54 +08:00
|
|
|
struct dst_cache dst_cache; /* cached dst */
|
2016-04-30 08:12:15 +08:00
|
|
|
struct gro_cells gro_cells;
|
2012-08-10 08:51:50 +08:00
|
|
|
|
|
|
|
|
int err_count;
|
|
|
|
|
unsigned long err_time;
|
|
|
|
|
|
|
|
|
|
/* These fields used only by GRE */
|
|
|
|
|
__u32 i_seqno; /* The last seen seqno */
|
|
|
|
|
__u32 o_seqno; /* The last output seqno */
|
2016-04-30 08:12:20 +08:00
|
|
|
int hlen; /* tun_hlen + encap_hlen */
|
|
|
|
|
int tun_hlen; /* Precalculated header length */
|
2016-05-19 00:06:17 +08:00
|
|
|
int encap_hlen; /* Encap header length (FOU,GUE) */
|
|
|
|
|
struct ip_tunnel_encap encap;
|
2012-08-10 08:51:50 +08:00
|
|
|
int mlink;
|
2016-05-19 00:06:17 +08:00
|
|
|
};
|
2016-04-30 08:12:20 +08:00
|
|
|
|
2016-05-19 00:06:17 +08:00
|
|
|
struct ip6_tnl_encap_ops {
|
|
|
|
|
size_t (*encap_hlen)(struct ip_tunnel_encap *e);
|
|
|
|
|
int (*build_header)(struct sk_buff *skb, struct ip_tunnel_encap *e,
|
|
|
|
|
u8 *protocol, struct flowi6 *fl6);
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
2016-05-25 22:50:45 +08:00
|
|
|
#ifdef CONFIG_INET
|
|
|
|
|
|
2016-05-19 00:06:17 +08:00
|
|
|
extern const struct ip6_tnl_encap_ops __rcu *
|
|
|
|
|
ip6tun_encaps[MAX_IPTUN_ENCAP_OPS];
|
|
|
|
|
|
|
|
|
|
int ip6_tnl_encap_add_ops(const struct ip6_tnl_encap_ops *ops,
|
|
|
|
|
unsigned int num);
|
|
|
|
|
int ip6_tnl_encap_del_ops(const struct ip6_tnl_encap_ops *ops,
|
|
|
|
|
unsigned int num);
|
|
|
|
|
int ip6_tnl_encap_setup(struct ip6_tnl *t,
|
|
|
|
|
struct ip_tunnel_encap *ipencap);
|
|
|
|
|
|
|
|
|
|
static inline int ip6_encap_hlen(struct ip_tunnel_encap *e)
|
|
|
|
|
{
|
|
|
|
|
const struct ip6_tnl_encap_ops *ops;
|
|
|
|
|
int hlen = -EINVAL;
|
|
|
|
|
|
|
|
|
|
if (e->type == TUNNEL_ENCAP_NONE)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
if (e->type >= MAX_IPTUN_ENCAP_OPS)
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
|
ops = rcu_dereference(ip6tun_encaps[e->type]);
|
|
|
|
|
if (likely(ops && ops->encap_hlen))
|
|
|
|
|
hlen = ops->encap_hlen(e);
|
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
|
|
return hlen;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline int ip6_tnl_encap(struct sk_buff *skb, struct ip6_tnl *t,
|
|
|
|
|
u8 *protocol, struct flowi6 *fl6)
|
|
|
|
|
{
|
|
|
|
|
const struct ip6_tnl_encap_ops *ops;
|
|
|
|
|
int ret = -EINVAL;
|
|
|
|
|
|
|
|
|
|
if (t->encap.type == TUNNEL_ENCAP_NONE)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
if (t->encap.type >= MAX_IPTUN_ENCAP_OPS)
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
|
ops = rcu_dereference(ip6tun_encaps[t->encap.type]);
|
|
|
|
|
if (likely(ops && ops->build_header))
|
|
|
|
|
ret = ops->build_header(skb, &t->encap, protocol, fl6);
|
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* Tunnel encapsulation limit destination sub-option */
|
|
|
|
|
|
|
|
|
|
struct ipv6_tlv_tnl_enc_lim {
|
|
|
|
|
__u8 type; /* type-code for option */
|
|
|
|
|
__u8 length; /* option length */
|
|
|
|
|
__u8 encap_limit; /* tunnel encapsulation limit */
|
2010-06-03 18:21:52 +08:00
|
|
|
} __packed;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2012-08-10 08:51:50 +08:00
|
|
|
int ip6_tnl_rcv_ctl(struct ip6_tnl *t, const struct in6_addr *laddr,
|
|
|
|
|
const struct in6_addr *raddr);
|
2016-04-30 08:12:15 +08:00
|
|
|
int ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb,
|
|
|
|
|
const struct tnl_ptk_info *tpi, struct metadata_dst *tun_dst,
|
|
|
|
|
bool log_ecn_error);
|
2014-11-05 15:02:48 +08:00
|
|
|
int ip6_tnl_xmit_ctl(struct ip6_tnl *t, const struct in6_addr *laddr,
|
|
|
|
|
const struct in6_addr *raddr);
|
2016-04-30 08:12:18 +08:00
|
|
|
int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield,
|
|
|
|
|
struct flowi6 *fl6, int encap_limit, __u32 *pmtu, __u8 proto);
|
2012-08-10 08:51:50 +08:00
|
|
|
__u16 ip6_tnl_parse_tlv_enc_lim(struct sk_buff *skb, __u8 *raw);
|
|
|
|
|
__u32 ip6_tnl_get_cap(struct ip6_tnl *t, const struct in6_addr *laddr,
|
|
|
|
|
const struct in6_addr *raddr);
|
2015-01-15 22:11:17 +08:00
|
|
|
struct net *ip6_tnl_get_link_net(const struct net_device *dev);
|
2015-04-02 23:07:01 +08:00
|
|
|
int ip6_tnl_get_iflink(const struct net_device *dev);
|
2016-04-30 08:12:20 +08:00
|
|
|
int ip6_tnl_change_mtu(struct net_device *dev, int new_mtu);
|
2012-08-10 08:51:50 +08:00
|
|
|
|
2015-04-06 10:19:09 +08:00
|
|
|
static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb,
|
|
|
|
|
struct net_device *dev)
|
2013-03-10 07:00:39 +08:00
|
|
|
{
|
|
|
|
|
int pkt_len, err;
|
|
|
|
|
|
2016-11-01 23:45:12 +08:00
|
|
|
memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
|
ip6tunnel: make rx/tx bytes counters consistent
Like the previous patch, which fixes ipv4 tunnels, here is the ipv6 part.
Before the patch, the external ipv6 header + gre header were included on
tx.
After the patch:
$ ping -c1 192.168.6.121 ; ip -s l ls dev ip6gre1
PING 192.168.6.121 (192.168.6.121) 56(84) bytes of data.
64 bytes from 192.168.6.121: icmp_req=1 ttl=64 time=1.92 ms
--- 192.168.6.121 ping statistics ---
1 packets transmitted, 1 received, 0% packet loss, time 0ms
rtt min/avg/max/mdev = 1.923/1.923/1.923/0.000 ms
7: ip6gre1@NONE: <POINTOPOINT,NOARP,UP,LOWER_UP> mtu 1440 qdisc noqueue state UNKNOWN mode DEFAULT group default
link/gre6 20:01:06:60:30:08:c1:c3:00:00:00:00:00:00:01:23 peer 20:01:06:60:30:08:c1:c3:00:00:00:00:00:00:01:21
RX: bytes packets errors dropped overrun mcast
84 1 0 0 0 0
TX: bytes packets errors dropped carrier collsns
84 1 0 0 0 0
$ ping -c1 192.168.1.121 ; ip -s l ls dev ip6tnl1
PING 192.168.1.121 (192.168.1.121) 56(84) bytes of data.
64 bytes from 192.168.1.121: icmp_req=1 ttl=64 time=2.28 ms
--- 192.168.1.121 ping statistics ---
1 packets transmitted, 1 received, 0% packet loss, time 0ms
rtt min/avg/max/mdev = 2.288/2.288/2.288/0.000 ms
8: ip6tnl1@NONE: <POINTOPOINT,NOARP,UP,LOWER_UP> mtu 1452 qdisc noqueue state UNKNOWN mode DEFAULT group default
link/tunnel6 2001:660:3008:c1c3::123 peer 2001:660:3008:c1c3::121
RX: bytes packets errors dropped overrun mcast
84 1 0 0 0 0
TX: bytes packets errors dropped carrier collsns
84 1 0 0 0 0
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-18 17:47:41 +08:00
|
|
|
pkt_len = skb->len - skb_inner_network_offset(skb);
|
2015-10-08 05:48:46 +08:00
|
|
|
err = ip6_local_out(dev_net(skb_dst(skb)->dev), sk, skb);
|
2015-12-25 06:34:54 +08:00
|
|
|
if (unlikely(net_xmit_eval(err)))
|
|
|
|
|
pkt_len = -1;
|
|
|
|
|
iptunnel_xmit_stats(dev, pkt_len);
|
2013-03-10 07:00:39 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif
|
2016-01-01 20:18:48 +08:00
|
|
|
#endif
|
