1) Fix PCI IDs of 9000 series iwlwifi devices, from Luca Coelho.
2) bpf offload bug fixes from Jakub Kicinski.
3) Fix bpf verifier to NOP out code which is dead at run time
because due to branch pruning the verifier will not explore
such instructions. From Alexei Starovoitov.
4) Fix crash when deleting secondary chains in packet scheduler
classifier. From Roman Kapl.
5) Fix buffer management bugs in smc, from Ursula Braun.
6) Fix regression in anycast route handling, from David Ahern.
7) Fix link settings regression in r8169, from Tobias Jakobi.
8) Add back enough UFO support so that live migration still
works, from Willem de Bruijn.
9) Linearize enough packet data for the full extent to which
the ipvlan code will inspect the packet headers, from
Gao Feng.
Please pull, thanks a lot!
The following changes since commit 0c86a6bd85ff0629cd2c5141027fc1c8bb6cde9c:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2017-11-21 05:56:12 -1000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
for you to fetch changes up to 9ed33805cdf81eadcc6ef54a81a8448e80e19f54:
Merge branch 'ipvlan-Fix-insufficient-skb-linear-check' (2017-11-24 03:37:03 +0900)
----------------------------------------------------------------
Alan Brady (2):
i40evf: fix client notify of l2 params
i40e: restore promiscuous after reset
Alexei Starovoitov (1):
bpf: fix branch pruning logic
Amritha Nambiar (1):
i40e: Remove limit of 64 max queues per channel
Brian King (7):
ixgbe: Fix skb list corruption on Power systems
i40e: Use smp_rmb rather than read_barrier_depends
ixgbevf: Use smp_rmb rather than read_barrier_depends
igbvf: Use smp_rmb rather than read_barrier_depends
igb: Use smp_rmb rather than read_barrier_depends
fm10k: Use smp_rmb rather than read_barrier_depends
i40evf: Use smp_rmb rather than read_barrier_depends
Daniel Borkmann (2):
Merge branch 'bpf-offload-fixes'
Merge branch 'bpf-fix-null-arg-semantics'
David Ahern (1):
net: ipv6: Fixup device for anycast routes during copy
David S. Miller (5):
Merge branch 'smc-fixes-for-smc-buffer-handling'
Merge git://git.kernel.org/.../bpf/bpf
Merge branch '40GbE' of git://git.kernel.org/.../jkirsher/net-queue
Merge tag 'wireless-drivers-for-davem-2017-11-22' of git://git.kernel.org/.../kvalo/wireless-drivers
Merge branch 'ipvlan-Fix-insufficient-skb-linear-check'
Filip Sadowski (1):
i40e: Fix FLR reset timeout issue
Florian Fainelli (1):
net: dsa: bcm_sf2: Clear IDDQ_GLOBAL_PWR bit for PHY
Gao Feng (2):
ipvlan: Fix insufficient skb linear check for arp
ipvlan: Fix insufficient skb linear check for ipv6 icmp
Geert Uytterhoeven (1):
net/smc: Fix preinitialization of buf_desc in __smc_buf_create()
Gianluca Borello (4):
bpf: introduce ARG_PTR_TO_MEM_OR_NULL
bpf: remove explicit handling of 0 for arg2 in bpf_probe_read
bpf: change bpf_probe_read_str arg2 type to ARG_CONST_SIZE_OR_ZERO
bpf: change bpf_perf_event_output arg5 type to ARG_CONST_SIZE_OR_ZERO
Hangbin Liu (1):
geneve: only configure or fill UDP_ZERO_CSUM6_RX/TX info when CONFIG_IPV6
Ido Schimmel (1):
ipv6: Do not consider linkdown nexthops during multipath
Jacob Keller (1):
i40e: Fix for NUP NVM image downgrade failure
Jakub Kicinski (10):
bpf: offload: add comment warning developers about double destroy
bpf: offload: limit offload to cls_bpf and xdp programs only
bpf: offload: rename the ifindex field
bpf: offload: move offload device validation out to the drivers
net: xdp: don't allow device-bound programs in driver mode
bpf: turn bpf_prog_get_type() into a wrapper
bpf: offload: ignore namespace moves
bpftool: revert printing program device bound info
bpf: revert report offload info to user space
bpf: make bpf_prog_offload_verifier_prep() static inline
Jesse Chan (1):
net: phy: cortina: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
Johan Hovold (1):
wcn36xx: fix iris child-node lookup
Kalle Valo (2):
Merge tag 'iwlwifi-for-kalle-2017-11-19' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes
Merge ath-current from git://git.kernel.org/.../kvalo/ath.git
Luca Coelho (2):
iwlwifi: mvm: support version 7 of the SCAN_REQ_UMAC FW command
iwlwifi: fix PCI IDs and configuration mapping for 9000 series
Roman Kapl (1):
net: sched: fix crash when deleting secondary chains
Thomas Backlund (1):
iwlwifi: fix firmware names for 9000 and A000 series hw
Tobias Jakobi (1):
net: realtek: r8169: implement set_link_ksettings()
Ursula Braun (1):
net/smc: use sk_rcvbuf as start for rmb creation
Vasanthakumar Thiagarajan (1):
ath10k: fix data rx for CCMP-256, GCMP and GCMP-256 in raw mode
Willem de Bruijn (1):
net: accept UFO datagrams from tuntap and packet
Yonghong Song (1):
bpf: change bpf_probe_write_user to bpf_trace_printk in test_verifier
Zijie Pan (1):
i40e: fix the calculation of VFs mac addresses
drivers/net/dsa/bcm_sf2.c | 2 +-
drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 +-
drivers/net/ethernet/intel/i40e/i40e.h | 1 -
drivers/net/ethernet/intel/i40e/i40e_adminq.c | 6 +++
drivers/net/ethernet/intel/i40e/i40e_common.c | 10 ++++-
drivers/net/ethernet/intel/i40e/i40e_main.c | 165 +++++++++++++++++++++++++++++++++++++++-------------------------------------
drivers/net/ethernet/intel/i40e/i40e_nvm.c | 8 ++--
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +-
drivers/net/ethernet/intel/i40e/i40e_type.h | 1 +
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 21 +++++-----
drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 2 +-
drivers/net/ethernet/intel/i40evf/i40evf_client.c | 38 ++++++++++++------
drivers/net/ethernet/intel/i40evf/i40evf_main.c | 10 ++---
drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
drivers/net/ethernet/intel/igbvf/netdev.c | 2 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +-
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
drivers/net/ethernet/netronome/nfp/bpf/offload.c | 10 ++++-
drivers/net/ethernet/realtek/r8169.c | 38 ++++++++++--------
drivers/net/geneve.c | 16 +++++++-
drivers/net/ipvlan/ipvlan_core.c | 36 ++++++++++++-----
drivers/net/phy/cortina.c | 4 ++
drivers/net/tap.c | 2 +-
drivers/net/tun.c | 2 +
drivers/net/wireless/ath/ath10k/htt_rx.c | 51 ++++++++++++++++++------
drivers/net/wireless/ath/wcn36xx/main.c | 2 +-
drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 73 ++++++++++++++++++++++++++++++----
drivers/net/wireless/intel/iwlwifi/cfg/a000.c | 10 ++---
drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 59 +++++++++++++++++++++------
drivers/net/wireless/intel/iwlwifi/fw/file.h | 1 +
drivers/net/wireless/intel/iwlwifi/iwl-config.h | 5 +++
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 6 +++
drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 86 ++++++++++++++++++++++++++++++----------
drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++--------------
include/linux/bpf.h | 19 +++++----
include/linux/bpf_verifier.h | 4 +-
include/linux/netdev_features.h | 4 +-
include/linux/netdevice.h | 1 +
include/linux/skbuff.h | 2 +
include/linux/virtio_net.h | 5 ++-
include/net/ipv6.h | 1 +
include/uapi/linux/bpf.h | 8 +---
kernel/bpf/offload.c | 27 ++++++-------
kernel/bpf/syscall.c | 40 ++++++-------------
kernel/bpf/verifier.c | 31 ++++++++++++++-
kernel/trace/bpf_trace.c | 12 ++----
net/core/dev.c | 17 +++++---
net/core/filter.c | 4 +-
net/ipv4/af_inet.c | 12 +++++-
net/ipv4/udp_offload.c | 49 +++++++++++++++++++++--
net/ipv6/output_core.c | 31 +++++++++++++++
net/ipv6/route.c | 7 +++-
net/ipv6/udp_offload.c | 85 +++++++++++++++++++++++++++++++++++++--
net/openvswitch/datapath.c | 14 +++++++
net/openvswitch/flow.c | 6 ++-
net/sched/act_csum.c | 6 +++
net/sched/cls_api.c | 7 ++--
net/sched/cls_bpf.c | 8 ++--
net/smc/smc_core.c | 4 +-
tools/bpf/bpftool/prog.c | 31 ---------------
tools/include/uapi/linux/bpf.h | 8 +---
tools/testing/selftests/bpf/test_verifier.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------
62 files changed, 995 insertions(+), 409 deletions(-)
1) Fix PCI IDs of 9000 series iwlwifi devices, from Luca Coelho. 2) bpf offload bug fixes from Jakub Kicinski. 3) Fix bpf verifier to NOP out code which is dead at run time because due to branch pruning the verifier will not explore such instructions. From Alexei Starovoitov. 4) Fix crash when deleting secondary chains in packet scheduler classifier. From Roman Kapl. 5) Fix buffer management bugs in smc, from Ursula Braun. 6) Fix regression in anycast route handling, from David Ahern. 7) Fix link settings regression in r8169, from Tobias Jakobi. 8) Add back enough UFO support so that live migration still works, from Willem de Bruijn. 9) Linearize enough packet data for the full extent to which the ipvlan code will inspect the packet headers, from Gao Feng. Please pull, thanks a lot! The following changes since commit 0c86a6bd85ff0629cd2c5141027fc1c8bb6cde9c: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2017-11-21 05:56:12 -1000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git for you to fetch changes up to 9ed33805cdf81eadcc6ef54a81a8448e80e19f54: Merge branch 'ipvlan-Fix-insufficient-skb-linear-check' (2017-11-24 03:37:03 +0900) ---------------------------------------------------------------- Alan Brady (2): i40evf: fix client notify of l2 params i40e: restore promiscuous after reset Alexei Starovoitov (1): bpf: fix branch pruning logic Amritha Nambiar (1): i40e: Remove limit of 64 max queues per channel Brian King (7): ixgbe: Fix skb list corruption on Power systems i40e: Use smp_rmb rather than read_barrier_depends ixgbevf: Use smp_rmb rather than read_barrier_depends igbvf: Use smp_rmb rather than read_barrier_depends igb: Use smp_rmb rather than read_barrier_depends fm10k: Use smp_rmb rather than read_barrier_depends i40evf: Use smp_rmb rather than read_barrier_depends Daniel Borkmann (2): Merge branch 'bpf-offload-fixes' Merge branch 'bpf-fix-null-arg-semantics' David Ahern (1): net: ipv6: Fixup device for anycast routes during copy David S. Miller (5): Merge branch 'smc-fixes-for-smc-buffer-handling' Merge git://git.kernel.org/.../bpf/bpf Merge branch '40GbE' of git://git.kernel.org/.../jkirsher/net-queue Merge tag 'wireless-drivers-for-davem-2017-11-22' of git://git.kernel.org/.../kvalo/wireless-drivers Merge branch 'ipvlan-Fix-insufficient-skb-linear-check' Filip Sadowski (1): i40e: Fix FLR reset timeout issue Florian Fainelli (1): net: dsa: bcm_sf2: Clear IDDQ_GLOBAL_PWR bit for PHY Gao Feng (2): ipvlan: Fix insufficient skb linear check for arp ipvlan: Fix insufficient skb linear check for ipv6 icmp Geert Uytterhoeven (1): net/smc: Fix preinitialization of buf_desc in __smc_buf_create() Gianluca Borello (4): bpf: introduce ARG_PTR_TO_MEM_OR_NULL bpf: remove explicit handling of 0 for arg2 in bpf_probe_read bpf: change bpf_probe_read_str arg2 type to ARG_CONST_SIZE_OR_ZERO bpf: change bpf_perf_event_output arg5 type to ARG_CONST_SIZE_OR_ZERO Hangbin Liu (1): geneve: only configure or fill UDP_ZERO_CSUM6_RX/TX info when CONFIG_IPV6 Ido Schimmel (1): ipv6: Do not consider linkdown nexthops during multipath Jacob Keller (1): i40e: Fix for NUP NVM image downgrade failure Jakub Kicinski (10): bpf: offload: add comment warning developers about double destroy bpf: offload: limit offload to cls_bpf and xdp programs only bpf: offload: rename the ifindex field bpf: offload: move offload device validation out to the drivers net: xdp: don't allow device-bound programs in driver mode bpf: turn bpf_prog_get_type() into a wrapper bpf: offload: ignore namespace moves bpftool: revert printing program device bound info bpf: revert report offload info to user space bpf: make bpf_prog_offload_verifier_prep() static inline Jesse Chan (1): net: phy: cortina: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE Johan Hovold (1): wcn36xx: fix iris child-node lookup Kalle Valo (2): Merge tag 'iwlwifi-for-kalle-2017-11-19' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes Merge ath-current from git://git.kernel.org/.../kvalo/ath.git Luca Coelho (2): iwlwifi: mvm: support version 7 of the SCAN_REQ_UMAC FW command iwlwifi: fix PCI IDs and configuration mapping for 9000 series Roman Kapl (1): net: sched: fix crash when deleting secondary chains Thomas Backlund (1): iwlwifi: fix firmware names for 9000 and A000 series hw Tobias Jakobi (1): net: realtek: r8169: implement set_link_ksettings() Ursula Braun (1): net/smc: use sk_rcvbuf as start for rmb creation Vasanthakumar Thiagarajan (1): ath10k: fix data rx for CCMP-256, GCMP and GCMP-256 in raw mode Willem de Bruijn (1): net: accept UFO datagrams from tuntap and packet Yonghong Song (1): bpf: change bpf_probe_write_user to bpf_trace_printk in test_verifier Zijie Pan (1): i40e: fix the calculation of VFs mac addresses drivers/net/dsa/bcm_sf2.c | 2 +- drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 +- drivers/net/ethernet/intel/i40e/i40e.h | 1 - drivers/net/ethernet/intel/i40e/i40e_adminq.c | 6 +++ drivers/net/ethernet/intel/i40e/i40e_common.c | 10 ++++- drivers/net/ethernet/intel/i40e/i40e_main.c | 165 +++++++++++++++++++++++++++++++++++++++------------------------------------- drivers/net/ethernet/intel/i40e/i40e_nvm.c | 8 ++-- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 21 +++++----- drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 2 +- drivers/net/ethernet/intel/i40evf/i40evf_client.c | 38 ++++++++++++------ drivers/net/ethernet/intel/i40evf/i40evf_main.c | 10 ++--- drivers/net/ethernet/intel/igb/igb_main.c | 2 +- drivers/net/ethernet/intel/igbvf/netdev.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +- drivers/net/ethernet/netronome/nfp/bpf/offload.c | 10 ++++- drivers/net/ethernet/realtek/r8169.c | 38 ++++++++++-------- drivers/net/geneve.c | 16 +++++++- drivers/net/ipvlan/ipvlan_core.c | 36 ++++++++++++----- drivers/net/phy/cortina.c | 4 ++ drivers/net/tap.c | 2 +- drivers/net/tun.c | 2 + drivers/net/wireless/ath/ath10k/htt_rx.c | 51 ++++++++++++++++++------ drivers/net/wireless/ath/wcn36xx/main.c | 2 +- drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 73 ++++++++++++++++++++++++++++++---- drivers/net/wireless/intel/iwlwifi/cfg/a000.c | 10 ++--- drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 59 +++++++++++++++++++++------ drivers/net/wireless/intel/iwlwifi/fw/file.h | 1 + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 5 +++ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 6 +++ drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 86 ++++++++++++++++++++++++++++++---------- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++-------------- include/linux/bpf.h | 19 +++++---- include/linux/bpf_verifier.h | 4 +- include/linux/netdev_features.h | 4 +- include/linux/netdevice.h | 1 + include/linux/skbuff.h | 2 + include/linux/virtio_net.h | 5 ++- include/net/ipv6.h | 1 + include/uapi/linux/bpf.h | 8 +--- kernel/bpf/offload.c | 27 ++++++------- kernel/bpf/syscall.c | 40 ++++++------------- kernel/bpf/verifier.c | 31 ++++++++++++++- kernel/trace/bpf_trace.c | 12 ++---- net/core/dev.c | 17 +++++--- net/core/filter.c | 4 +- net/ipv4/af_inet.c | 12 +++++- net/ipv4/udp_offload.c | 49 +++++++++++++++++++++-- net/ipv6/output_core.c | 31 +++++++++++++++ net/ipv6/route.c | 7 +++- net/ipv6/udp_offload.c | 85 +++++++++++++++++++++++++++++++++++++-- net/openvswitch/datapath.c | 14 +++++++ net/openvswitch/flow.c | 6 ++- net/sched/act_csum.c | 6 +++ net/sched/cls_api.c | 7 ++-- net/sched/cls_bpf.c | 8 ++-- net/smc/smc_core.c | 4 +- tools/bpf/bpftool/prog.c | 31 --------------- tools/include/uapi/linux/bpf.h | 8 +--- tools/testing/selftests/bpf/test_verifier.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------- 62 files changed, 995 insertions(+), 409 deletions(-)