![Greg Kroah-Hartman](/assets/img/avatar_default.png)
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>
285 lines
7.3 KiB
C
285 lines
7.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _NET_FLOW_DISSECTOR_H
|
|
#define _NET_FLOW_DISSECTOR_H
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/in6.h>
|
|
#include <uapi/linux/if_ether.h>
|
|
|
|
/**
|
|
* struct flow_dissector_key_control:
|
|
* @thoff: Transport header offset
|
|
*/
|
|
struct flow_dissector_key_control {
|
|
u16 thoff;
|
|
u16 addr_type;
|
|
u32 flags;
|
|
};
|
|
|
|
#define FLOW_DIS_IS_FRAGMENT BIT(0)
|
|
#define FLOW_DIS_FIRST_FRAG BIT(1)
|
|
#define FLOW_DIS_ENCAPSULATION BIT(2)
|
|
|
|
enum flow_dissect_ret {
|
|
FLOW_DISSECT_RET_OUT_GOOD,
|
|
FLOW_DISSECT_RET_OUT_BAD,
|
|
FLOW_DISSECT_RET_PROTO_AGAIN,
|
|
FLOW_DISSECT_RET_IPPROTO_AGAIN,
|
|
FLOW_DISSECT_RET_CONTINUE,
|
|
};
|
|
|
|
/**
|
|
* struct flow_dissector_key_basic:
|
|
* @thoff: Transport header offset
|
|
* @n_proto: Network header protocol (eg. IPv4/IPv6)
|
|
* @ip_proto: Transport header protocol (eg. TCP/UDP)
|
|
*/
|
|
struct flow_dissector_key_basic {
|
|
__be16 n_proto;
|
|
u8 ip_proto;
|
|
u8 padding;
|
|
};
|
|
|
|
struct flow_dissector_key_tags {
|
|
u32 flow_label;
|
|
};
|
|
|
|
struct flow_dissector_key_vlan {
|
|
u16 vlan_id:12,
|
|
vlan_priority:3;
|
|
u16 padding;
|
|
};
|
|
|
|
struct flow_dissector_key_mpls {
|
|
u32 mpls_ttl:8,
|
|
mpls_bos:1,
|
|
mpls_tc:3,
|
|
mpls_label:20;
|
|
};
|
|
|
|
struct flow_dissector_key_keyid {
|
|
__be32 keyid;
|
|
};
|
|
|
|
/**
|
|
* struct flow_dissector_key_ipv4_addrs:
|
|
* @src: source ip address
|
|
* @dst: destination ip address
|
|
*/
|
|
struct flow_dissector_key_ipv4_addrs {
|
|
/* (src,dst) must be grouped, in the same way than in IP header */
|
|
__be32 src;
|
|
__be32 dst;
|
|
};
|
|
|
|
/**
|
|
* struct flow_dissector_key_ipv6_addrs:
|
|
* @src: source ip address
|
|
* @dst: destination ip address
|
|
*/
|
|
struct flow_dissector_key_ipv6_addrs {
|
|
/* (src,dst) must be grouped, in the same way than in IP header */
|
|
struct in6_addr src;
|
|
struct in6_addr dst;
|
|
};
|
|
|
|
/**
|
|
* struct flow_dissector_key_tipc_addrs:
|
|
* @srcnode: source node address
|
|
*/
|
|
struct flow_dissector_key_tipc_addrs {
|
|
__be32 srcnode;
|
|
};
|
|
|
|
/**
|
|
* struct flow_dissector_key_addrs:
|
|
* @v4addrs: IPv4 addresses
|
|
* @v6addrs: IPv6 addresses
|
|
*/
|
|
struct flow_dissector_key_addrs {
|
|
union {
|
|
struct flow_dissector_key_ipv4_addrs v4addrs;
|
|
struct flow_dissector_key_ipv6_addrs v6addrs;
|
|
struct flow_dissector_key_tipc_addrs tipcaddrs;
|
|
};
|
|
};
|
|
|
|
/**
|
|
* flow_dissector_key_arp:
|
|
* @ports: Operation, source and target addresses for an ARP header
|
|
* for Ethernet hardware addresses and IPv4 protocol addresses
|
|
* sip: Sender IP address
|
|
* tip: Target IP address
|
|
* op: Operation
|
|
* sha: Sender hardware address
|
|
* tpa: Target hardware address
|
|
*/
|
|
struct flow_dissector_key_arp {
|
|
__u32 sip;
|
|
__u32 tip;
|
|
__u8 op;
|
|
unsigned char sha[ETH_ALEN];
|
|
unsigned char tha[ETH_ALEN];
|
|
};
|
|
|
|
/**
|
|
* flow_dissector_key_tp_ports:
|
|
* @ports: port numbers of Transport header
|
|
* src: source port number
|
|
* dst: destination port number
|
|
*/
|
|
struct flow_dissector_key_ports {
|
|
union {
|
|
__be32 ports;
|
|
struct {
|
|
__be16 src;
|
|
__be16 dst;
|
|
};
|
|
};
|
|
};
|
|
|
|
/**
|
|
* flow_dissector_key_icmp:
|
|
* @ports: type and code of ICMP header
|
|
* icmp: ICMP type (high) and code (low)
|
|
* type: ICMP type
|
|
* code: ICMP code
|
|
*/
|
|
struct flow_dissector_key_icmp {
|
|
union {
|
|
__be16 icmp;
|
|
struct {
|
|
u8 type;
|
|
u8 code;
|
|
};
|
|
};
|
|
};
|
|
|
|
/**
|
|
* struct flow_dissector_key_eth_addrs:
|
|
* @src: source Ethernet address
|
|
* @dst: destination Ethernet address
|
|
*/
|
|
struct flow_dissector_key_eth_addrs {
|
|
/* (dst,src) must be grouped, in the same way than in ETH header */
|
|
unsigned char dst[ETH_ALEN];
|
|
unsigned char src[ETH_ALEN];
|
|
};
|
|
|
|
/**
|
|
* struct flow_dissector_key_tcp:
|
|
* @flags: flags
|
|
*/
|
|
struct flow_dissector_key_tcp {
|
|
__be16 flags;
|
|
};
|
|
|
|
/**
|
|
* struct flow_dissector_key_ip:
|
|
* @tos: tos
|
|
* @ttl: ttl
|
|
*/
|
|
struct flow_dissector_key_ip {
|
|
__u8 tos;
|
|
__u8 ttl;
|
|
};
|
|
|
|
enum flow_dissector_key_id {
|
|
FLOW_DISSECTOR_KEY_CONTROL, /* struct flow_dissector_key_control */
|
|
FLOW_DISSECTOR_KEY_BASIC, /* struct flow_dissector_key_basic */
|
|
FLOW_DISSECTOR_KEY_IPV4_ADDRS, /* struct flow_dissector_key_ipv4_addrs */
|
|
FLOW_DISSECTOR_KEY_IPV6_ADDRS, /* struct flow_dissector_key_ipv6_addrs */
|
|
FLOW_DISSECTOR_KEY_PORTS, /* struct flow_dissector_key_ports */
|
|
FLOW_DISSECTOR_KEY_ICMP, /* struct flow_dissector_key_icmp */
|
|
FLOW_DISSECTOR_KEY_ETH_ADDRS, /* struct flow_dissector_key_eth_addrs */
|
|
FLOW_DISSECTOR_KEY_TIPC_ADDRS, /* struct flow_dissector_key_tipc_addrs */
|
|
FLOW_DISSECTOR_KEY_ARP, /* struct flow_dissector_key_arp */
|
|
FLOW_DISSECTOR_KEY_VLAN, /* struct flow_dissector_key_flow_vlan */
|
|
FLOW_DISSECTOR_KEY_FLOW_LABEL, /* struct flow_dissector_key_flow_tags */
|
|
FLOW_DISSECTOR_KEY_GRE_KEYID, /* struct flow_dissector_key_keyid */
|
|
FLOW_DISSECTOR_KEY_MPLS_ENTROPY, /* struct flow_dissector_key_keyid */
|
|
FLOW_DISSECTOR_KEY_ENC_KEYID, /* struct flow_dissector_key_keyid */
|
|
FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS, /* struct flow_dissector_key_ipv4_addrs */
|
|
FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS, /* struct flow_dissector_key_ipv6_addrs */
|
|
FLOW_DISSECTOR_KEY_ENC_CONTROL, /* struct flow_dissector_key_control */
|
|
FLOW_DISSECTOR_KEY_ENC_PORTS, /* struct flow_dissector_key_ports */
|
|
FLOW_DISSECTOR_KEY_MPLS, /* struct flow_dissector_key_mpls */
|
|
FLOW_DISSECTOR_KEY_TCP, /* struct flow_dissector_key_tcp */
|
|
FLOW_DISSECTOR_KEY_IP, /* struct flow_dissector_key_ip */
|
|
|
|
FLOW_DISSECTOR_KEY_MAX,
|
|
};
|
|
|
|
#define FLOW_DISSECTOR_F_PARSE_1ST_FRAG BIT(0)
|
|
#define FLOW_DISSECTOR_F_STOP_AT_L3 BIT(1)
|
|
#define FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL BIT(2)
|
|
#define FLOW_DISSECTOR_F_STOP_AT_ENCAP BIT(3)
|
|
|
|
struct flow_dissector_key {
|
|
enum flow_dissector_key_id key_id;
|
|
size_t offset; /* offset of struct flow_dissector_key_*
|
|
in target the struct */
|
|
};
|
|
|
|
struct flow_dissector {
|
|
unsigned int used_keys; /* each bit repesents presence of one key id */
|
|
unsigned short int offset[FLOW_DISSECTOR_KEY_MAX];
|
|
};
|
|
|
|
struct flow_keys {
|
|
struct flow_dissector_key_control control;
|
|
#define FLOW_KEYS_HASH_START_FIELD basic
|
|
struct flow_dissector_key_basic basic;
|
|
struct flow_dissector_key_tags tags;
|
|
struct flow_dissector_key_vlan vlan;
|
|
struct flow_dissector_key_keyid keyid;
|
|
struct flow_dissector_key_ports ports;
|
|
struct flow_dissector_key_addrs addrs;
|
|
};
|
|
|
|
#define FLOW_KEYS_HASH_OFFSET \
|
|
offsetof(struct flow_keys, FLOW_KEYS_HASH_START_FIELD)
|
|
|
|
__be32 flow_get_u32_src(const struct flow_keys *flow);
|
|
__be32 flow_get_u32_dst(const struct flow_keys *flow);
|
|
|
|
extern struct flow_dissector flow_keys_dissector;
|
|
extern struct flow_dissector flow_keys_buf_dissector;
|
|
|
|
/* struct flow_keys_digest:
|
|
*
|
|
* This structure is used to hold a digest of the full flow keys. This is a
|
|
* larger "hash" of a flow to allow definitively matching specific flows where
|
|
* the 32 bit skb->hash is not large enough. The size is limited to 16 bytes so
|
|
* that it can by used in CB of skb (see sch_choke for an example).
|
|
*/
|
|
#define FLOW_KEYS_DIGEST_LEN 16
|
|
struct flow_keys_digest {
|
|
u8 data[FLOW_KEYS_DIGEST_LEN];
|
|
};
|
|
|
|
void make_flow_keys_digest(struct flow_keys_digest *digest,
|
|
const struct flow_keys *flow);
|
|
|
|
static inline bool flow_keys_have_l4(const struct flow_keys *keys)
|
|
{
|
|
return (keys->ports.ports || keys->tags.flow_label);
|
|
}
|
|
|
|
u32 flow_hash_from_keys(struct flow_keys *keys);
|
|
|
|
static inline bool dissector_uses_key(const struct flow_dissector *flow_dissector,
|
|
enum flow_dissector_key_id key_id)
|
|
{
|
|
return flow_dissector->used_keys & (1 << key_id);
|
|
}
|
|
|
|
static inline void *skb_flow_dissector_target(struct flow_dissector *flow_dissector,
|
|
enum flow_dissector_key_id key_id,
|
|
void *target_container)
|
|
{
|
|
return ((char *)target_container) + flow_dissector->offset[key_id];
|
|
}
|
|
|
|
#endif
|