David S. Miller
7a49d3d4ea
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next ...
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2018-07-27
1) Extend the output_mark to also support the input direction
and masking the mark values before applying to the skb.
2) Add a new lookup key for the upcomming xfrm interfaces.
3) Extend the xfrm lookups to match xfrm interface IDs.
4) Add virtual xfrm interfaces. The purpose of these interfaces
is to overcome the design limitations that the existing
VTI devices have.
The main limitations that we see with the current VTI are the
following:
VTI interfaces are L3 tunnels with configurable endpoints.
For xfrm, the tunnel endpoint are already determined by the SA.
So the VTI tunnel endpoints must be either the same as on the
SA or wildcards. In case VTI tunnel endpoints are same as on
the SA, we get a one to one correlation between the SA and
the tunnel. So each SA needs its own tunnel interface.
On the other hand, we can have only one VTI tunnel with
wildcard src/dst tunnel endpoints in the system because the
lookup is based on the tunnel endpoints. The existing tunnel
lookup won't work with multiple tunnels with wildcard
tunnel endpoints. Some usecases require more than on
VTI tunnel of this type, for example if somebody has multiple
namespaces and every namespace requires such a VTI.
VTI needs separate interfaces for IPv4 and IPv6 tunnels.
So when routing to a VTI, we have to know to which address
family this traffic class is going to be encapsulated.
This is a lmitation because it makes routing more complex
and it is not always possible to know what happens behind the
VTI, e.g. when the VTI is move to some namespace.
VTI works just with tunnel mode SAs. We need generic interfaces
that ensures transfomation, regardless of the xfrm mode and
the encapsulated address family.
VTI is configured with a combination GRE keys and xfrm marks.
With this we have to deal with some extra cases in the generic
tunnel lookup because the GRE keys on the VTI are actually
not GRE keys, the GRE keys were just reused for something else.
All extensions to the VTI interfaces would require to add
even more complexity to the generic tunnel lookup.
So to overcome this, we developed xfrm interfaces with the
following design goal:
It should be possible to tunnel IPv4 and IPv6 through the same
interface.
No limitation on xfrm mode (tunnel, transport and beet).
Should be a generic virtual interface that ensures IPsec
transformation, no need to know what happens behind the
interface.
Interfaces should be configured with a new key that must match a
new policy/SA lookup key.
The lookup logic should stay in the xfrm codebase, no need to
change or extend generic routing and tunnel lookups.
Should be possible to use IPsec hardware offloads of the underlying
interface.
5) Remove xfrm pcpu policy cache. This was added after the flowcache
removal, but it turned out to make things even worse.
From Florian Westphal.
6) Allow to update the set mark on SA updates.
From Nathan Harold.
7) Convert some timestamps to time64_t.
From Arnd Bergmann.
8) Don't check the offload_handle in xfrm code,
it is an opaque data cookie for the driver.
From Shannon Nelson.
9) Remove xfrmi interface ID from flowi. After this pach
no generic code is touched anymore to do xfrm interface
lookups. From Benedict Wong.
10) Allow to update the xfrm interface ID on SA updates.
From Nathan Harold.
11) Don't pass zero to ERR_PTR() in xfrm_resolve_and_create_bundle.
From YueHaibing.
12) Return more detailed errors on xfrm interface creation.
From Benedict Wong.
13) Use PTR_ERR_OR_ZERO instead of IS_ERR + PTR_ERR.
From the kbuild test robot.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-07-27 09:33:37 -07:00
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
caif: reduce stack size with KASAN
2018-01-19 14:02:12 -05:00
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-07-24 19:21:58 -07:00
netfilter: nf_tables: use dedicated mutex to guard transactions
2018-07-18 11:26:48 +02:00
proc: introduce proc_create_net{,_data}
2018-05-16 07:24:30 +02:00
sctp: add support for dscp and flowlabel per transport
2018-07-04 11:36:54 +09:00
Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux
2018-07-20 21:17:12 -07:00
net: sched: change action API to use array of pointers to actions
2018-07-08 12:42:29 +09:00
net/ipv6: Add support for specifying metric of connected routes
2018-05-29 10:12:45 -04:00
rxrpc, afs: Use debug_ids rather than pointers in traces
2018-03-27 23:03:00 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
VSOCK: use TCP state constants for sk_state
2017-10-05 18:44:17 -07:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
ipv4: Make neigh lookup keys for loopback/point-to-point devices be INADDR_ANY
2018-01-15 14:53:43 -05:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
proc: introduce proc_create_seq{,_data}
2018-05-16 07:23:35 +02:00
net-next: ax88796: add interrupt status callback to platform data
2018-04-19 16:11:11 -04:00
net: Add lag.h, net_lag_port_dev_txable()
2018-07-11 23:10:19 -07:00
net: Record receive queue number for a connection
2018-07-02 09:06:24 +09:00
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-07-24 19:21:58 -07:00
net: remove compat_sys_*() prototypes from net/compat.h
2018-04-02 20:16:17 +02:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net/dcb: Add dcbnl buffer attribute
2018-05-24 14:22:59 -07:00
devlink: Add generic parameters region_snapshot
2018-07-12 17:37:13 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-11-04 09:26:51 +09:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net/decnet: Convert timers to use timer_setup()
2017-10-18 12:39:36 +01:00
decnet: Move dn_next into decnet route structure.
2017-11-30 09:54:25 -05:00
net: dsa: Remove VLA usage
2018-07-18 15:08:31 -07:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
xfrm: Remove xfrmi interface ID from flowi
2018-07-20 10:14:41 +02:00
net: core: dst_cache_set_ip6: Rename 'addr' parameter to 'saddr' for consistency
2018-03-05 12:52:45 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-11-04 09:26:51 +09:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
erspan: set bso bit based on mirrored packet's len
2018-05-20 18:31:42 -04:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
inet: whitespace cleanup
2018-02-28 11:43:28 -05:00
net: Introduce generic failover module
2018-05-28 22:59:54 -04:00
net: Add extack to fib_notifier_info
2017-11-01 11:50:43 +09:00
net: fib_rules: add extack support
2018-04-23 10:21:24 -04:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
xfrm: Remove xfrmi interface ID from flowi
2018-07-20 10:14:41 +02:00
flow_dissector: Dissect tos and ttl from the tunnel info
2018-07-19 23:26:01 -07:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
fq: support filtering a given tin
2017-10-11 09:49:34 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-10-30 21:09:24 +09:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net: sched: add support for TCQ_F_NOLOCK subqueues to sch_mq
2017-12-08 13:32:26 -05:00
genetlink: fix genlmsg_nlhdr()
2017-11-16 10:49:00 +09:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net: GRE: Add is_gretap_dev, is_ip6gretap_dev
2018-02-27 14:46:26 -05:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
fou: fix some member types in guehdr
2017-12-11 14:10:06 -05:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
radiotap: add structs for HE
2018-06-15 14:04:00 +02:00
net/ipv6: Add support for specifying metric of connected routes
2018-05-29 10:12:45 -04:00
net: sched: ife: handle malformed tlv length
2018-04-22 21:12:00 -04:00
net: Convert GRO SKB handling to list_head.
2018-06-26 11:33:04 +09:00
net: ipv4: remove define INET_CSK_DEBUG and unnecessary EXPORT_SYMBOL
2018-05-10 17:43:55 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-11-04 09:26:51 +09:00
rhashtable: split rhashtable.h
2018-06-22 13:43:27 +09:00
inet: Add a 2nd listener hashtable (port+addr)
2017-12-03 10:18:28 -05:00
net: ipv4: Hook into time based transmission
2018-07-04 22:30:27 +09:00
net-tcp: remove useless tw_timeout field
2018-06-05 10:45:24 -04:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
ip: remove tx_flags from ipcm_cookie and use same logic for v4 and v6
2018-07-07 10:58:49 +09:00
ipv6: use fib6_info_hold_safe() when necessary
2018-07-23 11:19:02 -07:00
net/ipv6: Revert attempt to simplify route replace and append
2018-07-04 15:22:13 +09:00
ip6_gre: add erspan v2 support
2017-12-15 12:34:00 -05:00
net/ipv4: Add helper to return path MTU based on fib result
2018-05-22 10:51:09 +02:00
net: check tunnel option type in tunnel flags
2018-06-29 23:50:26 +09:00
ipvs: add assured state for conn templates
2018-07-18 11:26:40 +02:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2018-07-20 22:28:28 -07:00
ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module
2018-07-18 11:26:53 +02:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net: Spelling s/stucture/structure/
2018-03-27 09:51:23 +02:00
net: Add lag.h, net_lag_port_dev_txable()
2018-07-11 23:10:19 -07:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net: LLC: Convert timers to use timer_setup()
2017-10-25 12:06:25 +09:00
llc: delete timers synchronously in llc_sk_free()
2018-04-22 14:55:03 -04:00
net: Move ipv4 set_lwt_redirect helper to lwtunnel
2018-02-14 14:43:32 -05:00
mac80211: add support for HE
2018-06-18 22:40:32 +02:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
neighbour: support for NTF_EXT_LEARNED flag
2018-04-25 13:19:59 -04:00
net: Introduce net_failover driver
2018-05-28 22:59:54 -04:00
net: create reusable function for getting ownership info of sysfs inodes
2018-07-20 23:44:36 -07:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net/ipv6: Add support for path selection using hash of 5-tuple
2018-03-04 13:04:23 -05:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
proc: introduce proc_create_seq{,_data}
2018-05-16 07:23:35 +02:00
net: fix rtnh_ok()
2018-04-07 22:32:31 -04:00
openvswitch: enable NSH support
2017-11-08 16:12:33 +09:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
xdp: introduce xdp_return_frame_rx_napi
2018-05-24 18:36:15 -07:00
ipv{4,6}/ping: simplify proc file creation
2018-05-16 07:23:35 +02:00
net: sched: cls_flower: propagate chain teplate creation and destruction to drivers
2018-07-23 20:44:12 -07:00
net/sched: Add HW offloading capability to ETF
2018-07-04 22:30:27 +09:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
ipv{4,6}/raw: simplify ѕeq_file code
2018-05-16 07:23:35 +02:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net_sched: red: Avoid illegal values
2017-12-05 14:37:13 -05:00
cfg80211: read wmm rules from regulatory database
2018-03-29 11:11:40 +02:00
tcp: socket option to set TCP fast open key
2017-10-20 13:21:36 +01:00
proc: introduce proc_create_seq{,_data}
2018-05-16 07:23:35 +02:00
net/ipv4: Add support for specifying metric of connected routes
2018-05-29 10:12:45 -04:00
Bluetooth: btrsi: add new rsi bluetooth driver
2018-03-13 18:37:02 +02:00
rtnetlink: Remove VLA usage
2018-05-31 22:48:46 -04:00
net: sched: introduce chain templates
2018-07-23 20:44:12 -07:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
rhashtable: split rhashtable.h
2018-06-22 13:43:27 +09:00
rhashtable: split rhashtable.h
2018-06-22 13:43:27 +09:00
bpf: Add IPv6 Segment Routing helpers
2018-05-24 11:57:35 +02:00
slip: Check if rstate is initialized before uncompressing
2018-04-11 10:33:46 -04:00
net/smc: add pnetid support for SMC-D and ISM
2018-06-30 20:42:25 +09:00
sock: sockc cookie initializer
2018-07-07 10:58:49 +09:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
net/mac89x0: Convert to platform_driver
2018-03-01 21:21:36 -05:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
strparser: Add __strp_unpause and use it in ktls.
2018-06-06 14:07:53 -04:00
switchdev: Add fdb.added_by_user to switchdev notifications
2018-05-03 13:46:47 -04:00
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-07-24 19:21:58 -07:00
tcp: remove the hardcode in the definition of TCPF Macro
2018-02-21 15:06:05 -05:00
flow_dissector: do not rely on implicit casts
2018-05-08 00:02:41 -04:00
tls: Add rx inline crypto offload
2018-07-16 00:13:11 -07:00
ipv6: fold sockcm_cookie into ipcm6_cookie
2018-07-07 10:58:49 +09:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2018-07-03 10:29:26 +09:00
net: Convert GRO SKB handling to list_head.
2018-06-26 11:33:04 +09:00
udplite: fix partial checksum initialization
2018-02-16 15:57:42 -05:00
vxlan: add ttl inherit support
2018-04-17 13:53:13 -04:00
lift handling of SIOCIW... out of dev_ioctl()
2018-01-24 19:13:45 -05:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
xdp: factor out common program/flags handling from drivers
2018-07-13 20:26:35 +02:00
xsk: fix potential race in SKB TX completion code
2018-07-02 18:37:12 -07:00
xfrm: Remove xfrmi interface ID from flowi
2018-07-20 10:14:41 +02:00
7a49d3d4ea