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
|
|
|
/*
|
|
|
|
*
|
|
|
|
* Generic internet FLOW.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _NET_FLOW_H
|
|
|
|
#define _NET_FLOW_H
|
|
|
|
|
2011-09-06 00:47:24 +08:00
|
|
|
#include <linux/socket.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/in6.h>
|
2011-07-27 07:09:06 +08:00
|
|
|
#include <linux/atomic.h>
|
2015-09-02 00:24:25 +08:00
|
|
|
#include <net/flow_dissector.h>
|
2016-11-04 01:23:42 +08:00
|
|
|
#include <linux/uidgid.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
ipv4, fib: pass LOOPBACK_IFINDEX instead of 0 to flowi4_iif
As suggested by Julian:
Simply, flowi4_iif must not contain 0, it does not
look logical to ignore all ip rules with specified iif.
because in fib_rule_match() we do:
if (rule->iifindex && (rule->iifindex != fl->flowi_iif))
goto out;
flowi4_iif should be LOOPBACK_IFINDEX by default.
We need to move LOOPBACK_IFINDEX to include/net/flow.h:
1) It is mostly used by flowi_iif
2) Fix the following compile error if we use it in flow.h
by the patches latter:
In file included from include/linux/netfilter.h:277:0,
from include/net/netns/netfilter.h:5,
from include/net/net_namespace.h:21,
from include/linux/netdevice.h:43,
from include/linux/icmpv6.h:12,
from include/linux/ipv6.h:61,
from include/net/ipv6.h:16,
from include/linux/sunrpc/clnt.h:27,
from include/linux/nfs_fs.h:30,
from init/do_mounts.c:32:
include/net/flow.h: In function ‘flowi4_init_output’:
include/net/flow.h:84:32: error: ‘LOOPBACK_IFINDEX’ undeclared (first use in this function)
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Julian Anastasov <ja@ssi.bg>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-04-16 07:25:34 +08:00
|
|
|
/*
|
|
|
|
* ifindex generation is per-net namespace, and loopback is
|
|
|
|
* always the 1st device in ns (see net_dev_init), thus any
|
|
|
|
* loopback device should get ifindex 1
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define LOOPBACK_IFINDEX 1
|
|
|
|
|
2015-07-21 16:43:59 +08:00
|
|
|
struct flowi_tunnel {
|
|
|
|
__be64 tun_id;
|
|
|
|
};
|
|
|
|
|
2011-03-12 07:22:00 +08:00
|
|
|
struct flowi_common {
|
|
|
|
int flowic_oif;
|
|
|
|
int flowic_iif;
|
|
|
|
__u32 flowic_mark;
|
|
|
|
__u8 flowic_tos;
|
|
|
|
__u8 flowic_scope;
|
|
|
|
__u8 flowic_proto;
|
|
|
|
__u8 flowic_flags;
|
2011-03-12 04:55:37 +08:00
|
|
|
#define FLOWI_FLAG_ANYSRC 0x01
|
2013-08-28 14:04:14 +08:00
|
|
|
#define FLOWI_FLAG_KNOWN_NH 0x02
|
2016-09-11 03:10:02 +08:00
|
|
|
#define FLOWI_FLAG_SKIP_NH_OIF 0x04
|
2011-03-12 07:22:00 +08:00
|
|
|
__u32 flowic_secid;
|
2016-11-04 01:23:42 +08:00
|
|
|
kuid_t flowic_uid;
|
net: reorder flowi_common fields to avoid holes
the flowi* structures are used and memsetted by server functions
in critical path. Currently flowi_common has a couple of holes that
we can eliminate reordering the struct fields. As a side effect,
both flowi4 and flowi6 shrink by 8 bytes.
Before:
pahole -EC flowi_common
struct flowi_common {
// ...
/* size: 40, cachelines: 1, members: 10 */
/* sum members: 32, holes: 1, sum holes: 4 */
/* padding: 4 */
/* last cacheline: 40 bytes */
};
pahole -EC flowi6
struct flowi6 {
// ...
/* size: 88, cachelines: 2, members: 6 */
/* padding: 4 */
/* last cacheline: 24 bytes */
};
pahole -EC flowi4
struct flowi4 {
// ...
/* size: 56, cachelines: 1, members: 4 */
/* padding: 4 */
/* last cacheline: 56 bytes */
};
After:
struct flowi_common {
// ...
/* size: 32, cachelines: 1, members: 10 */
/* last cacheline: 32 bytes */
};
struct flowi6 {
// ...
/* size: 80, cachelines: 2, members: 6 */
/* padding: 4 */
/* last cacheline: 16 bytes */
};
struct flowi4 {
// ...
/* size: 48, cachelines: 1, members: 4 */
/* padding: 4 */
/* last cacheline: 48 bytes */
};
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-11-29 00:37:53 +08:00
|
|
|
struct flowi_tunnel flowic_tun_key;
|
2019-02-24 11:36:20 +08:00
|
|
|
__u32 flowic_multipath_hash;
|
2011-03-12 07:22:00 +08:00
|
|
|
};
|
|
|
|
|
2011-03-12 07:36:42 +08:00
|
|
|
union flowi_uli {
|
|
|
|
struct {
|
|
|
|
__be16 dport;
|
2011-04-01 09:03:35 +08:00
|
|
|
__be16 sport;
|
2011-03-12 07:36:42 +08:00
|
|
|
} ports;
|
|
|
|
|
|
|
|
struct {
|
|
|
|
__u8 type;
|
|
|
|
__u8 code;
|
|
|
|
} icmpt;
|
|
|
|
|
|
|
|
struct {
|
|
|
|
__le16 dport;
|
2011-04-01 09:03:35 +08:00
|
|
|
__le16 sport;
|
2011-03-12 07:36:42 +08:00
|
|
|
} dnports;
|
|
|
|
|
|
|
|
__be32 spi;
|
|
|
|
__be32 gre_key;
|
|
|
|
|
|
|
|
struct {
|
|
|
|
__u8 type;
|
|
|
|
} mht;
|
|
|
|
};
|
|
|
|
|
2011-03-12 13:44:35 +08:00
|
|
|
struct flowi4 {
|
|
|
|
struct flowi_common __fl_common;
|
2011-03-12 08:54:08 +08:00
|
|
|
#define flowi4_oif __fl_common.flowic_oif
|
|
|
|
#define flowi4_iif __fl_common.flowic_iif
|
|
|
|
#define flowi4_mark __fl_common.flowic_mark
|
|
|
|
#define flowi4_tos __fl_common.flowic_tos
|
|
|
|
#define flowi4_scope __fl_common.flowic_scope
|
|
|
|
#define flowi4_proto __fl_common.flowic_proto
|
|
|
|
#define flowi4_flags __fl_common.flowic_flags
|
|
|
|
#define flowi4_secid __fl_common.flowic_secid
|
2015-07-21 16:43:59 +08:00
|
|
|
#define flowi4_tun_key __fl_common.flowic_tun_key
|
2016-11-04 01:23:42 +08:00
|
|
|
#define flowi4_uid __fl_common.flowic_uid
|
2019-02-24 11:36:20 +08:00
|
|
|
#define flowi4_multipath_hash __fl_common.flowic_multipath_hash
|
2011-12-01 03:00:53 +08:00
|
|
|
|
|
|
|
/* (saddr,daddr) must be grouped, same order as in IP header */
|
2011-03-12 13:44:35 +08:00
|
|
|
__be32 saddr;
|
2011-12-01 03:00:53 +08:00
|
|
|
__be32 daddr;
|
|
|
|
|
2011-03-12 13:44:35 +08:00
|
|
|
union flowi_uli uli;
|
2011-03-12 16:00:33 +08:00
|
|
|
#define fl4_sport uli.ports.sport
|
|
|
|
#define fl4_dport uli.ports.dport
|
|
|
|
#define fl4_icmp_type uli.icmpt.type
|
|
|
|
#define fl4_icmp_code uli.icmpt.code
|
|
|
|
#define fl4_ipsec_spi uli.spi
|
|
|
|
#define fl4_mh_type uli.mht.type
|
|
|
|
#define fl4_gre_key uli.gre_key
|
2011-09-06 00:47:23 +08:00
|
|
|
} __attribute__((__aligned__(BITS_PER_LONG/8)));
|
2011-03-12 13:44:35 +08:00
|
|
|
|
2011-03-31 19:52:14 +08:00
|
|
|
static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
|
|
|
|
__u32 mark, __u8 tos, __u8 scope,
|
|
|
|
__u8 proto, __u8 flags,
|
|
|
|
__be32 daddr, __be32 saddr,
|
2016-11-04 01:23:43 +08:00
|
|
|
__be16 dport, __be16 sport,
|
|
|
|
kuid_t uid)
|
2011-03-31 19:52:14 +08:00
|
|
|
{
|
|
|
|
fl4->flowi4_oif = oif;
|
ipv4, fib: pass LOOPBACK_IFINDEX instead of 0 to flowi4_iif
As suggested by Julian:
Simply, flowi4_iif must not contain 0, it does not
look logical to ignore all ip rules with specified iif.
because in fib_rule_match() we do:
if (rule->iifindex && (rule->iifindex != fl->flowi_iif))
goto out;
flowi4_iif should be LOOPBACK_IFINDEX by default.
We need to move LOOPBACK_IFINDEX to include/net/flow.h:
1) It is mostly used by flowi_iif
2) Fix the following compile error if we use it in flow.h
by the patches latter:
In file included from include/linux/netfilter.h:277:0,
from include/net/netns/netfilter.h:5,
from include/net/net_namespace.h:21,
from include/linux/netdevice.h:43,
from include/linux/icmpv6.h:12,
from include/linux/ipv6.h:61,
from include/net/ipv6.h:16,
from include/linux/sunrpc/clnt.h:27,
from include/linux/nfs_fs.h:30,
from init/do_mounts.c:32:
include/net/flow.h: In function ‘flowi4_init_output’:
include/net/flow.h:84:32: error: ‘LOOPBACK_IFINDEX’ undeclared (first use in this function)
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Julian Anastasov <ja@ssi.bg>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-04-16 07:25:34 +08:00
|
|
|
fl4->flowi4_iif = LOOPBACK_IFINDEX;
|
2011-03-31 19:52:14 +08:00
|
|
|
fl4->flowi4_mark = mark;
|
|
|
|
fl4->flowi4_tos = tos;
|
|
|
|
fl4->flowi4_scope = scope;
|
|
|
|
fl4->flowi4_proto = proto;
|
|
|
|
fl4->flowi4_flags = flags;
|
|
|
|
fl4->flowi4_secid = 0;
|
2015-07-21 16:43:59 +08:00
|
|
|
fl4->flowi4_tun_key.tun_id = 0;
|
2016-11-04 01:23:43 +08:00
|
|
|
fl4->flowi4_uid = uid;
|
2011-03-31 19:52:14 +08:00
|
|
|
fl4->daddr = daddr;
|
|
|
|
fl4->saddr = saddr;
|
|
|
|
fl4->fl4_dport = dport;
|
2011-04-01 09:03:35 +08:00
|
|
|
fl4->fl4_sport = sport;
|
2020-09-14 02:43:39 +08:00
|
|
|
fl4->flowi4_multipath_hash = 0;
|
2011-03-31 19:52:14 +08:00
|
|
|
}
|
2012-02-04 21:04:46 +08:00
|
|
|
|
|
|
|
/* Reset some input parameters after previous lookup */
|
|
|
|
static inline void flowi4_update_output(struct flowi4 *fl4, int oif, __u8 tos,
|
|
|
|
__be32 daddr, __be32 saddr)
|
|
|
|
{
|
|
|
|
fl4->flowi4_oif = oif;
|
|
|
|
fl4->flowi4_tos = tos;
|
|
|
|
fl4->daddr = daddr;
|
|
|
|
fl4->saddr = saddr;
|
|
|
|
}
|
2018-02-28 07:48:21 +08:00
|
|
|
|
2011-03-31 19:52:14 +08:00
|
|
|
|
2011-03-12 13:44:35 +08:00
|
|
|
struct flowi6 {
|
2011-03-12 07:22:00 +08:00
|
|
|
struct flowi_common __fl_common;
|
2011-03-12 15:30:50 +08:00
|
|
|
#define flowi6_oif __fl_common.flowic_oif
|
|
|
|
#define flowi6_iif __fl_common.flowic_iif
|
|
|
|
#define flowi6_mark __fl_common.flowic_mark
|
|
|
|
#define flowi6_scope __fl_common.flowic_scope
|
|
|
|
#define flowi6_proto __fl_common.flowic_proto
|
|
|
|
#define flowi6_flags __fl_common.flowic_flags
|
|
|
|
#define flowi6_secid __fl_common.flowic_secid
|
2015-08-20 19:56:31 +08:00
|
|
|
#define flowi6_tun_key __fl_common.flowic_tun_key
|
2016-11-04 01:23:42 +08:00
|
|
|
#define flowi6_uid __fl_common.flowic_uid
|
2011-03-12 13:44:35 +08:00
|
|
|
struct in6_addr daddr;
|
|
|
|
struct in6_addr saddr;
|
2016-03-19 01:37:59 +08:00
|
|
|
/* Note: flowi6_tos is encoded in flowlabel, too. */
|
2011-03-12 13:44:35 +08:00
|
|
|
__be32 flowlabel;
|
|
|
|
union flowi_uli uli;
|
2011-03-13 05:36:19 +08:00
|
|
|
#define fl6_sport uli.ports.sport
|
|
|
|
#define fl6_dport uli.ports.dport
|
|
|
|
#define fl6_icmp_type uli.icmpt.type
|
|
|
|
#define fl6_icmp_code uli.icmpt.code
|
|
|
|
#define fl6_ipsec_spi uli.spi
|
|
|
|
#define fl6_mh_type uli.mht.type
|
|
|
|
#define fl6_gre_key uli.gre_key
|
2017-08-23 15:58:28 +08:00
|
|
|
__u32 mp_hash;
|
2011-09-06 00:47:23 +08:00
|
|
|
} __attribute__((__aligned__(BITS_PER_LONG/8)));
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2011-03-12 13:44:35 +08:00
|
|
|
struct flowidn {
|
|
|
|
struct flowi_common __fl_common;
|
2011-03-13 06:17:10 +08:00
|
|
|
#define flowidn_oif __fl_common.flowic_oif
|
|
|
|
#define flowidn_iif __fl_common.flowic_iif
|
|
|
|
#define flowidn_mark __fl_common.flowic_mark
|
|
|
|
#define flowidn_scope __fl_common.flowic_scope
|
|
|
|
#define flowidn_proto __fl_common.flowic_proto
|
|
|
|
#define flowidn_flags __fl_common.flowic_flags
|
2011-03-12 13:44:35 +08:00
|
|
|
__le16 daddr;
|
|
|
|
__le16 saddr;
|
|
|
|
union flowi_uli uli;
|
2011-03-13 06:17:10 +08:00
|
|
|
#define fld_sport uli.ports.sport
|
|
|
|
#define fld_dport uli.ports.dport
|
2011-09-06 00:47:23 +08:00
|
|
|
} __attribute__((__aligned__(BITS_PER_LONG/8)));
|
2011-03-12 13:44:35 +08:00
|
|
|
|
|
|
|
struct flowi {
|
2005-04-17 06:20:36 +08:00
|
|
|
union {
|
2011-03-12 13:44:35 +08:00
|
|
|
struct flowi_common __fl_common;
|
|
|
|
struct flowi4 ip4;
|
|
|
|
struct flowi6 ip6;
|
|
|
|
struct flowidn dn;
|
|
|
|
} u;
|
|
|
|
#define flowi_oif u.__fl_common.flowic_oif
|
|
|
|
#define flowi_iif u.__fl_common.flowic_iif
|
|
|
|
#define flowi_mark u.__fl_common.flowic_mark
|
|
|
|
#define flowi_tos u.__fl_common.flowic_tos
|
|
|
|
#define flowi_scope u.__fl_common.flowic_scope
|
|
|
|
#define flowi_proto u.__fl_common.flowic_proto
|
|
|
|
#define flowi_flags u.__fl_common.flowic_flags
|
|
|
|
#define flowi_secid u.__fl_common.flowic_secid
|
2015-07-21 16:43:59 +08:00
|
|
|
#define flowi_tun_key u.__fl_common.flowic_tun_key
|
2016-11-04 01:23:42 +08:00
|
|
|
#define flowi_uid u.__fl_common.flowic_uid
|
2005-04-17 06:20:36 +08:00
|
|
|
} __attribute__((__aligned__(BITS_PER_LONG/8)));
|
|
|
|
|
2011-03-12 08:23:02 +08:00
|
|
|
static inline struct flowi *flowi4_to_flowi(struct flowi4 *fl4)
|
|
|
|
{
|
|
|
|
return container_of(fl4, struct flowi, u.ip4);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct flowi *flowi6_to_flowi(struct flowi6 *fl6)
|
|
|
|
{
|
|
|
|
return container_of(fl6, struct flowi, u.ip6);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct flowi *flowidn_to_flowi(struct flowidn *fldn)
|
|
|
|
{
|
|
|
|
return container_of(fldn, struct flowi, u.dn);
|
|
|
|
}
|
|
|
|
|
2015-09-02 12:19:17 +08:00
|
|
|
__u32 __get_hash_from_flowi6(const struct flowi6 *fl6, struct flow_keys *keys);
|
2015-09-02 00:24:25 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif
|