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 14:07:57 +00:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0 */
|
2015-05-12 12:56:07 +00:00
|
|
|
#ifndef _NET_FLOW_DISSECTOR_H
|
|
|
|
#define _NET_FLOW_DISSECTOR_H
|
2011-11-28 05:22:18 +00:00
|
|
|
|
2015-05-12 12:56:17 +00:00
|
|
|
#include <linux/types.h>
|
2015-05-12 12:56:18 +00:00
|
|
|
#include <linux/in6.h>
|
2019-10-22 14:57:46 +00:00
|
|
|
#include <linux/siphash.h>
|
2020-02-17 20:38:09 +00:00
|
|
|
#include <linux/string.h>
|
2015-05-12 12:56:19 +00:00
|
|
|
#include <uapi/linux/if_ether.h>
|
2015-05-12 12:56:17 +00:00
|
|
|
|
2020-05-31 08:28:37 +00:00
|
|
|
struct bpf_prog;
|
|
|
|
struct net;
|
2019-10-29 13:50:52 +00:00
|
|
|
struct sk_buff;
|
|
|
|
|
2015-06-04 16:16:39 +00:00
|
|
|
/**
|
|
|
|
* struct flow_dissector_key_control:
|
|
|
|
* @thoff: Transport header offset
|
|
|
|
*/
|
|
|
|
struct flow_dissector_key_control {
|
|
|
|
u16 thoff;
|
2015-06-04 16:16:40 +00:00
|
|
|
u16 addr_type;
|
2015-09-01 23:46:08 +00:00
|
|
|
u32 flags;
|
2015-06-04 16:16:39 +00:00
|
|
|
};
|
|
|
|
|
2015-09-01 23:46:08 +00:00
|
|
|
#define FLOW_DIS_IS_FRAGMENT BIT(0)
|
|
|
|
#define FLOW_DIS_FIRST_FRAG BIT(1)
|
|
|
|
#define FLOW_DIS_ENCAPSULATION BIT(2)
|
|
|
|
|
2017-09-01 21:04:11 +00:00
|
|
|
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,
|
|
|
|
};
|
|
|
|
|
2015-05-12 12:56:15 +00:00
|
|
|
/**
|
|
|
|
* struct flow_dissector_key_basic:
|
|
|
|
* @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;
|
2015-06-04 16:16:39 +00:00
|
|
|
u8 padding;
|
2015-05-12 12:56:15 +00:00
|
|
|
};
|
|
|
|
|
2015-06-04 16:16:43 +00:00
|
|
|
struct flow_dissector_key_tags {
|
2016-08-17 10:36:11 +00:00
|
|
|
u32 flow_label;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct flow_dissector_key_vlan {
|
2019-11-19 22:05:54 +00:00
|
|
|
union {
|
2019-11-22 15:47:21 +00:00
|
|
|
struct {
|
|
|
|
u16 vlan_id:12,
|
|
|
|
vlan_dei:1,
|
|
|
|
vlan_priority:3;
|
|
|
|
};
|
2019-11-19 22:05:54 +00:00
|
|
|
__be16 vlan_tci;
|
|
|
|
};
|
2018-07-06 05:38:12 +00:00
|
|
|
__be16 vlan_tpid;
|
2022-04-06 11:22:41 +00:00
|
|
|
__be16 vlan_eth_type;
|
|
|
|
u16 padding;
|
2015-06-04 16:16:43 +00:00
|
|
|
};
|
|
|
|
|
flow_dissector: Parse multiple MPLS Label Stack Entries
The current MPLS dissector only parses the first MPLS Label Stack
Entry (second LSE can be parsed too, but only to set a key_id).
This patch adds the possibility to parse several LSEs by making
__skb_flow_dissect_mpls() return FLOW_DISSECT_RET_PROTO_AGAIN as long
as the Bottom Of Stack bit hasn't been seen, up to a maximum of
FLOW_DIS_MPLS_MAX entries.
FLOW_DIS_MPLS_MAX is arbitrarily set to 7. This should be enough for
many practical purposes, without wasting too much space.
To record the parsed values, flow_dissector_key_mpls is modified to
store an array of stack entries, instead of just the values of the
first one. A bit field, "used_lses", is also added to keep track of
the LSEs that have been set. The objective is to avoid defining a
new FLOW_DISSECTOR_KEY_MPLS_XX for each level of the MPLS stack.
TC flower is adapted for the new struct flow_dissector_key_mpls layout.
Matching on several MPLS Label Stack Entries will be added in the next
patch.
The NFP and MLX5 drivers are also adapted: nfp_flower_compile_mac() and
mlx5's parse_tunnel() now verify that the rule only uses the first LSE
and fail if it doesn't.
Finally, the behaviour of the FLOW_DISSECTOR_KEY_MPLS_ENTROPY key is
slightly modified. Instead of recording the first Entropy Label, it
now records the last one. This shouldn't have any consequences since
there doesn't seem to have any user of FLOW_DISSECTOR_KEY_MPLS_ENTROPY
in the tree. We'd probably better do a hash of all parsed MPLS labels
instead (excluding reserved labels) anyway. That'd give better entropy
and would probably also simplify the code. But that's not the purpose
of this patch, so I'm keeping that as a future possible improvement.
Signed-off-by: Guillaume Nault <gnault@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-05-26 12:29:00 +00:00
|
|
|
struct flow_dissector_mpls_lse {
|
2017-04-22 20:52:46 +00:00
|
|
|
u32 mpls_ttl:8,
|
|
|
|
mpls_bos:1,
|
|
|
|
mpls_tc:3,
|
|
|
|
mpls_label:20;
|
|
|
|
};
|
|
|
|
|
flow_dissector: Parse multiple MPLS Label Stack Entries
The current MPLS dissector only parses the first MPLS Label Stack
Entry (second LSE can be parsed too, but only to set a key_id).
This patch adds the possibility to parse several LSEs by making
__skb_flow_dissect_mpls() return FLOW_DISSECT_RET_PROTO_AGAIN as long
as the Bottom Of Stack bit hasn't been seen, up to a maximum of
FLOW_DIS_MPLS_MAX entries.
FLOW_DIS_MPLS_MAX is arbitrarily set to 7. This should be enough for
many practical purposes, without wasting too much space.
To record the parsed values, flow_dissector_key_mpls is modified to
store an array of stack entries, instead of just the values of the
first one. A bit field, "used_lses", is also added to keep track of
the LSEs that have been set. The objective is to avoid defining a
new FLOW_DISSECTOR_KEY_MPLS_XX for each level of the MPLS stack.
TC flower is adapted for the new struct flow_dissector_key_mpls layout.
Matching on several MPLS Label Stack Entries will be added in the next
patch.
The NFP and MLX5 drivers are also adapted: nfp_flower_compile_mac() and
mlx5's parse_tunnel() now verify that the rule only uses the first LSE
and fail if it doesn't.
Finally, the behaviour of the FLOW_DISSECTOR_KEY_MPLS_ENTROPY key is
slightly modified. Instead of recording the first Entropy Label, it
now records the last one. This shouldn't have any consequences since
there doesn't seem to have any user of FLOW_DISSECTOR_KEY_MPLS_ENTROPY
in the tree. We'd probably better do a hash of all parsed MPLS labels
instead (excluding reserved labels) anyway. That'd give better entropy
and would probably also simplify the code. But that's not the purpose
of this patch, so I'm keeping that as a future possible improvement.
Signed-off-by: Guillaume Nault <gnault@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-05-26 12:29:00 +00:00
|
|
|
#define FLOW_DIS_MPLS_MAX 7
|
|
|
|
struct flow_dissector_key_mpls {
|
|
|
|
struct flow_dissector_mpls_lse ls[FLOW_DIS_MPLS_MAX]; /* Label Stack */
|
|
|
|
u8 used_lses; /* One bit set for each Label Stack Entry in use */
|
|
|
|
};
|
|
|
|
|
|
|
|
static inline void dissector_set_mpls_lse(struct flow_dissector_key_mpls *mpls,
|
|
|
|
int lse_index)
|
|
|
|
{
|
|
|
|
mpls->used_lses |= 1 << lse_index;
|
|
|
|
}
|
|
|
|
|
2018-08-07 15:36:00 +00:00
|
|
|
#define FLOW_DIS_TUN_OPTS_MAX 255
|
|
|
|
/**
|
|
|
|
* struct flow_dissector_key_enc_opts:
|
|
|
|
* @data: tunnel option data
|
|
|
|
* @len: length of tunnel option data
|
|
|
|
* @dst_opt_type: tunnel option type
|
|
|
|
*/
|
|
|
|
struct flow_dissector_key_enc_opts {
|
|
|
|
u8 data[FLOW_DIS_TUN_OPTS_MAX]; /* Using IP_TUNNEL_OPTS_MAX is desired
|
|
|
|
* here but seems difficult to #include
|
|
|
|
*/
|
|
|
|
u8 len;
|
|
|
|
__be16 dst_opt_type;
|
|
|
|
};
|
|
|
|
|
2015-06-04 16:16:45 +00:00
|
|
|
struct flow_dissector_key_keyid {
|
|
|
|
__be32 keyid;
|
|
|
|
};
|
|
|
|
|
2015-05-12 12:56:15 +00:00
|
|
|
/**
|
2015-06-04 16:16:40 +00:00
|
|
|
* struct flow_dissector_key_ipv4_addrs:
|
|
|
|
* @src: source ip address
|
|
|
|
* @dst: destination ip address
|
2015-05-12 12:56:15 +00:00
|
|
|
*/
|
2015-06-04 16:16:40 +00:00
|
|
|
struct flow_dissector_key_ipv4_addrs {
|
2015-05-12 12:56:15 +00:00
|
|
|
/* (src,dst) must be grouped, in the same way than in IP header */
|
|
|
|
__be32 src;
|
|
|
|
__be32 dst;
|
|
|
|
};
|
|
|
|
|
2015-06-04 16:16:40 +00:00
|
|
|
/**
|
|
|
|
* 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;
|
|
|
|
};
|
|
|
|
|
2015-06-04 16:16:41 +00:00
|
|
|
/**
|
tipc: improve link resiliency when rps is activated
Currently, the TIPC RPS dissector is based only on the incoming packets'
source node address, hence steering all traffic from a node to the same
core. We have seen that this makes the links vulnerable to starvation
and unnecessary resets when we turn down the link tolerance to very low
values.
To reduce the risk of this happening, we exempt probe and probe replies
packets from the convergence to one core per source node. Instead, we do
the opposite, - we try to diverge those packets across as many cores as
possible, by randomizing the flow selector key.
To make such packets identifiable to the dissector, we add a new
'is_keepalive' bit to word 0 of the LINK_PROTOCOL header. This bit is
set both for PROBE and PROBE_REPLY messages, and only for those.
It should be noted that these packets are not part of any flow anyway,
and only constitute a minuscule fraction of all packets sent across a
link. Hence, there is no risk that this will affect overall performance.
Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-11-08 08:59:26 +00:00
|
|
|
* struct flow_dissector_key_tipc:
|
|
|
|
* @key: source node address combined with selector
|
2015-06-04 16:16:41 +00:00
|
|
|
*/
|
tipc: improve link resiliency when rps is activated
Currently, the TIPC RPS dissector is based only on the incoming packets'
source node address, hence steering all traffic from a node to the same
core. We have seen that this makes the links vulnerable to starvation
and unnecessary resets when we turn down the link tolerance to very low
values.
To reduce the risk of this happening, we exempt probe and probe replies
packets from the convergence to one core per source node. Instead, we do
the opposite, - we try to diverge those packets across as many cores as
possible, by randomizing the flow selector key.
To make such packets identifiable to the dissector, we add a new
'is_keepalive' bit to word 0 of the LINK_PROTOCOL header. This bit is
set both for PROBE and PROBE_REPLY messages, and only for those.
It should be noted that these packets are not part of any flow anyway,
and only constitute a minuscule fraction of all packets sent across a
link. Hence, there is no risk that this will affect overall performance.
Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-11-08 08:59:26 +00:00
|
|
|
struct flow_dissector_key_tipc {
|
|
|
|
__be32 key;
|
2015-06-04 16:16:41 +00:00
|
|
|
};
|
|
|
|
|
2015-06-04 16:16:40 +00:00
|
|
|
/**
|
|
|
|
* 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;
|
tipc: improve link resiliency when rps is activated
Currently, the TIPC RPS dissector is based only on the incoming packets'
source node address, hence steering all traffic from a node to the same
core. We have seen that this makes the links vulnerable to starvation
and unnecessary resets when we turn down the link tolerance to very low
values.
To reduce the risk of this happening, we exempt probe and probe replies
packets from the convergence to one core per source node. Instead, we do
the opposite, - we try to diverge those packets across as many cores as
possible, by randomizing the flow selector key.
To make such packets identifiable to the dissector, we add a new
'is_keepalive' bit to word 0 of the LINK_PROTOCOL header. This bit is
set both for PROBE and PROBE_REPLY messages, and only for those.
It should be noted that these packets are not part of any flow anyway,
and only constitute a minuscule fraction of all packets sent across a
link. Hence, there is no risk that this will affect overall performance.
Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-11-08 08:59:26 +00:00
|
|
|
struct flow_dissector_key_tipc tipckey;
|
2015-06-04 16:16:40 +00:00
|
|
|
};
|
|
|
|
};
|
|
|
|
|
2017-01-11 13:05:42 +00:00
|
|
|
/**
|
|
|
|
* 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];
|
|
|
|
};
|
|
|
|
|
2015-05-12 12:56:15 +00:00
|
|
|
/**
|
|
|
|
* flow_dissector_key_tp_ports:
|
|
|
|
* @ports: port numbers of Transport header
|
2015-05-12 12:56:20 +00:00
|
|
|
* src: source port number
|
|
|
|
* dst: destination port number
|
2015-05-12 12:56:15 +00:00
|
|
|
*/
|
|
|
|
struct flow_dissector_key_ports {
|
|
|
|
union {
|
|
|
|
__be32 ports;
|
2015-05-12 12:56:20 +00:00
|
|
|
struct {
|
|
|
|
__be16 src;
|
|
|
|
__be16 dst;
|
|
|
|
};
|
2015-05-12 12:56:15 +00:00
|
|
|
};
|
|
|
|
};
|
|
|
|
|
2022-07-11 15:09:07 +00:00
|
|
|
/**
|
|
|
|
* struct flow_dissector_key_ports_range
|
|
|
|
* @tp: port number from packet
|
|
|
|
* @tp_min: min port number in range
|
|
|
|
* @tp_max: max port number in range
|
|
|
|
*/
|
|
|
|
struct flow_dissector_key_ports_range {
|
|
|
|
union {
|
|
|
|
struct flow_dissector_key_ports tp;
|
|
|
|
struct {
|
|
|
|
struct flow_dissector_key_ports tp_min;
|
|
|
|
struct flow_dissector_key_ports tp_max;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
2016-12-07 12:48:27 +00:00
|
|
|
/**
|
|
|
|
* flow_dissector_key_icmp:
|
|
|
|
* type: ICMP type
|
|
|
|
* code: ICMP code
|
2019-10-29 13:50:52 +00:00
|
|
|
* id: session identifier
|
2016-12-07 12:48:27 +00:00
|
|
|
*/
|
|
|
|
struct flow_dissector_key_icmp {
|
2019-10-29 13:50:52 +00:00
|
|
|
struct {
|
|
|
|
u8 type;
|
|
|
|
u8 code;
|
2016-12-07 12:48:27 +00:00
|
|
|
};
|
2019-10-29 13:50:52 +00:00
|
|
|
u16 id;
|
2016-12-07 12:48:27 +00:00
|
|
|
};
|
2015-05-12 12:56:18 +00:00
|
|
|
|
2015-05-12 12:56:19 +00:00
|
|
|
/**
|
|
|
|
* 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];
|
|
|
|
};
|
|
|
|
|
2017-05-23 16:40:44 +00:00
|
|
|
/**
|
|
|
|
* struct flow_dissector_key_tcp:
|
|
|
|
* @flags: flags
|
|
|
|
*/
|
|
|
|
struct flow_dissector_key_tcp {
|
|
|
|
__be16 flags;
|
|
|
|
};
|
|
|
|
|
2017-06-01 18:37:37 +00:00
|
|
|
/**
|
|
|
|
* struct flow_dissector_key_ip:
|
|
|
|
* @tos: tos
|
|
|
|
* @ttl: ttl
|
|
|
|
*/
|
|
|
|
struct flow_dissector_key_ip {
|
|
|
|
__u8 tos;
|
|
|
|
__u8 ttl;
|
|
|
|
};
|
|
|
|
|
2019-06-19 06:41:02 +00:00
|
|
|
/**
|
|
|
|
* struct flow_dissector_key_meta:
|
|
|
|
* @ingress_ifindex: ingress ifindex
|
2019-11-19 22:05:53 +00:00
|
|
|
* @ingress_iftype: ingress interface type
|
2019-06-19 06:41:02 +00:00
|
|
|
*/
|
|
|
|
struct flow_dissector_key_meta {
|
|
|
|
int ingress_ifindex;
|
2019-11-19 22:05:53 +00:00
|
|
|
u16 ingress_iftype;
|
2019-06-19 06:41:02 +00:00
|
|
|
};
|
|
|
|
|
2019-07-09 07:30:49 +00:00
|
|
|
/**
|
|
|
|
* struct flow_dissector_key_ct:
|
|
|
|
* @ct_state: conntrack state after converting with map
|
|
|
|
* @ct_mark: conttrack mark
|
|
|
|
* @ct_zone: conntrack zone
|
|
|
|
* @ct_labels: conntrack labels
|
|
|
|
*/
|
|
|
|
struct flow_dissector_key_ct {
|
|
|
|
u16 ct_state;
|
|
|
|
u16 ct_zone;
|
|
|
|
u32 ct_mark;
|
|
|
|
u32 ct_labels[4];
|
|
|
|
};
|
|
|
|
|
2020-07-22 22:03:00 +00:00
|
|
|
/**
|
|
|
|
* struct flow_dissector_key_hash:
|
|
|
|
* @hash: hash value
|
|
|
|
*/
|
|
|
|
struct flow_dissector_key_hash {
|
|
|
|
u32 hash;
|
|
|
|
};
|
|
|
|
|
2022-04-19 08:14:32 +00:00
|
|
|
/**
|
|
|
|
* struct flow_dissector_key_num_of_vlans:
|
|
|
|
* @num_of_vlans: num_of_vlans value
|
|
|
|
*/
|
|
|
|
struct flow_dissector_key_num_of_vlans {
|
|
|
|
u8 num_of_vlans;
|
|
|
|
};
|
|
|
|
|
2015-05-12 12:56:15 +00:00
|
|
|
enum flow_dissector_key_id {
|
2015-06-04 16:16:39 +00:00
|
|
|
FLOW_DISSECTOR_KEY_CONTROL, /* struct flow_dissector_key_control */
|
2015-05-12 12:56:15 +00:00
|
|
|
FLOW_DISSECTOR_KEY_BASIC, /* struct flow_dissector_key_basic */
|
2015-06-04 16:16:40 +00:00
|
|
|
FLOW_DISSECTOR_KEY_IPV4_ADDRS, /* struct flow_dissector_key_ipv4_addrs */
|
|
|
|
FLOW_DISSECTOR_KEY_IPV6_ADDRS, /* struct flow_dissector_key_ipv6_addrs */
|
2015-05-12 12:56:15 +00:00
|
|
|
FLOW_DISSECTOR_KEY_PORTS, /* struct flow_dissector_key_ports */
|
2019-12-03 10:40:12 +00:00
|
|
|
FLOW_DISSECTOR_KEY_PORTS_RANGE, /* struct flow_dissector_key_ports */
|
2016-12-07 12:48:27 +00:00
|
|
|
FLOW_DISSECTOR_KEY_ICMP, /* struct flow_dissector_key_icmp */
|
2015-05-12 12:56:19 +00:00
|
|
|
FLOW_DISSECTOR_KEY_ETH_ADDRS, /* struct flow_dissector_key_eth_addrs */
|
tipc: improve link resiliency when rps is activated
Currently, the TIPC RPS dissector is based only on the incoming packets'
source node address, hence steering all traffic from a node to the same
core. We have seen that this makes the links vulnerable to starvation
and unnecessary resets when we turn down the link tolerance to very low
values.
To reduce the risk of this happening, we exempt probe and probe replies
packets from the convergence to one core per source node. Instead, we do
the opposite, - we try to diverge those packets across as many cores as
possible, by randomizing the flow selector key.
To make such packets identifiable to the dissector, we add a new
'is_keepalive' bit to word 0 of the LINK_PROTOCOL header. This bit is
set both for PROBE and PROBE_REPLY messages, and only for those.
It should be noted that these packets are not part of any flow anyway,
and only constitute a minuscule fraction of all packets sent across a
link. Hence, there is no risk that this will affect overall performance.
Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-11-08 08:59:26 +00:00
|
|
|
FLOW_DISSECTOR_KEY_TIPC, /* struct flow_dissector_key_tipc */
|
2017-01-11 13:05:42 +00:00
|
|
|
FLOW_DISSECTOR_KEY_ARP, /* struct flow_dissector_key_arp */
|
2018-11-27 15:40:59 +00:00
|
|
|
FLOW_DISSECTOR_KEY_VLAN, /* struct flow_dissector_key_vlan */
|
|
|
|
FLOW_DISSECTOR_KEY_FLOW_LABEL, /* struct flow_dissector_key_tags */
|
2015-06-04 16:16:45 +00:00
|
|
|
FLOW_DISSECTOR_KEY_GRE_KEYID, /* struct flow_dissector_key_keyid */
|
2015-06-04 16:16:46 +00:00
|
|
|
FLOW_DISSECTOR_KEY_MPLS_ENTROPY, /* struct flow_dissector_key_keyid */
|
2016-11-07 13:14:37 +00:00
|
|
|
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 */
|
2016-11-07 13:14:39 +00:00
|
|
|
FLOW_DISSECTOR_KEY_ENC_PORTS, /* struct flow_dissector_key_ports */
|
2017-04-22 20:52:46 +00:00
|
|
|
FLOW_DISSECTOR_KEY_MPLS, /* struct flow_dissector_key_mpls */
|
2017-05-23 16:40:44 +00:00
|
|
|
FLOW_DISSECTOR_KEY_TCP, /* struct flow_dissector_key_tcp */
|
2017-06-01 18:37:37 +00:00
|
|
|
FLOW_DISSECTOR_KEY_IP, /* struct flow_dissector_key_ip */
|
2018-11-27 15:40:59 +00:00
|
|
|
FLOW_DISSECTOR_KEY_CVLAN, /* struct flow_dissector_key_vlan */
|
2018-07-17 16:27:17 +00:00
|
|
|
FLOW_DISSECTOR_KEY_ENC_IP, /* struct flow_dissector_key_ip */
|
2018-08-07 15:36:00 +00:00
|
|
|
FLOW_DISSECTOR_KEY_ENC_OPTS, /* struct flow_dissector_key_enc_opts */
|
2019-06-19 06:41:02 +00:00
|
|
|
FLOW_DISSECTOR_KEY_META, /* struct flow_dissector_key_meta */
|
2019-07-09 07:30:49 +00:00
|
|
|
FLOW_DISSECTOR_KEY_CT, /* struct flow_dissector_key_ct */
|
2020-07-22 22:03:00 +00:00
|
|
|
FLOW_DISSECTOR_KEY_HASH, /* struct flow_dissector_key_hash */
|
2022-04-19 08:14:32 +00:00
|
|
|
FLOW_DISSECTOR_KEY_NUM_OF_VLANS, /* struct flow_dissector_key_num_of_vlans */
|
2018-08-07 15:36:00 +00:00
|
|
|
|
2015-05-12 12:56:15 +00:00
|
|
|
FLOW_DISSECTOR_KEY_MAX,
|
|
|
|
};
|
|
|
|
|
2015-09-01 16:24:28 +00:00
|
|
|
#define FLOW_DISSECTOR_F_PARSE_1ST_FRAG BIT(0)
|
2019-05-31 21:05:06 +00:00
|
|
|
#define FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL BIT(1)
|
|
|
|
#define FLOW_DISSECTOR_F_STOP_AT_ENCAP BIT(2)
|
cls_flower: Fix inability to match GRE/IPIP packets
When a packet of a new flow arrives in openvswitch kernel module, it dissects
the packet and passes the extracted flow key to ovs-vswtichd daemon. If hw-
offload configuration is enabled, the daemon creates a new TC flower entry to
bypass openvswitch kernel module for the flow (TC flower can also offload flows
to NICs but this time that does not matter).
In this processing flow, I found the following issue in cases of GRE/IPIP
packets.
When ovs_flow_key_extract() in openvswitch module parses a packet of a new
GRE (or IPIP) flow received on non-tunneling vports, it extracts information
of the outer IP header for ip_proto/src_ip/dst_ip match keys.
This means ovs-vswitchd creates a TC flower entry with IP protocol/addresses
match keys whose values are those of the outer IP header. OTOH, TC flower,
which uses flow_dissector (different parser from openvswitch module), extracts
information of the inner IP header.
The following flow is an example to describe the issue in more detail.
<----------- Outer IP -----------------> <---------- Inner IP ---------->
+----------+--------------+--------------+----------+----------+----------+
| ip_proto | src_ip | dst_ip | ip_proto | src_ip | dst_ip |
| 47 (GRE) | 192.168.10.1 | 192.168.10.2 | 6 (TCP) | 10.0.0.1 | 10.0.0.2 |
+----------+--------------+--------------+----------+----------+----------+
In this case, TC flower entry and extracted information are shown as below:
- ovs-vswitchd creates TC flower entry with:
- ip_proto: 47
- src_ip: 192.168.10.1
- dst_ip: 192.168.10.2
- TC flower extracts below for IP header matches:
- ip_proto: 6
- src_ip: 10.0.0.1
- dst_ip: 10.0.0.2
Thus, GRE or IPIP packets never match the TC flower entry, as each
dissector behaves differently.
IMHO, the behavior of TC flower (flow dissector) does not look correct,
as ip_proto/src_ip/dst_ip in TC flower match means the outermost IP
header information except for GRE/IPIP cases. This patch adds a new
flow_dissector flag FLOW_DISSECTOR_F_STOP_BEFORE_ENCAP which skips
dissection of the encapsulated inner GRE/IPIP header in TC flower
classifier.
Signed-off-by: Yoshiki Komachi <komachi.yoshiki@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2021-10-29 09:21:41 +00:00
|
|
|
#define FLOW_DISSECTOR_F_STOP_BEFORE_ENCAP BIT(3)
|
2015-09-01 16:24:28 +00:00
|
|
|
|
2015-05-12 12:56:15 +00:00
|
|
|
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];
|
|
|
|
};
|
|
|
|
|
2018-05-04 09:32:59 +00:00
|
|
|
struct flow_keys_basic {
|
|
|
|
struct flow_dissector_key_control control;
|
|
|
|
struct flow_dissector_key_basic basic;
|
|
|
|
};
|
|
|
|
|
2015-05-12 12:56:16 +00:00
|
|
|
struct flow_keys {
|
2015-06-04 16:16:39 +00:00
|
|
|
struct flow_dissector_key_control control;
|
|
|
|
#define FLOW_KEYS_HASH_START_FIELD basic
|
2019-10-22 14:57:46 +00:00
|
|
|
struct flow_dissector_key_basic basic __aligned(SIPHASH_ALIGNMENT);
|
2015-06-04 16:16:43 +00:00
|
|
|
struct flow_dissector_key_tags tags;
|
2016-08-17 10:36:11 +00:00
|
|
|
struct flow_dissector_key_vlan vlan;
|
2018-07-06 05:38:14 +00:00
|
|
|
struct flow_dissector_key_vlan cvlan;
|
2015-06-04 16:16:45 +00:00
|
|
|
struct flow_dissector_key_keyid keyid;
|
2015-06-04 16:16:39 +00:00
|
|
|
struct flow_dissector_key_ports ports;
|
2019-10-29 13:50:52 +00:00
|
|
|
struct flow_dissector_key_icmp icmp;
|
2019-10-29 13:50:50 +00:00
|
|
|
/* 'addrs' must be the last member */
|
2015-06-04 16:16:39 +00:00
|
|
|
struct flow_dissector_key_addrs addrs;
|
2015-05-12 12:56:16 +00:00
|
|
|
};
|
|
|
|
|
2015-06-04 16:16:39 +00:00
|
|
|
#define FLOW_KEYS_HASH_OFFSET \
|
|
|
|
offsetof(struct flow_keys, FLOW_KEYS_HASH_START_FIELD)
|
|
|
|
|
2015-06-04 16:16:40 +00:00
|
|
|
__be32 flow_get_u32_src(const struct flow_keys *flow);
|
|
|
|
__be32 flow_get_u32_dst(const struct flow_keys *flow);
|
|
|
|
|
2015-05-12 12:56:16 +00:00
|
|
|
extern struct flow_dissector flow_keys_dissector;
|
2018-05-04 09:32:59 +00:00
|
|
|
extern struct flow_dissector flow_keys_basic_dissector;
|
2015-05-12 12:56:16 +00:00
|
|
|
|
2015-05-01 18:30:17 +00:00
|
|
|
/* 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
|
2018-05-06 11:23:52 +00:00
|
|
|
* that it can be used in CB of skb (see sch_choke for an example).
|
2015-05-01 18:30:17 +00:00
|
|
|
*/
|
|
|
|
#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);
|
|
|
|
|
2016-08-31 03:16:22 +00:00
|
|
|
static inline bool flow_keys_have_l4(const struct flow_keys *keys)
|
2015-09-01 16:24:24 +00:00
|
|
|
{
|
|
|
|
return (keys->ports.ports || keys->tags.flow_label);
|
|
|
|
}
|
|
|
|
|
2015-09-01 16:24:25 +00:00
|
|
|
u32 flow_hash_from_keys(struct flow_keys *keys);
|
2019-10-29 13:50:52 +00:00
|
|
|
void skb_flow_get_icmp_tci(const struct sk_buff *skb,
|
|
|
|
struct flow_dissector_key_icmp *key_icmp,
|
2021-03-14 11:11:23 +00:00
|
|
|
const void *data, int thoff, int hlen);
|
2015-09-01 16:24:25 +00:00
|
|
|
|
2016-03-08 10:42:30 +00:00
|
|
|
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];
|
|
|
|
}
|
|
|
|
|
2019-04-22 15:55:44 +00:00
|
|
|
struct bpf_flow_dissector {
|
|
|
|
struct bpf_flow_keys *flow_keys;
|
|
|
|
const struct sk_buff *skb;
|
2021-03-14 11:11:00 +00:00
|
|
|
const void *data;
|
|
|
|
const void *data_end;
|
2019-04-22 15:55:44 +00:00
|
|
|
};
|
|
|
|
|
2020-02-17 20:38:09 +00:00
|
|
|
static inline void
|
|
|
|
flow_dissector_init_keys(struct flow_dissector_key_control *key_control,
|
|
|
|
struct flow_dissector_key_basic *key_basic)
|
|
|
|
{
|
|
|
|
memset(key_control, 0, sizeof(*key_control));
|
|
|
|
memset(key_basic, 0, sizeof(*key_basic));
|
|
|
|
}
|
|
|
|
|
2020-05-31 08:28:37 +00:00
|
|
|
#ifdef CONFIG_BPF_SYSCALL
|
2020-06-25 14:13:54 +00:00
|
|
|
int flow_dissector_bpf_prog_attach_check(struct net *net,
|
|
|
|
struct bpf_prog *prog);
|
2020-05-31 08:28:37 +00:00
|
|
|
#endif /* CONFIG_BPF_SYSCALL */
|
|
|
|
|
2011-11-28 05:22:18 +00:00
|
|
|
#endif
|