David S. Miller
339bbff2d6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next ...
Daniel Borkmann says:
====================
pull-request: bpf-next 2018-12-21
The following pull-request contains BPF updates for your *net-next* tree.
There is a merge conflict in test_verifier.c. Result looks as follows:
[...]
},
{
"calls: cross frame pruning",
.insns = {
[...]
.prog_type = BPF_PROG_TYPE_SOCKET_FILTER,
.errstr_unpriv = "function calls to other bpf functions are allowed for root only",
.result_unpriv = REJECT,
.errstr = "!read_ok",
.result = REJECT,
},
{
"jset: functional",
.insns = {
[...]
{
"jset: unknown const compare not taken",
.insns = {
BPF_RAW_INSN(BPF_JMP | BPF_CALL, 0, 0, 0,
BPF_FUNC_get_prandom_u32),
BPF_JMP_IMM(BPF_JSET, BPF_REG_0, 1, 1),
BPF_LDX_MEM(BPF_B, BPF_REG_8, BPF_REG_9, 0),
BPF_EXIT_INSN(),
},
.prog_type = BPF_PROG_TYPE_SOCKET_FILTER,
.errstr_unpriv = "!read_ok",
.result_unpriv = REJECT,
.errstr = "!read_ok",
.result = REJECT,
},
[...]
{
"jset: range",
.insns = {
[...]
},
.prog_type = BPF_PROG_TYPE_SOCKET_FILTER,
.result_unpriv = ACCEPT,
.result = ACCEPT,
},
The main changes are:
1) Various BTF related improvements in order to get line info
working. Meaning, verifier will now annotate the corresponding
BPF C code to the error log, from Martin and Yonghong.
2) Implement support for raw BPF tracepoints in modules, from Matt.
3) Add several improvements to verifier state logic, namely speeding
up stacksafe check, optimizations for stack state equivalence
test and safety checks for liveness analysis, from Alexei.
4) Teach verifier to make use of BPF_JSET instruction, add several
test cases to kselftests and remove nfp specific JSET optimization
now that verifier has awareness, from Jakub.
5) Improve BPF verifier's slot_type marking logic in order to
allow more stack slot sharing, from Jiong.
6) Add sk_msg->size member for context access and add set of fixes
and improvements to make sock_map with kTLS usable with openssl
based applications, from John.
7) Several cleanups and documentation updates in bpftool as well as
auto-mount of tracefs for "bpftool prog tracelog" command,
from Quentin.
8) Include sub-program tags from now on in bpf_prog_info in order to
have a reliable way for user space to get all tags of the program
e.g. needed for kallsyms correlation, from Song.
9) Add BTF annotations for cgroup_local_storage BPF maps and
implement bpf fs pretty print support, from Roman.
10) Fix bpftool in order to allow for cross-compilation, from Ivan.
11) Update of bpftool license to GPLv2-only + BSD-2-Clause in order
to be compatible with libbfd and allow for Debian packaging,
from Jakub.
12) Remove an obsolete prog->aux sanitation in dump and get rid of
version check for prog load, from Daniel.
13) Fix a memory leak in libbpf's line info handling, from Prashant.
14) Fix cpumap's frame alignment for build_skb() so that skb_shared_info
does not get unaligned, from Jesper.
15) Fix test_progs kselftest to work with older compilers which are less
smart in optimizing (and thus throwing build error), from Stanislav.
16) Cleanup and simplify AF_XDP socket teardown, from Björn.
17) Fix sk lookup in BPF kselftest's test_sock_addr with regards
to netns_id argument, from Andrey.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-12-20 17:31:36 -08:00
9p: Add refcount to p9_req_t
2018-09-08 01:39:47 +09:00
Bluetooth: Errata Service Release 8, Erratum 3253
2018-10-14 10:25:47 +02:00
caif: reduce stack size with KASAN
2018-01-19 14:02:12 -05:00
net/af_iucv: locate IUCV header via skb_network_header()
2018-09-26 09:56:07 -07:00
net: convert bridge_nf to use skb extension infrastructure
2018-12-19 11:21:37 -08:00
xfrm: policy: store inexact policies in an rhashtable
2018-11-09 11:57:47 +01:00
NFC: Fix the number of pipes
2018-09-18 19:55:01 -07:00
proc: introduce proc_create_net{,_data}
2018-05-16 07:24:30 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-12-09 21:43:31 -08:00
Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux
2018-07-20 21:17:12 -07:00
net/sched: Remove egdev mechanism
2018-12-10 15:54:34 -08:00
net/ipv6: Add anycast addresses to a global hashtable
2018-11-02 23:54:56 -07:00
ieee802154: add rx LQI from userspace
2018-07-13 12:18:18 -04:00
rxrpc: Fix life check
2018-11-15 11:35:40 -08:00
net: drop a space before tabs
2018-10-31 12:37:12 -07:00
vsock: split dwork to avoid reinitializations
2018-08-07 12:39:13 -07: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
include/net/bond_3ad: Simplify the code by using the ARRAY_SIZE
2018-08-04 13:23:15 -07:00
bonding: avoid possible dead-lock
2018-09-26 20:22:19 -07:00
net: remove sock_poll_busy_flag
2018-07-30 09:10:25 -07:00
cfg80211: clarify LCI/civic location documentation
2018-12-18 13:15:04 +01:00
net: remove compat_sys_*() prototypes from net/compat.h
2018-04-02 20:16:17 +02:00
net: dcb: Add priority-to-DSCP map getters
2018-07-27 13:17:50 -07:00
devlink: Add 'fw_load_policy' generic parameter
2018-12-03 13:55:43 -08:00
net: dsa: ksz: Rename NET_DSA_TAG_KSZ to _KSZ9477
2018-12-16 14:23:33 -08:00
geneve, vxlan: Don't set exceptions if skb->len < mtu
2018-10-17 21:51:13 -07:00
net: core: dst_cache_set_ip6: Rename 'addr' parameter to 'saddr' for consistency
2018-03-05 12:52:45 -05:00
erspan: set bso bit based on mirrored packet's len
2018-05-20 18:31:42 -04: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: fib_rules: add extack support
2018-04-23 10:21:24 -04:00
net: reorder flowi_common fields to avoid holes
2018-11-30 17:12:39 -08:00
net/flow_dissector: correct comments on enum flow_dissector_key_id
2018-11-30 13:21:52 -08:00
net: align gnet_stats_basic_cpu struct
2018-11-17 21:37:29 -08:00
genetlink: constify genl_err_attr() argument
2018-08-29 19:42:52 -07:00
net: add netif_is_geneve()
2018-11-07 23:00:23 -08:00
net: Add netif_is_gretap()/netif_is_ip6gretap()
2018-12-10 15:53:04 -08:00
net: Convert protocol error handlers from void to int
2018-11-08 17:13:08 -08:00
mac80211: support reporting 0-length PSDU in radiotap
2018-09-05 10:08:25 +02:00
net/ipv6: Add anycast addresses to a global hashtable
2018-11-02 23:54:56 -07:00
net: sched: ife: handle malformed tlv length
2018-04-22 21:12:00 -04:00
net: allow binding socket in a VRF when there's an unbound socket
2018-11-07 16:12:38 -08:00
net: use indirect call wrappers at GRO transport layer
2018-12-15 13:23:02 -08:00
inet/connection_sock: prefer _THIS_IP_ to current_text_addr
2018-08-14 10:04:36 -07:00
inet: Refactor INET_ECN_decapsulate()
2018-10-17 17:45:07 -07:00
ip: add helpers to process in-order fragments faster.
2018-08-11 17:54:18 -07:00
net: ensure unbound stream socket to be chosen when not in a VRF
2018-11-07 16:12:38 -08:00
net: ensure unbound stream socket to be chosen when not in a VRF
2018-11-07 16:12:38 -08:00
net-tcp: remove useless tw_timeout field
2018-06-05 10:45:24 -04:00
ip: factor out protocol delivery helper
2018-11-07 16:23:05 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-10-19 11:03:06 -07:00
net: Add struct for fib dump filter
2018-10-16 00:13:12 -07:00
udp: Support for error handlers of tunnels with arbitrary destination port
2018-11-08 17:13:08 -08:00
net: Don't return invalid table id error when dumping all families
2018-10-24 14:06:25 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-12-20 11:53:36 -08:00
ipvs: add assured state for conn templates
2018-07-18 11:26:40 +02:00
ipv6: factor out protocol delivery helper
2018-11-07 16:23:05 -08:00
ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module
2018-07-18 11:26:53 +02:00
net: Spelling s/stucture/structure/
2018-03-27 09:51:23 +02:00
l3mdev: add function to retreive upper master
2018-12-03 14:15:26 -08:00
net: Add lag.h, net_lag_port_dev_txable()
2018-07-11 23:10:19 -07:00
llc: avoid blocking in llc_sap_close()
2018-09-13 09:04:58 -07: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: propagate the support for TWT to the driver
2018-12-18 14:18:49 +01:00
neighbour: register rtnl doit handler
2018-12-19 13:37:34 -08:00
net: Introduce net_failover driver
2018-05-28 22:59:54 -04:00
flow_dissector: implements flow dissector BPF hook
2018-09-14 12:04:33 -07:00
net: ipv4: Notify about changes to ip_forward_update_priority
2018-08-01 09:52:30 -07:00
netlink: replace __NLA_ENSURE implementation
2018-10-12 11:00:22 -07: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
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: fold tcf_block_cb_call() into tc_setup_cb_call()
2018-12-14 15:32:19 -08:00
net: sched: extend Qdisc with rcu
2018-09-25 20:17:35 -07:00
net: Convert protocol error handlers from void to int
2018-11-08 17:13:08 -08:00
net: fix raw socket lookup device bind matching with VRFs
2018-11-07 16:12:39 -08:00
cfg80211: make wmm_rule part of the reg_rule structure
2018-08-28 11:11:47 +02:00
proc: introduce proc_create_seq{,_data}
2018-05-16 07:23:35 +02:00
net-ipv4: remove 2 always zero parameters from ipv4_redirect()
2018-09-26 20:30:55 -07:00
Bluetooth: btrsi: add new rsi bluetooth driver
2018-03-13 18:37:02 +02:00
net: Add extack argument to rtnl_create_link
2018-11-06 15:00:45 -08:00
net: sched: register callbacks for indirect tc block binds
2018-11-11 09:54:52 -08:00
pids: Compute task_tgid using signal->leader_pid
2018-07-21 10:43:12 -05:00
net: seg6.h: remove an unused #include
2018-12-20 16:56:04 -08:00
rhashtable: split rhashtable.h
2018-06-22 13:43:27 +09:00
bpf: add End.DT6 action to bpf_lwt_seg6_action helper
2018-07-31 09:22:48 +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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-12-20 11:53:36 -08:00
bpf: Enable BPF_PROG_TYPE_SK_REUSEPORT bpf prog in reuseport selection
2018-08-11 01:58:46 +02:00
net/mac89x0: Convert to platform_driver
2018-03-01 21:21:36 -05:00
strparser: Add __strp_unpause and use it in ktls.
2018-06-06 14:07:53 -04:00
net: switchdev: Add extack to switchdev_handle_port_obj_add() callback
2018-12-12 16:34:22 -08:00
tcp: reduce POLLOUT events caused by TCP_NOTSENT_LOWAT
2018-12-04 21:21:18 -08: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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
2018-12-20 17:31:36 -08:00
ipv6: fold sockcm_cookie into ipcm6_cookie
2018-07-07 10:58:49 +09:00
net: Convert protocol error handlers from void to int
2018-11-08 17:13:08 -08:00
udp_tunnel: add config option to bind to a device
2018-12-03 14:15:26 -08:00
udplite: fix partial checksum initialization
2018-02-16 15:57:42 -05:00
vxlan: Add vxlan_fdb_clear_offload()
2018-12-07 12:59:08 -08:00
lift handling of SIOCIW... out of dev_ioctl()
2018-01-24 19:13:45 -05:00
xdp: export xdp_rxq_info_unreg_mem_model
2018-08-29 12:25:53 -07:00
ethtool: don't allow disabling queues with umem installed
2018-10-05 09:31:01 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-12-20 11:53:36 -08:00
339bbff2d6