1. 01 12月, 2018 11 次提交
  2. 30 11月, 2018 12 次提交
  3. 29 11月, 2018 17 次提交
    • D
      Merge tag 'linux-can-next-for-4.21-20181128' of... · bd82233f
      David S. Miller 提交于
      Merge tag 'linux-can-next-for-4.21-20181128' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
      
      Marc Kleine-Budde says:
      
      ====================
      This is a pull request for net-next/master consisting of 18 patches.
      
      The first patch is by Colin Ian King and fixes the spelling in the ucan
      driver.
      
      The next three patches target the xilinx driver. YueHaibing's patch
      fixes the return type of ndo_start_xmit function. Two patches by
      Shubhrajyoti Datta add support for the CAN FD 2.0 controllers.
      
      Flavio Suligoi's patch for the sja1000 driver add support for the ASEM
      CAN raw hardware.
      
      Wolfram Sang's and Kuninori Morimoto's patches switch the rcar driver to
      use SPDX license identifiers.
      
      The remaining 111 patches improve the flexcan driver. Pankaj Bansal's
      patch enables the driver in Kconfig on all architectures with IOMEM
      support. The next four patches by me fix indention, add missing
      parentheses and comments. Aisheng Dong's patches add self wake support
      and document it in the DT bindings. The remaining patches by Pankaj
      Bansal first fix the loopback support and prepare the driver for the
      CAN-FD support needed for the LX2160A SoC. The actual CAN-FD support
      will be added in a later patch series.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bd82233f
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · e561bb29
      David S. Miller 提交于
      Trivial conflict in net/core/filter.c, a locally computed
      'sdif' is now an argument to the function.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e561bb29
    • D
      bpf: Fix various lib and testsuite build failures on 32-bit. · 1ad93ab1
      David Miller 提交于
      Cannot cast a u64 to a pointer on 32-bit without an intervening (long)
      cast otherwise GCC warns.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      Acked-by: NSong Liu <songliubraving@fb.com>
      Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
      1ad93ab1
    • N
      selftests/bpf: add config fragment CONFIG_FTRACE_SYSCALLS · 295daee4
      Naresh Kamboju 提交于
      CONFIG_FTRACE_SYSCALLS=y is required for get_cgroup_id_user test case
      this test reads a file from debug trace path
      /sys/kernel/debug/tracing/events/syscalls/sys_enter_nanosleep/id
      Signed-off-by: NNaresh Kamboju <naresh.kamboju@linaro.org>
      Acked-by: NYonghong Song <yhs@fb.com>
      Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
      295daee4
    • D
      Merge branch 'bpf-sk-msg-pop-data' · 36dbe571
      Daniel Borkmann 提交于
      John Fastabend says:
      
      ====================
      After being able to add metadata to messages with sk_msg_push_data we
      have also found it useful to be able to "pop" this metadata off before
      sending it to applications in some cases. This series adds a new helper
      sk_msg_pop_data() and the associated patches to add tests and tools/lib
      support.
      
      Thanks!
      
      v2: Daniel caught that we missed adding sk_msg_pop_data to the changes
          data helper so that the verifier ensures BPF programs revalidate
          data after using this helper. Also improve documentation adding a
          return description and using RST syntax per Quentin's comment. And
          delta calculations for DROP with pop'd data (albeit a strange set
          of operations for a program to be doing) had potential to be
          incorrect possibly confusing user space applications, so fix it.
      ====================
      Acked-by: NAlexei Starovoitov <ast@kernel.org>
      Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
      36dbe571
    • J
      bpf: test_sockmap, add options for msg_pop_data() helper · 1ade9aba
      John Fastabend 提交于
      Similar to msg_pull_data and msg_push_data add a set of options to
      have msg_pop_data() exercised.
      Signed-off-by: NJohn Fastabend <john.fastabend@gmail.com>
      Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
      1ade9aba
    • J
      bpf: add msg_pop_data helper to tools · d913a227
      John Fastabend 提交于
      Add the necessary header definitions to tools for new
      msg_pop_data_helper.
      Signed-off-by: NJohn Fastabend <john.fastabend@gmail.com>
      Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
      d913a227
    • J
      bpf: helper to pop data from messages · 7246d8ed
      John Fastabend 提交于
      This adds a BPF SK_MSG program helper so that we can pop data from a
      msg. We use this to pop metadata from a previous push data call.
      Signed-off-by: NJohn Fastabend <john.fastabend@gmail.com>
      Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
      7246d8ed
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 60b54823
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) ARM64 JIT fixes for subprog handling from Daniel Borkmann.
      
       2) Various sparc64 JIT bug fixes (fused branch convergance, frame
          pointer usage detection logic, PSEODU call argument handling).
      
       3) Fix to use BH locking in nf_conncount, from Taehee Yoo.
      
       4) Fix race of TX skb freeing in ipheth driver, from Bernd Eckstein.
      
       5) Handle return value of TX NAPI completion properly in lan743x
          driver, from Bryan Whitehead.
      
       6) MAC filter deletion in i40e driver clears wrong state bit, from
          Lihong Yang.
      
       7) Fix use after free in rionet driver, from Pan Bian.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (53 commits)
        s390/qeth: fix length check in SNMP processing
        net: hisilicon: remove unexpected free_netdev
        rapidio/rionet: do not free skb before reading its length
        i40e: fix kerneldoc for xsk methods
        ixgbe: recognize 1000BaseLX SFP modules as 1Gbps
        i40e: Fix deletion of MAC filters
        igb: fix uninitialized variables
        netfilter: nf_tables: deactivate expressions in rule replecement routine
        lan743x: Enable driver to work with LAN7431
        tipc: fix lockdep warning during node delete
        lan743x: fix return value for lan743x_tx_napi_poll
        net: via: via-velocity: fix spelling mistake "alignement" -> "alignment"
        qed: fix spelling mistake "attnetion" -> "attention"
        net: thunderx: fix NULL pointer dereference in nic_remove
        sctp: increase sk_wmem_alloc when head->truesize is increased
        firestream: fix spelling mistake: "Inititing" -> "Initializing"
        net: phy: add workaround for issue where PHY driver doesn't bind to the device
        usbnet: ipheth: fix potential recvmsg bug and recvmsg bug 2
        sparc: Adjust bpf JIT prologue for PSEUDO calls.
        bpf, doc: add entries of who looks over which jits
        ...
      60b54823
    • L
      Merge tag 'xtensa-20181128' of git://github.com/jcmvbkbc/linux-xtensa · b26b2b24
      Linus Torvalds 提交于
      Pull Xtensa fixes from Max Filippov:
      
       - fix kernel exception on userspace access to a currently disabled
         coprocessor
      
       - fix coprocessor data saving/restoring in configurations with multiple
         coprocessors
      
       - fix ptrace access to coprocessor data on configurations with multiple
         coprocessors with high alignment requirements
      
      * tag 'xtensa-20181128' of git://github.com/jcmvbkbc/linux-xtensa:
        xtensa: fix coprocessor part of ptrace_{get,set}xregs
        xtensa: fix coprocessor context offset definitions
        xtensa: enable coprocessors that are being flushed
      b26b2b24
    • D
      Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue · d78a5ebd
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Fixes 2018-11-28
      
      This series contains fixes to igb, ixgbe and i40e.
      
      Yunjian Wang from Huawei resolves a variable that could potentially be
      NULL before it is used.
      
      Lihong fixes an i40e issue which goes back to 4.17 kernels, where
      deleting any of the MAC filters was causing the incorrect syncing for
      the PF.
      
      Josh Elsasser caught that there were missing enum values in the link
      capabilities for x550 devices, which was preventing link for 1000BaseLX
      SFP modules.
      
      Jan fixes the function header comments for XSK methods.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d78a5ebd
    • J
      s390/qeth: fix length check in SNMP processing · 9a764c1e
      Julian Wiedmann 提交于
      The response for a SNMP request can consist of multiple parts, which
      the cmd callback stages into a kernel buffer until all parts have been
      received. If the callback detects that the staging buffer provides
      insufficient space, it bails out with error.
      This processing is buggy for the first part of the response - while it
      initially checks for a length of 'data_len', it later copies an
      additional amount of 'offsetof(struct qeth_snmp_cmd, data)' bytes.
      
      Fix the calculation of 'data_len' for the first part of the response.
      This also nicely cleans up the memcpy code.
      
      Fixes: 1da177e4 ("Linux-2.6.12-rc2")
      Signed-off-by: NJulian Wiedmann <jwi@linux.ibm.com>
      Reviewed-by: NUrsula Braun <ubraun@linux.ibm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9a764c1e
    • Y
      net: qualcomm: rmnet: remove set but not used variables 'ip_family, fc_seq, qos_id' · 62e3a931
      YueHaibing 提交于
      Fixes gcc '-Wunused-but-set-variable' warning:
      
      drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c:26:6:
       warning: variable 'ip_family' set but not used [-Wunused-but-set-variable]
      drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c:27:6:
       warning: variable 'fc_seq' set but not used [-Wunused-but-set-variable]
      drivers/net/ethernet/qualcomm/rmnet/rmnet_map_command.c:28:6:
       warning: variable 'qos_id' set but not used [-Wunused-but-set-variable]
      
      It never used since introduction in commit
      ceed73a2 ("drivers: net: ethernet: qualcomm: rmnet: Initial implementation")
      Signed-off-by: NYueHaibing <yuehaibing@huawei.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      62e3a931
    • Y
      qlcnic: remove set but not used variables 'cur_rings, max_hw_rings, tx_desc_info' · 8eb08cf8
      YueHaibing 提交于
      Fixes gcc '-Wunused-but-set-variable' warning:
      
      drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c:4011:5:
       warning: variable 'max_hw_rings' set but not used [-Wunused-but-set-variable]
      drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c:4013:6:
       warning: variable 'cur_rings' set but not used [-Wunused-but-set-variable]
      drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c:2996:25:
       warning: variable 'tx_desc_info' set but not used [-Wunused-but-set-variable]
      
      'cur_rings, max_hw_rings' never used since introduction in commit
      34e8c406 ("qlcnic: refactor Tx/SDS ring calculation and validation in driver.")
      'tx_desc_info' never used since commit
      95b3890a ("qlcnic: Enhance Tx timeout debugging.")
      Also 'queue_type' only can be QLCNIC_RX_QUEUE/QLCNIC_TX_QUEUE,
      so make a trival cleanup on if statement.
      Signed-off-by: NYueHaibing <yuehaibing@huawei.com>
      Acked-by: NShahed Shaikh <shahed.shaikh@cavium.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8eb08cf8
    • Y
      net: neterion: vxge: remove set but not used variables 'max_frags' and 'txdl_priv' · 9cc549e4
      YueHaibing 提交于
      Fixes gcc '-Wunused-but-set-variable' warning:
      
      drivers/net/ethernet/neterion/vxge/vxge-traffic.c:1698:35:
       warning: variable 'txdl_priv' set but not used [-Wunused-but-set-variable]
      drivers/net/ethernet/neterion/vxge/vxge-traffic.c:1699:6:
       warning: variable 'max_frags' set but not used [-Wunused-but-set-variable]
      
      It never used since introduction in
      commit 11324132 ("Neterion: New driver: Traffic & alarm handler")
      Signed-off-by: NYueHaibing <yuehaibing@huawei.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9cc549e4
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf · e9d8faf9
      David S. Miller 提交于
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter fixes for net
      
      The following patchset contains Netfilter fixes for net:
      
      1) Disable BH while holding list spinlock in nf_conncount, from
         Taehee Yoo.
      
      2) List corruption in nf_conncount, also from Taehee.
      
      3) Fix race that results in leaving around an empty list node in
         nf_conncount, from Taehee Yoo.
      
      4) Proper chain handling for inactive chains from the commit path,
         from Florian Westphal. This includes a selftest for this.
      
      5) Do duplicate rule handles when replacing rules, also from Florian.
      
      6) Remove net_exit path in xt_RATEEST that results in splat, from Taehee.
      
      7) Possible use-after-free in nft_compat when releasing extensions.
         From Florian.
      
      8) Memory leak in xt_hashlimit, from Taehee.
      
      9) Call ip_vs_dst_notifier after ipv6_dev_notf, from Xin Long.
      
      10) Fix cttimeout with udplite and gre, from Florian.
      
      11) Preserve oif for IPv6 link-local generated traffic from mangle
          table, from Alin Nastac.
      
      12) Missing error handling in masquerade notifiers, from Taehee Yoo.
      
      13) Use mutex to protect registration/unregistration of masquerade
          extensions in order to prevent a race, from Taehee.
      
      14) Incorrect condition check in tree_nodes_free(), also from Taehee.
      
      15) Fix chain counter leak in rule replacement path, from Taehee.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e9d8faf9
    • D
      Merge branch 'dpaa2-eth-Introduce-XDP-support' · 58275410
      David S. Miller 提交于
      Ioana Ciocoi Radulescu says:
      
      ====================
      dpaa2-eth: Introduce XDP support
      
      Add support for XDP programs. Only XDP_PASS, XDP_DROP and XDP_TX
      actions are supported for now. Frame header changes are also
      allowed.
      
      v2: - count the XDP packets in the rx/tx inteface stats
          - add message with the maximum supported MTU value for XDP
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      58275410