1. 06 12月, 2017 27 次提交
  2. 05 12月, 2017 13 次提交
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 7cda4cee
      David S. Miller 提交于
      Small overlapping change conflict ('net' changed a line,
      'net-next' added a line right afterwards) in flexcan.c
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7cda4cee
    • L
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 2391f0b4
      Linus Torvalds 提交于
      Pull virtio fixes from Michael Tsirkin:
       "virtio and qemu bugfixes
      
        A couple of bugfixes that just became ready"
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        virtio_balloon: fix increment of vb->num_pfns in fill_balloon()
        virtio: release virtio index when fail to device_register
        fw_cfg: fix driver remove
      2391f0b4
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 236fa078
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       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.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (57 commits)
        tcp: use IPCB instead of TCP_SKB_CB in inet_exact_dif_match()
        tcp: add tcp_v4_fill_cb()/tcp_v4_restore_cb()
        rxrpc: Fix the MAINTAINERS record
        rxrpc: Use correct netns source in rxrpc_release_sock()
        liquidio: fix incorrect indentation of assignment statement
        stmmac: reset last TSO segment size after device open
        ipvlan: Add the skb->mark as flow4's member to lookup route
        s390/qeth: build max size GSO skbs on L2 devices
        s390/qeth: fix GSO throughput regression
        s390/qeth: fix thinko in IPv4 multicast address tracking
        tap: free skb if flags error
        tun: free skb in early errors
        vhost: fix skb leak in handle_rx()
        bnxt_en: Fix a variable scoping in bnxt_hwrm_do_send_msg()
        bnxt_en: fix dst/src fid for vxlan encap/decap actions
        bnxt_en: wildcard smac while creating tunnel decap filter
        bnxt_en: Need to unconditionally shut down RoCE in bnxt_shutdown
        phylink: ensure we take the link down when phylink_stop() is called
        sfp: warn about modules requiring address change sequence
        sfp: improve RX_LOS handling
        ...
      236fa078
    • C
      arch/tile: mark as orphaned · 8ee5ad1d
      Chris Metcalf 提交于
      The chip family of TILEPro and TILE-Gx was developed by Tilera, which
      was eventually acquired by Mellanox.  The tile architecture was added to
      the kernel in 2010 and first appeared in 2.6.36.
      
      Now at Mellanox we are developing new chips based on the ARM64
      architecture; our last TILE-Gx chip (the Gx72) was released in 2013, and
      our customers using tile architecture products are not, as far as we
      know, looking to upgrade to newer kernel releases.  In the absence of
      someone in the community stepping up to take over maintainership, this
      commit marks the architecture as orphaned.
      
      Cc: Chris Metcalf <metcalf@alum.mit.edu>
      Signed-off-by: NChris Metcalf <cmetcalf@mellanox.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8ee5ad1d
    • F
      rtnetlink: ipv6: convert remaining users to rtnl_register_module · a3fde2ad
      Florian Westphal 提交于
      convert remaining users of rtnl_register to rtnl_register_module
      and un-export rtnl_register.
      Requested-by: NDavid S. Miller <davem@davemloft.net>
      Signed-off-by: NFlorian Westphal <fw@strlen.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a3fde2ad
    • D
      Merge tag 'linux-can-next-for-4.16-20171201' of... · 112d59c7
      David S. Miller 提交于
      Merge tag 'linux-can-next-for-4.16-20171201' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
      
      Marc Kleine-Budde says:
      
      ====================
      pull-request: can-next 2017-12-01
      
      this is a pull request of 10 patches for net-next/master.
      
      The first two patches are by Arnd Bergmann, they convert the peak_usb
      from using "struct timeval" to "ktime_t". The error handling in the
      vxcan driver is clean up by Markus Elfring's patch. Bhumika Goyal
      contributes a patch for the c_can_pci driver to make the pci data const.
      The six patches by Pankaj Bansal for the flexcan driver add LS1021A
      support by making the endianness of the driver configurable by the
      device tree.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      112d59c7
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next · d671965b
      David S. Miller 提交于
      Daniel Borkmann says:
      
      ====================
      pull-request: bpf-next 2017-12-03
      
      The following pull-request contains BPF updates for your *net-next* tree.
      
      The main changes are:
      
      1) Addition of a software model for BPF offloads in order to ease
         testing code changes in that area and make semantics more clear.
         This is implemented in a new driver called netdevsim, which can
         later also be extended for other offloads. SR-IOV support is added
         as well to netdevsim. BPF kernel selftests for offloading are
         added so we can track basic functionality as well as exercising
         all corner cases around BPF offloading, from Jakub.
      
      2) Today drivers have to drop the reference on BPF progs they hold
         due to XDP on device teardown themselves. Change this in order
         to make XDP handling inside the drivers less error prone, and
         move disabling XDP to the core instead, also from Jakub.
      
      3) Misc set of BPF verifier improvements and cleanups as preparatory
         work for upcoming BPF-to-BPF calls. Among others, this set also
         improves liveness marking such that pruning can be slightly more
         effective. Register and stack liveness information is now included
         in the verifier log as well, from Alexei.
      
      4) nfp JIT improvements in order to identify load/store sequences in
         the BPF prog e.g. coming from memcpy lowering and optimizing them
         through the NPU's command push pull (CPP) instruction, from Jiong.
      
      5) Cleanups to test_cgrp2_attach2.c BPF sample code in oder to remove
         bpf_prog_attach() magic values and replacing them with actual proper
         attach flag instead, from David.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d671965b
    • D
      Merge branch 'rtnetlink-rework-handler-registration' · f4d4c49b
      David S. Miller 提交于
      Florian Westphal says:
      
      ====================
      rtnetlink: rework handler (un)registering
      
      Peter Zijlstra reported (referring to commit 019a3169,
      "rtnetlink: add reference counting to prevent module unload while dump is in progress"):
      
       1) it not in fact a refcount, so using refcount_t is silly
       2) there is a distinct lack of memory barriers, so we can easily
          observe the decrement while the msg_handler is still in progress.
       3) waiting with a schedule()/yield() loop is complete crap and subject
          life-locks, imagine doing that rtnl_unregister_all() from a RT task.
      
      In ancient times rtnetlink exposed a statically-sized table with
      preset doit/dumpit handlers to be called for a protocol/type pair.
      
      Later the rtnl_register interface was added and the table was allocated
      on demand.  Eventually these were also used by modules.
      
      Problem is that nothing prevents module unload while a netlink dump
      is in progress.  netlink dumps can be span multiple recv calls and
      netlink core saves the to-be-repeated dumper address for later invocation.
      
      To prevent rmmod the netlink core expects callers to pass in the owning
      module so a reference can be taken.
      
      So far rtnetlink wasn't doing this, add new interface to pass THIS_MODULE.
      Moreover, when converting parts of the rtnetlink handling to rcu this code
      gained way too many READ_ONCE spots, remove them and the extra refcounting.
      
      Take a module reference when running dumpit and doit callbacks
      and never alter content of rtnl_link structures after they have been
      published via rcu_assign_pointer.
      
      Based partially on earlier patch from Peter.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f4d4c49b
    • F
      rtnetlink: remove __rtnl_register · 16feebcf
      Florian Westphal 提交于
      This removes __rtnl_register and switches callers to either
      rtnl_register or rtnl_register_module.
      
      Also, rtnl_register() will now print an error if memory allocation
      failed rather than panic the kernel.
      Signed-off-by: NFlorian Westphal <fw@strlen.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      16feebcf
    • F
      net: use rtnl_register_module where needed · c1c502b5
      Florian Westphal 提交于
      all of these can be compiled as a module, so use new
      _module version to make sure module can no longer be removed
      while callback/dump is in use.
      Signed-off-by: NFlorian Westphal <fw@strlen.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c1c502b5
    • F
      rtnetlink: get reference on module before invoking handlers · e4202511
      Florian Westphal 提交于
      Add yet another rtnl_register function.  It will be used by modules
      that can be removed.
      
      The passed module struct is used to prevent module unload while
      a netlink dump is in progress or when a DOIT_UNLOCKED doit callback
      is called.
      
      Cc: Peter Zijlstra <peterz@infradead.org>
      Signed-off-by: NFlorian Westphal <fw@strlen.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e4202511
    • F
      net: rtnetlink: use rcu to free rtnl message handlers · addf9b90
      Florian Westphal 提交于
      rtnetlink is littered with READ_ONCE() because we can have read accesses
      while another cpu can write to the structure we're reading by
      (un)registering doit or dumpit handlers.
      
      This patch changes this so that (un)registering cpu allocates a new
      structure and then publishes it via rcu_assign_pointer, i.e. once
      another cpu can see such pointer no modifications will occur anymore.
      
      based on initial patch from Peter Zijlstra.
      
      Cc: Peter Zijlstra <peterz@infradead.org>
      Signed-off-by: NFlorian Westphal <fw@strlen.de>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      addf9b90
    • H
      net: phy: broadcom: re-add mistakenly removed config settings · 9753c21f
      Heiner Kallweit 提交于
      Previous patch mistakenly removed three chip-specific config settings.
      Add them again.
      
      Fixes: 80274aba "net: phy: remove generic settings for callbacks config_aneg and read_status from drivers"
      Signed-off-by: NHeiner Kallweit <hkallweit1@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9753c21f