From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752127AbdLCSOZ convert rfc822-to-8bit (ORCPT ); Sun, 3 Dec 2017 13:14:25 -0500 Received: from shards.monkeyblade.net ([184.105.139.130]:37834 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751208AbdLCSOW (ORCPT ); Sun, 3 Dec 2017 13:14:22 -0500 Date: Sun, 03 Dec 2017 13:14:21 -0500 (EST) Message-Id: <20171203.131421.560328703461607033.davem@davemloft.net> To: torvalds@linux-foundation.org CC: akpm@linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT] Networking From: David Miller X-Mailer: Mew version 6.7 on Emacs 25.2 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=iso-8859-1 Content-Transfer-Encoding: 8BIT X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Sun, 03 Dec 2017 10:14:22 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 1) Various TCP control block fixes, including one that crashes with SELINUX, from David Ahern and Eric Dumazet. 2) Fix ACK generation in rxrpc, from David Howells. 3) ipvlan doesn't set the mark properly in the ipv4 route lookup key, from Gao Feng. 4) SIT configuration doesn't take on the frag_off ipv4 field configuration properly, fix from Hangbin Liu. 5) TSO can fail after device down/up on stmmac, fix from Lars Persson. 6) Various bpftool fixes (mostly in JSON handling) from Quentin Monnet. 7) Various SKB leak fixes in vhost/tun/tap (mostly observed as performance problems). From Wei Xu. 8) mvpps's TX descriptors were not zero initialized, from Yan Markman. Please pull, thanks a lot! The following changes since commit b9151761021e25c024a6670df4e7c43ffbab0e1d: Merge tag 'nfsd-4.15-1' of git://linux-nfs.org/~bfields/linux (2017-11-29 14:49:26 -0800) 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 c2eb6d07a63cb01f0ef978b28927335198c544ce: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf (2017-12-03 13:08:30 -0500) ---------------------------------------------------------------- Colin Ian King (1): liquidio: fix incorrect indentation of assignment statement Cong Wang (1): act_sample: get rid of tcf_sample_cleanup_rcu() Corentin Labbe (1): net: stmmac: dwmac-sun8i: fix allwinner,leds-active-low handling Daniel Borkmann (1): Merge branch 'bpftool-misc-fixes' David Ahern (1): tcp: use IPCB instead of TCP_SKB_CB in inet_exact_dif_match() David Howells (4): rxrpc: Clean up whitespace rxrpc: Fix ACK generation from the connection event processor rxrpc: Use correct netns source in rxrpc_release_sock() rxrpc: Fix the MAINTAINERS record David S. Miller (9): Merge tag 'rxrpc-fixes-20171129' of git://git.kernel.org/.../dhowells/linux-fs Merge branch 'sctp-prsctp-chunk-fixes' Merge branch 'sfp-phylink-fixes' Merge branch 'bnxt_en-fixes' Merge branch 'vhost-skb-leaks' Merge branch 's390-qeth-fixes' Merge tag 'linux-can-fixes-for-4.15-20171201' of git://git.kernel.org/.../mkl/linux-can Merge branch 'tcp-cb-selinux-corruption' Merge git://git.kernel.org/.../bpf/bpf Eric Dumazet (3): tcp: remove buggy call to tcp_v6_restore_cb() tcp/dccp: block bh before arming time_wait timer tcp: add tcp_v4_fill_cb()/tcp_v4_restore_cb() Florian Fainelli (1): net: dsa: bcm_sf2: Set correct CHAIN_ID and slice number mask Gao Feng (1): ipvlan: Add the skb->mark as flow4's member to lookup route Geert Uytterhoeven (1): skbuff: Grammar s/are can/can/, s/change/changes/ Gustavo A. R. Silva (1): rxrpc: Fix variable overwrite Hangbin Liu (1): sit: update frag_off info Jakub Kicinski (1): bpf: offload: add a license header Jimmy Assarsson (3): can: kvaser_usb: free buf in error paths can: kvaser_usb: Fix comparison bug in kvaser_usb_read_bulk_callback() can: kvaser_usb: ratelimit errors if incomplete messages are received Julian Wiedmann (3): s390/qeth: fix thinko in IPv4 multicast address tracking s390/qeth: fix GSO throughput regression s390/qeth: build max size GSO skbs on L2 devices Lars Persson (1): stmmac: reset last TSO segment size after device open Marc Kleine-Budde (2): can: flexcan: Update IRQ Err Passive information can: flexcan: fix VF610 state transition issue Martin Kelly (2): can: mcba_usb: fix typo can: mcba_usb: fix device disconnect bug Max Uvarov (1): net: phy-micrel: check return code in flp center function Oliver Stäbler (1): can: ti_hecc: Fix napi poll return value for repoll Quentin Monnet (6): tools: bpftool: fix crash on bad parameters with JSON tools: bpftool: clean up the JSON writer before exiting in usage() tools: bpftool: make error message from getopt_long() JSON-friendly tools: bpftool: remove spurious line break from error message tools: bpftool: unify installation directories tools: bpftool: declare phony targets as such Ray Jui (1): bnxt_en: Need to unconditionally shut down RoCE in bnxt_shutdown Russell King (4): sfp: fix RX_LOS signal handling sfp: improve RX_LOS handling sfp: warn about modules requiring address change sequence phylink: ensure we take the link down when phylink_stop() is called Sathya Perla (1): bnxt_en: fix dst/src fid for vxlan encap/decap actions Stephane Grosjean (1): can: peak/pci: fix potential bug when probe() fails Sunil Challa (1): bnxt_en: wildcard smac while creating tunnel decap filter Tommi Rantala (1): tipc: call tipc_rcv() only if bearer is up in tipc_udp_recv() Vasundhara Volam (1): bnxt_en: Fix a variable scoping in bnxt_hwrm_do_send_msg() Wei Xu (3): vhost: fix skb leak in handle_rx() tun: free skb in early errors tap: free skb if flags error Xie XiuQi (1): trace/xdp: fix compile warning: 'struct bpf_map' declared inside parameter list Xin Long (3): sctp: only update outstanding_bytes for transmitted queue when doing prsctp_prune sctp: abandon the whole msg if one part of a fragmented message is abandoned sctp: do not abandon the other frags in unsent outq if one msg has outstanding frags Yan Markman (1): net: mvpp2: allocate zeroed tx descriptors Yonghong Song (3): tools/bpf: adjust rlimit RLIMIT_MEMLOCK for test_verifier_log bpf: set maximum number of attached progs to 64 for a single perf tp samples/bpf: add error checking for perf ioctl calls in bpf loader MAINTAINERS | 18 +++++++++++++++--- drivers/net/can/flexcan.c | 9 +++++---- drivers/net/can/peak_canfd/peak_pciefd_main.c | 5 ++++- drivers/net/can/sja1000/peak_pci.c | 5 ++++- drivers/net/can/ti_hecc.c | 3 +++ drivers/net/can/usb/kvaser_usb.c | 11 +++++++---- drivers/net/can/usb/mcba_usb.c | 3 ++- drivers/net/dsa/bcm_sf2_cfp.c | 4 ++-- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 +++-- drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 55 ++++++++++++++++++++++++++++--------------------------- drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- drivers/net/ethernet/marvell/mvpp2.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 3 +-- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + drivers/net/ipvlan/ipvlan_core.c | 1 + drivers/net/phy/micrel.c | 6 ++++-- drivers/net/phy/phylink.c | 1 + drivers/net/phy/sfp.c | 41 ++++++++++++++++++++++++++++++----------- drivers/net/tap.c | 14 ++++++++++---- drivers/net/tun.c | 24 ++++++++++++++++++------ drivers/s390/net/qeth_core.h | 3 +++ drivers/s390/net/qeth_core_main.c | 31 +++++++++++++++++++++++++++++++ drivers/s390/net/qeth_l2_main.c | 4 ++-- drivers/s390/net/qeth_l3_main.c | 7 +++++-- drivers/vhost/net.c | 20 ++++++++++---------- include/linux/skbuff.h | 3 +-- include/net/sctp/structs.h | 3 ++- include/net/tc_act/tc_sample.h | 1 - include/net/tcp.h | 3 +-- include/trace/events/xdp.h | 1 + kernel/bpf/core.c | 3 ++- kernel/bpf/offload.c | 15 +++++++++++++++ kernel/trace/bpf_trace.c | 8 ++++++++ net/dccp/minisocks.c | 6 ++++++ net/ipv4/tcp_ipv4.c | 59 ++++++++++++++++++++++++++++++++++++++++------------------- net/ipv4/tcp_minisocks.c | 6 ++++++ net/ipv6/sit.c | 1 + net/ipv6/tcp_ipv6.c | 11 ++++++----- net/rxrpc/af_rxrpc.c | 5 +++-- net/rxrpc/call_event.c | 4 ++-- net/rxrpc/conn_event.c | 50 +++++++++++++++++++++++++++++--------------------- net/rxrpc/conn_object.c | 2 +- net/rxrpc/input.c | 4 ++-- net/rxrpc/sendmsg.c | 2 +- net/sched/act_sample.c | 14 +++----------- net/sctp/chunk.c | 11 +++++++++++ net/sctp/outqueue.c | 19 +++++++++++++------ net/tipc/udp_media.c | 4 ---- samples/bpf/bpf_load.c | 14 ++++++++++++-- tools/bpf/bpftool/Documentation/Makefile | 2 +- tools/bpf/bpftool/Makefile | 7 ++++--- tools/bpf/bpftool/main.c | 36 ++++++++++++++++++++++++------------ tools/bpf/bpftool/main.h | 5 +++-- tools/testing/selftests/bpf/test_verifier_log.c | 7 +++++++ 54 files changed, 397 insertions(+), 187 deletions(-)