1. 23 2月, 2017 15 次提交
    • M
      net/mlx5e: s390 system compilation fix · 18bcf742
      Mohamad Haj Yahia 提交于
      Add necessary headers include for s390 arch compilation.
      
      Fixes: e586b3b0 ("net/mlx5: Ethernet Datapath files")
      Fixes: d605d668 ("net/mlx5e: Add support for ethtool self..")
      Signed-off-by: NMohamad Haj Yahia <mohamad@mellanox.com>
      Signed-off-by: NSaeed Mahameed <saeedm@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      18bcf742
    • A
      tcp: account for ts offset only if tsecr not zero · eee2faab
      Alexey Kodanev 提交于
      We can get SYN with zero tsecr, don't apply offset in this case.
      
      Fixes: ee684b6f ("tcp: send packets with a socket timestamp")
      Signed-off-by: NAlexey Kodanev <alexey.kodanev@oracle.com>
      Acked-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      eee2faab
    • A
      tcp: setup timestamp offset when write_seq already set · 00355fa5
      Alexey Kodanev 提交于
      Found that when randomized tcp offsets are enabled (by default)
      TCP client can still start new connections without them. Later,
      if server does active close and re-uses sockets in TIME-WAIT
      state, new SYN from client can be rejected on PAWS check inside
      tcp_timewait_state_process(), because either tw_ts_recent or
      rcv_tsval doesn't really have an offset set.
      
      Here is how to reproduce it with LTP netstress tool:
          netstress -R 1 &
          netstress -H 127.0.0.1 -lr 1000000 -a1
      
          [...]
          < S  seq 1956977072 win 43690 TS val 295618 ecr 459956970
          > .  ack 1956911535 win 342 TS val 459967184 ecr 1547117608
          < R  seq 1956911535 win 0 length 0
      +1. < S  seq 1956977072 win 43690 TS val 296640 ecr 459956970
          > S. seq 657450664 ack 1956977073 win 43690 TS val 459968205 ecr 296640
      
      Fixes: 95a22cae ("tcp: randomize tcp timestamp offsets for each connection")
      Signed-off-by: NAlexey Kodanev <alexey.kodanev@oracle.com>
      Acked-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      00355fa5
    • A
      net/dccp: fix use after free in tw_timer_handler() · ec7cb62d
      Andrey Ryabinin 提交于
      DCCP doesn't purge timewait sockets on network namespace shutdown.
      So, after net namespace destroyed we could still have an active timer
      which will trigger use after free in tw_timer_handler():
      
          BUG: KASAN: use-after-free in tw_timer_handler+0x4a/0xa0 at addr ffff88010e0d1e10
          Read of size 8 by task swapper/1/0
          Call Trace:
           __asan_load8+0x54/0x90
           tw_timer_handler+0x4a/0xa0
           call_timer_fn+0x127/0x480
           expire_timers+0x1db/0x2e0
           run_timer_softirq+0x12f/0x2a0
           __do_softirq+0x105/0x5b4
           irq_exit+0xdd/0xf0
           smp_apic_timer_interrupt+0x57/0x70
           apic_timer_interrupt+0x90/0xa0
      
          Object at ffff88010e0d1bc0, in cache net_namespace size: 6848
          Allocated:
           save_stack_trace+0x1b/0x20
           kasan_kmalloc+0xee/0x180
           kasan_slab_alloc+0x12/0x20
           kmem_cache_alloc+0x134/0x310
           copy_net_ns+0x8d/0x280
           create_new_namespaces+0x23f/0x340
           unshare_nsproxy_namespaces+0x75/0xf0
           SyS_unshare+0x299/0x4f0
           entry_SYSCALL_64_fastpath+0x18/0xad
          Freed:
           save_stack_trace+0x1b/0x20
           kasan_slab_free+0xae/0x180
           kmem_cache_free+0xb4/0x350
           net_drop_ns+0x3f/0x50
           cleanup_net+0x3df/0x450
           process_one_work+0x419/0xbb0
           worker_thread+0x92/0x850
           kthread+0x192/0x1e0
           ret_from_fork+0x2e/0x40
      
      Add .exit_batch hook to dccp_v4_ops()/dccp_v6_ops() which will purge
      timewait sockets on net namespace destruction and prevent above issue.
      
      Fixes: f2bf415c ("mib: add net to NET_ADD_STATS_BH")
      Reported-by: NDmitry Vyukov <dvyukov@google.com>
      Signed-off-by: NAndrey Ryabinin <aryabinin@virtuozzo.com>
      Acked-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ec7cb62d
    • D
      uapi: fix linux/if.h userspace compilation errors · 2618be7d
      Dmitry V. Levin 提交于
      Include <sys/socket.h> (guarded by ifndef __KERNEL__) to fix
      the following linux/if.h userspace compilation errors:
      
      /usr/include/linux/if.h:234:19: error: field 'ifru_addr' has incomplete type
         struct sockaddr ifru_addr;
      /usr/include/linux/if.h:235:19: error: field 'ifru_dstaddr' has incomplete type
         struct sockaddr ifru_dstaddr;
      /usr/include/linux/if.h:236:19: error: field 'ifru_broadaddr' has incomplete type
         struct sockaddr ifru_broadaddr;
      /usr/include/linux/if.h:237:19: error: field 'ifru_netmask' has incomplete type
         struct sockaddr ifru_netmask;
      /usr/include/linux/if.h:238:20: error: field 'ifru_hwaddr' has incomplete type
         struct  sockaddr ifru_hwaddr;
      
      This also fixes userspace compilation of the following uapi headers:
        linux/atmbr2684.h
        linux/gsmmux.h
        linux/if_arp.h
        linux/if_bonding.h
        linux/if_frad.h
        linux/if_pppox.h
        linux/if_tunnel.h
        linux/netdevice.h
        linux/route.h
        linux/wireless.h
      
      As no uapi header provides a definition of struct sockaddr, inclusion
      of <sys/socket.h> seems to be the most conservative and the only safe
      fix available.
      
      All current users of <linux/if.h> are very likely to be including
      <sys/socket.h> already because the latter is the sole provider
      of struct sockaddr definition in libc, so adding a uapi header
      with a definition of struct sockaddr would create a potential
      conflict with <sys/socket.h>.
      
      Replacing struct sockaddr in the definition of struct ifreq with
      a different type would create a potential incompatibility with current
      users of struct ifreq who might rely on ifru_addr et al members being
      of type struct sockaddr.
      Signed-off-by: NDmitry V. Levin <ldv@altlinux.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2618be7d
    • R
      l2tp: Avoid schedule while atomic in exit_net · 12d656af
      Ridge Kennedy 提交于
      While destroying a network namespace that contains a L2TP tunnel a
      "BUG: scheduling while atomic" can be observed.
      
      Enabling lockdep shows that this is happening because l2tp_exit_net()
      is calling l2tp_tunnel_closeall() (via l2tp_tunnel_delete()) from
      within an RCU critical section.
      
      l2tp_exit_net() takes rcu_read_lock_bh()
        << list_for_each_entry_rcu() >>
        l2tp_tunnel_delete()
          l2tp_tunnel_closeall()
            __l2tp_session_unhash()
              synchronize_rcu() << Illegal inside RCU critical section >>
      
      BUG: sleeping function called from invalid context
      in_atomic(): 1, irqs_disabled(): 0, pid: 86, name: kworker/u16:2
      INFO: lockdep is turned off.
      CPU: 2 PID: 86 Comm: kworker/u16:2 Tainted: G        W  O    4.4.6-at1 #2
      Hardware name: Xen HVM domU, BIOS 4.6.1-xs125300 05/09/2016
      Workqueue: netns cleanup_net
       0000000000000000 ffff880202417b90 ffffffff812b0013 ffff880202410ac0
       ffffffff81870de8 ffff880202417bb8 ffffffff8107aee8 ffffffff81870de8
       0000000000000c51 0000000000000000 ffff880202417be0 ffffffff8107b024
      Call Trace:
       [<ffffffff812b0013>] dump_stack+0x85/0xc2
       [<ffffffff8107aee8>] ___might_sleep+0x148/0x240
       [<ffffffff8107b024>] __might_sleep+0x44/0x80
       [<ffffffff810b21bd>] synchronize_sched+0x2d/0xe0
       [<ffffffff8109be6d>] ? trace_hardirqs_on+0xd/0x10
       [<ffffffff8105c7bb>] ? __local_bh_enable_ip+0x6b/0xc0
       [<ffffffff816a1b00>] ? _raw_spin_unlock_bh+0x30/0x40
       [<ffffffff81667482>] __l2tp_session_unhash+0x172/0x220
       [<ffffffff81667397>] ? __l2tp_session_unhash+0x87/0x220
       [<ffffffff8166888b>] l2tp_tunnel_closeall+0x9b/0x140
       [<ffffffff81668c74>] l2tp_tunnel_delete+0x14/0x60
       [<ffffffff81668dd0>] l2tp_exit_net+0x110/0x270
       [<ffffffff81668d5c>] ? l2tp_exit_net+0x9c/0x270
       [<ffffffff815001c3>] ops_exit_list.isra.6+0x33/0x60
       [<ffffffff81501166>] cleanup_net+0x1b6/0x280
       ...
      
      This bug can easily be reproduced with a few steps:
      
       $ sudo unshare -n bash  # Create a shell in a new namespace
       # ip link set lo up
       # ip addr add 127.0.0.1 dev lo
       # ip l2tp add tunnel remote 127.0.0.1 local 127.0.0.1 tunnel_id 1 \
          peer_tunnel_id 1 udp_sport 50000 udp_dport 50000
       # ip l2tp add session name foo tunnel_id 1 session_id 1 \
          peer_session_id 1
       # ip link set foo up
       # exit  # Exit the shell, in turn exiting the namespace
       $ dmesg
       ...
       [942121.089216] BUG: scheduling while atomic: kworker/u16:3/13872/0x00000200
       ...
      
      To fix this, move the call to l2tp_tunnel_closeall() out of the RCU
      critical section, and instead call it from l2tp_tunnel_del_work(), which
      is running from the l2tp_wq workqueue.
      
      Fixes: 2b551c6e ("l2tp: close sessions before initiating tunnel delete")
      Signed-off-by: NRidge Kennedy <ridge.kennedy@alliedtelesis.co.nz>
      Acked-by: NGuillaume Nault <g.nault@alphalink.fr>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      12d656af
    • B
      qlogic: netxen: constify bin_attribute structures · ff292458
      Bhumika Goyal 提交于
      Declare bin_attribute structures as const as they are only passed as an
      arguments to the functions device_remove_bin_file and
      device_create_bin_file. These function arguments are of type const, so
      bin_attribute structures having this property can be made const too.
      Done using Coccinelle:
      
      @r1 disable optional_qualifier @
      identifier i;
      position p;
      @@
      static struct bin_attribute i@p = {...};
      
      @ok1@
      identifier r1.i;
      position p,p1;
      @@
      (
      device_remove_bin_file(...,&i@p)
      |
      device_create_bin_file(..., &i@p1)
      )
      
      @bad@
      position p!={r1.p,ok1.p,ok1.p1};
      identifier r1.i;
      @@
      i@p
      
      @depends on !bad disable optional_qualifier@
      identifier r1.i;
      @@
      +const
      struct bin_attribute i;
      Signed-off-by: NBhumika Goyal <bhumirks@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ff292458
    • B
      qlogic: qlcnic_sysfs: constify bin_attribute structures · 0ccea221
      Bhumika Goyal 提交于
      Declare bin_attribute structures as const as they are only passed as an
      arguments to the functions device_remove_bin_file and
      device_create_bin_file. These function arguments are of type const, so
      bin_attribute structures having this property can be made const too.
      Done using Coccinelle:
      
      @r1 disable optional_qualifier @
      identifier i;
      position p;
      @@
      static struct bin_attribute i@p = {...};
      
      @ok1@
      identifier r1.i;
      position p,p1;
      @@
      (
      device_remove_bin_file(...,&i@p)
      |
      device_create_bin_file(..., &i@p1)
      )
      
      @bad@
      position p!={r1.p,ok1.p,ok1.p1};
      identifier r1.i;
      @@
      i@p
      
      @depends on !bad disable optional_qualifier@
      identifier r1.i;
      @@
      +const
      struct bin_attribute i;
      Signed-off-by: NBhumika Goyal <bhumirks@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0ccea221
    • C
      net: emac: add support for device-tree based PHY discovery and setup · a577ca6b
      Christian Lamparter 提交于
      This patch adds glue-code that allows the EMAC driver to interface
      with the existing dt-supported PHYs in drivers/net/phy.
      
      Because currently, the emac driver maintains a small library of
      supported phys for in a private phy.c file located in the drivers
      directory.
      
      The support is limited to mostly single ethernet transceiver like the:
      CIS8201, BCM5248, ET1011C, Marvell 88E1111 and 88E1112, AR8035.
      
      However, routers like the Netgear WNDR4700 and Cisco Meraki MX60(W)
      have a 5-port switch (AR8327N) attached to the EMAC. The switch chip
      is supported by the qca8k mdio driver, which uses the generic phy
      library. Another reason is that PHYLIB also supports the BCM54610,
      which was used for the Western Digital My Book Live.
      
      This will now also make EMAC select PHYLIB.
      Signed-off-by: NChristian Lamparter <chunkeey@googlemail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a577ca6b
    • L
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · ca78d317
      Linus Torvalds 提交于
      Pull arm64 updates from Will Deacon:
       - Errata workarounds for Qualcomm's Falkor CPU
       - Qualcomm L2 Cache PMU driver
       - Qualcomm SMCCC firmware quirk
       - Support for DEBUG_VIRTUAL
       - CPU feature detection for userspace via MRS emulation
       - Preliminary work for the Statistical Profiling Extension
       - Misc cleanups and non-critical fixes
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (74 commits)
        arm64/kprobes: consistently handle MRS/MSR with XZR
        arm64: cpufeature: correctly handle MRS to XZR
        arm64: traps: correctly handle MRS/MSR with XZR
        arm64: ptrace: add XZR-safe regs accessors
        arm64: include asm/assembler.h in entry-ftrace.S
        arm64: fix warning about swapper_pg_dir overflow
        arm64: Work around Falkor erratum 1003
        arm64: head.S: Enable EL1 (host) access to SPE when entered at EL2
        arm64: arch_timer: document Hisilicon erratum 161010101
        arm64: use is_vmalloc_addr
        arm64: use linux/sizes.h for constants
        arm64: uaccess: consistently check object sizes
        perf: add qcom l2 cache perf events driver
        arm64: remove wrong CONFIG_PROC_SYSCTL ifdef
        ARM: smccc: Update HVC comment to describe new quirk parameter
        arm64: do not trace atomic operations
        ACPI/IORT: Fix the error return code in iort_add_smmu_platform_device()
        ACPI/IORT: Fix iort_node_get_id() mapping entries indexing
        arm64: mm: enable CONFIG_HOLES_IN_ZONE for NUMA
        perf: xgene: Include module.h
        ...
      ca78d317
    • L
      Merge tag 'arc-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · a4ee7bac
      Linus Torvalds 提交于
      Pull ARC updates from Vineet Gupta:
      
       - Intc imporvements [Yuriy]
      
       - VDK platform updates [Alexey]
      
      * tag 'arc-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARC: [plat-*] ARC_HAS_COH_CACHES no longer relevant
        ARCv2: intc: Delete useless comments in Device Trees
        ARCv2: IDU-intc: Delete deprecated parameters in Device Trees
        ARCv2: IDU-intc: mask all common interrupts by default
        ARCv2: IDU-intc: Use build registers for getting numbers of interrupts
        ARCv2: intc: Set default priority for all core interrupts
        ARCv2: intc: Use runtime value of irq count for setting up intc
        ARCv2: intc: Rework the build time irq count information
        ARC: [intc-*]: confine NR_CPU_IRQS to intc code
        ARCv2: intc: Use ARC_REG_STATUS32 for addressing STATUS32 reg
        arc: vdk: Add support of UIO
        arc: vdk: Add support of MMC controller
        arc: vdk: Disable halt on reset
      a4ee7bac
    • L
      Merge tag 'powerpc-4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · 38705613
      Linus Torvalds 提交于
      Pull powerpc updates from Michael Ellerman:
       "Highlights include:
      
         - Support for direct mapped LPC on POWER9, giving Linux direct access
           to devices that may be on there such as a UART.
      
         - Memory hotplug support for the Power9 Radix MMU.
      
         - Add new AUX vectors describing the processor's cache geometry, to
           be used by glibc.
      
         - The ability for a guest to ask the hypervisor to resize the guest's
           hash table, and in addition support for doing so automatically when
           memory is hotplugged into/out-of the guest. This allows the hash
           table to be sized based on the current memory usage of the guest,
           rather than the maximum possible memory usage.
      
         - Implementation of optprobes (kprobe optimisation) for powerpc.
      
        In addition there's the topic branch shared with the KVM tree, which
        includes support for guests to use the Radix MMU on Power9.
      
        Thanks to:
          Alistair Popple, Andrew Donnellan, Aneesh Kumar K.V, Anju T, Anton
          Blanchard, Benjamin Herrenschmidt, Chris Packham, Daniel Axtens,
          Daniel Borkmann, David Gibson, Finn Thain, Gautham R. Shenoy, Gavin
          Shan, Greg Kurz, Joel Stanley, John Allen, Madhavan Srinivasan,
          Mahesh Salgaonkar, Markus Elfring, Michael Neuling, Nathan Fontenot,
          Naveen N. Rao, Nicholas Piggin, Paul Mackerras, Ravi Bangoria, Reza
          Arbab, Shailendra Singh, Vaibhav Jain, Wei Yongjun"
      
      * tag 'powerpc-4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (129 commits)
        powerpc/mm/radix: Skip ptesync in pte update helpers
        powerpc/mm/radix: Use ptep_get_and_clear_full when clearing pte for full mm
        powerpc/mm/radix: Update pte update sequence for pte clear case
        powerpc/mm: Update PROTFAULT handling in the page fault path
        powerpc/xmon: Fix data-breakpoint
        powerpc/mm: Fix build break with BOOK3S_64=n and MEMORY_HOTPLUG=y
        powerpc/mm: Fix build break when CMA=n && SPAPR_TCE_IOMMU=y
        powerpc/mm: Fix build break with RADIX=y & HUGETLBFS=n
        powerpc/pseries: Fix typo in parameter description
        powerpc/kprobes: Remove kprobe_exceptions_notify()
        kprobes: Introduce weak variant of kprobe_exceptions_notify()
        powerpc/ftrace: Fix confusing help text for DISABLE_MPROFILE_KERNEL
        powerpc/powernv: Fix opal_exit tracepoint opcode
        powerpc: Add a prototype for mcount() so it can be versioned
        powerpc: Drop GPL from of_node_to_nid() export to match other arches
        powerpc/kprobes: Optimize kprobe in kretprobe_trampoline()
        powerpc/kprobes: Implement Optprobes
        powerpc/kprobes: Fixes for kprobe_lookup_name() on BE
        powerpc: Add helper to check if offset is within relative branch range
        powerpc/bpf: Introduce __PPC_SH64()
        ...
      38705613
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · ff47d8c0
      Linus Torvalds 提交于
      Pull s390 updates from Martin Schwidefsky:
      
       - New entropy generation for the pseudo random number generator.
      
       - Early boot printk output via sclp to help debug crashes on boot. This
         needs to be enabled with a kernel parameter.
      
       - Add proper no-execute support with a bit in the page table entry.
      
       - Bug fixes and cleanups.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (65 commits)
        s390/syscall: fix single stepped system calls
        s390/zcrypt: make ap_bus explicitly non-modular
        s390/zcrypt: Removed unneeded debug feature directory creation.
        s390: add missing "do {} while (0)" loop constructs to multiline macros
        s390/mm: add cond_resched call to kernel page table dumper
        s390: get rid of MACHINE_HAS_PFMF and MACHINE_HAS_HPAGE
        s390/mm: make memory_block_size_bytes available for !MEMORY_HOTPLUG
        s390: replace ACCESS_ONCE with READ_ONCE
        s390: Audit and remove any remaining unnecessary uses of module.h
        s390: mm: Audit and remove any unnecessary uses of module.h
        s390: kernel: Audit and remove any unnecessary uses of module.h
        s390/kdump: Use "LINUX" ELF note name instead of "CORE"
        s390: add no-execute support
        s390: report new vector facilities
        s390: use correct input data address for setup_randomness
        s390/sclp: get rid of common response code handling
        s390/sclp: don't add new lines to each printed string
        s390/sclp: make early sclp code readable
        s390/sclp: disable early sclp code as soon as the base sclp driver is active
        s390/sclp: move early printk code to drivers
        ...
      ff47d8c0
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 3051bf36
      Linus Torvalds 提交于
      Pull networking updates from David Miller:
       "Highlights:
      
         1) Support TX_RING in AF_PACKET TPACKET_V3 mode, from Sowmini
            Varadhan.
      
         2) Simplify classifier state on sk_buff in order to shrink it a bit.
            From Willem de Bruijn.
      
         3) Introduce SIPHASH and it's usage for secure sequence numbers and
            syncookies. From Jason A. Donenfeld.
      
         4) Reduce CPU usage for ICMP replies we are going to limit or
            suppress, from Jesper Dangaard Brouer.
      
         5) Introduce Shared Memory Communications socket layer, from Ursula
            Braun.
      
         6) Add RACK loss detection and allow it to actually trigger fast
            recovery instead of just assisting after other algorithms have
            triggered it. From Yuchung Cheng.
      
         7) Add xmit_more and BQL support to mvneta driver, from Simon Guinot.
      
         8) skb_cow_data avoidance in esp4 and esp6, from Steffen Klassert.
      
         9) Export MPLS packet stats via netlink, from Robert Shearman.
      
        10) Significantly improve inet port bind conflict handling, especially
            when an application is restarted and changes it's setting of
            reuseport. From Josef Bacik.
      
        11) Implement TX batching in vhost_net, from Jason Wang.
      
        12) Extend the dummy device so that VF (virtual function) features,
            such as configuration, can be more easily tested. From Phil
            Sutter.
      
        13) Avoid two atomic ops per page on x86 in bnx2x driver, from Eric
            Dumazet.
      
        14) Add new bpf MAP, implementing a longest prefix match trie. From
            Daniel Mack.
      
        15) Packet sample offloading support in mlxsw driver, from Yotam Gigi.
      
        16) Add new aquantia driver, from David VomLehn.
      
        17) Add bpf tracepoints, from Daniel Borkmann.
      
        18) Add support for port mirroring to b53 and bcm_sf2 drivers, from
            Florian Fainelli.
      
        19) Remove custom busy polling in many drivers, it is done in the core
            networking since 4.5 times. From Eric Dumazet.
      
        20) Support XDP adjust_head in virtio_net, from John Fastabend.
      
        21) Fix several major holes in neighbour entry confirmation, from
            Julian Anastasov.
      
        22) Add XDP support to bnxt_en driver, from Michael Chan.
      
        23) VXLAN offloads for enic driver, from Govindarajulu Varadarajan.
      
        24) Add IPVTAP driver (IP-VLAN based tap driver) from Sainath Grandhi.
      
        25) Support GRO in IPSEC protocols, from Steffen Klassert"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1764 commits)
        Revert "ath10k: Search SMBIOS for OEM board file extension"
        net: socket: fix recvmmsg not returning error from sock_error
        bnxt_en: use eth_hw_addr_random()
        bpf: fix unlocking of jited image when module ronx not set
        arch: add ARCH_HAS_SET_MEMORY config
        net: napi_watchdog() can use napi_schedule_irqoff()
        tcp: Revert "tcp: tcp_probe: use spin_lock_bh()"
        net/hsr: use eth_hw_addr_random()
        net: mvpp2: enable building on 64-bit platforms
        net: mvpp2: switch to build_skb() in the RX path
        net: mvpp2: simplify MVPP2_PRS_RI_* definitions
        net: mvpp2: fix indentation of MVPP2_EXT_GLOBAL_CTRL_DEFAULT
        net: mvpp2: remove unused register definitions
        net: mvpp2: simplify mvpp2_bm_bufs_add()
        net: mvpp2: drop useless fields in mvpp2_bm_pool and related code
        net: mvpp2: remove unused 'tx_skb' field of 'struct mvpp2_tx_queue'
        net: mvpp2: release reference to txq_cpu[] entry after unmapping
        net: mvpp2: handle too large value in mvpp2_rx_time_coal_set()
        net: mvpp2: handle too large value handling in mvpp2_rx_pkts_coal_set()
        net: mvpp2: remove useless arguments in mvpp2_rx_{pkts, time}_coal_set
        ...
      3051bf36
    • L
      Merge tag 'gcc-plugins-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 1e74a2eb
      Linus Torvalds 提交于
      Pull gcc-plugins updates from Kees Cook:
       "This includes infrastructure updates and the structleak plugin, which
        performs forced initialization of certain structures to avoid possible
        information exposures to userspace.
      
        Summary:
      
         - infrastructure updates (gcc-common.h)
      
         - introduce structleak plugin for forced initialization of some
           structures"
      
      * tag 'gcc-plugins-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        gcc-plugins: Add structleak for more stack initialization
        gcc-plugins: consolidate on PASS_INFO macro
        gcc-plugins: add PASS_INFO and build_const_char_string()
      1e74a2eb
  2. 22 2月, 2017 25 次提交
    • K
    • K
    • L
      Merge tag 'rodata-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 7bb03382
      Linus Torvalds 提交于
      Pull rodata updates from Kees Cook:
       "This renames the (now inaccurate) DEBUG_RODATA and related
        SET_MODULE_RONX configs to the more sensible STRICT_KERNEL_RWX and
        STRICT_MODULE_RWX"
      
      * tag 'rodata-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        arch: Rename CONFIG_DEBUG_RODATA and CONFIG_DEBUG_MODULE_RONX
        arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to be common
      7bb03382
    • L
      Merge tag 'usercopy-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 4a0853bf
      Linus Torvalds 提交于
      Pull usercopy test updates from Kees Cook:
       "This improves the usercopy tests:
      
         - check zeroing on failed copy_from_user()/get_user() (caught bug on
           ARM)
      
         - adjust tests for SMAP/PAN (can't zero userspace memory on failure)"
      
      * tag 'usercopy-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        usercopy: Add tests for all get_user() sizes
        usercopy: Adjust tests to deal with SMAP/PAN
        usercopy: add testcases to check zeroing on failure
      4a0853bf
    • L
      Merge tag 'pstore-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 6d1dd93e
      Linus Torvalds 提交于
      Pull pstore updates from Kees Cook:
       "Minor changes to pstore tree:
      
         - update MAINTAINERS with current git repo, add more files.
      
         - move prz allocation checks into the walker
      
         - initialize flags correctly (by accident spinlock was technically
           ok)"
      
      * tag 'pstore-v4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        MAINTAINERS: Adjust pstore git repo URI, add files
        pstore: Check for prz allocation in walker
        pstore: Correctly initialize spinlock and flags
      6d1dd93e
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 81bbef23
      Linus Torvalds 提交于
      Pull HID fix from Jiri Kosina:
       "Regression fix for HID_RMI-driven synaptics touchpads in
        !CONFIG_HID_RMI cases"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: rmi: fallback to generic/multitouch if hid-rmi is not built
      81bbef23
    • L
      Merge branch 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 79f4d1d5
      Linus Torvalds 提交于
      Pull libata updates from Tejun Heo:
      
       - Bartlomiej added pata_falcon
      
       - Christoph is trying to remove use of static 4k buf.  It's still WIP
      
       - config cleanup around HAS_DMA
      
       - other fixes and driver-specific changes
      
      * 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (29 commits)
        ata: pata_of_platform: using of_property_read_u32() helper
        pata_atiixp: Don't use unconnected secondary port on SB600/SB700
        libata-sff: Don't scan disabled ports when checking for legacy mode.
        pata_octeon_cf: remove unused local variables from octeon_cf_set_piomode()
        ahci: qoriq: added ls2088a platforms support
        ahci: qoriq: report error when ecc register address is missing in dts
        ahci: qoriq: added a condition to enable dma coherence
        Revert "libata: switch to dynamic allocation instead of ata_scsi_rbuf"
        ahci: imx: fix building without hwmon or thermal
        ata: add Atari Falcon PATA controller driver
        ata: pass queued command to ->sff_data_xfer method
        ata: allow subsystem to be used on m68k arch
        libata: switch to dynamic allocation instead of ata_scsi_rbuf
        libata: don't call ata_scsi_rbuf_fill for command without a response buffer
        libata: call ->scsi_done from ata_scsi_simulate
        libata: remove the done callback from ata_scsi_args
        libata: move struct ata_scsi_args to libata-scsi.c
        libata: avoid global response buffer in atapi_qc_complete
        libata-eh: Use switch() instead of sparse array for protocol strings
        ata: sata_mv: Convert to devm_ioremap_resource()
        ...
      79f4d1d5
    • L
      Merge tag 'dmaengine-4.11-rc1' of git://git.infradead.org/users/vkoul/slave-dma · 97a229f9
      Linus Torvalds 提交于
      Pull dmaengine updates from Vinod Koul:
       "This time we fairly boring and bit small update.
      
         - Support for Intel iDMA 32-bit hardware
         - deprecate broken support for channel switching in async_tx
         - bunch of updates on stm32-dma
         - Cyclic support for zx dma and making in generic zx dma driver
         - Small updates to bunch of other drivers"
      
      * tag 'dmaengine-4.11-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (29 commits)
        async_tx: deprecate broken support for channel switching
        dmaengine: rcar-dmac: Widen DMA mask to 40 bits
        dmaengine: sun6i: allow build on ARM64 platforms (sun50i)
        dmaengine: Provide a wrapper for memcpy operations
        dmaengine: zx: fix build warning
        dmaengine: dw: we do support Merrifield SoC in PCI mode
        dmaengine: dw: add support of iDMA 32-bit hardware
        dmaengine: dw: introduce register mappings for iDMA 32-bit
        dmaengine: dw: introduce block2bytes() and bytes2block()
        dmaengine: dw: extract dwc_chan_pause() for future use
        dmaengine: dw: replace convert_burst() with one liner
        dmaengine: dw: register IRQ and DMA pool with instance ID
        dmaengine: dw: Fix data corruption in large device to memory transfers
        dmaengine: ste_dma40: indicate granularity on channels
        dmaengine: ste_dma40: indicate directions on channels
        dmaengine: stm32-dma: Add error messages if xlate fails
        dmaengine: dw: pci: remove LPE Audio DMA ID
        dmaengine: stm32-dma: Add max_burst support
        dmaengine: stm32-dma: Add synchronization support
        dmaengine: stm32-dma: Fix residue computation issue in cyclic mode
        ...
      97a229f9
    • L
      Merge tag 'media/v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · ff58d005
      Linus Torvalds 提交于
      Pull media updates from Mauro Carvalho Chehab:
      
       - new drivers:
             - i.MX6 Video Data Order Adapter's (VDOA)
             - Toshiba et8ek8 5MP sensor
             - STM DELTA multi-format video decoder V4L2 driver
             - SPI connected IR LED
             - Mediatek IR remote receiver
             - ZyDAS ZD1301 DVB USB interface driver
      
       - new RC keymaps
      
       - some very old LIRC drivers got removed from staging
      
       - RC core gained support encoding IR scan codes
      
       - DVB si2168 gained support for DVBv5 statistics
      
       - lirc_sir driver ported to rc-core and promoted from staging
      
       - other bug fixes, board additions and driver improvements
      
      * tag 'media/v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (230 commits)
        [media] mtk-vcodec: fix build warnings without DEBUG
        [media] zd1301: fix building interface driver without demodulator
        [media] usbtv: add sharpness control
        [media] cxusb: Use a dma capable buffer also for reading
        [media] ttpci: address stringop overflow warning
        [media] dvb-usb-v2: avoid use-after-free
        [media] add Hama Hybrid DVB-T Stick support
        [media] et8ek8: Fix compiler / Coccinelle warnings
        [media] media: fix semicolon.cocci warnings
        [media] media: exynos4-is: add flags to dummy Exynos IS i2c adapter
        [media] v4l: of: check for unique lanes in data-lanes and clock-lanes
        [media] coda/imx-vdoa: constify structs
        [media] st-delta: debug: trace stream/frame information & summary
        [media] st-delta: add mjpeg support
        [media] st-delta: EOS (End Of Stream) support
        [media] st-delta: rpmsg ipc support
        [media] st-delta: add memory allocator helper functions
        [media] st-delta: STiH4xx multi-format video decoder v4l2 driver
        [media] MAINTAINERS: add st-delta driver
        [media] ARM: multi_v7_defconfig: enable STMicroelectronics DELTA Support
        ...
      ff58d005
    • L
      Merge tag 'pinctrl-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 5ab35662
      Linus Torvalds 提交于
      Pull pin control updates from Linus Walleij:
       "Pin control bulk changes for the v4.11 kernel cycle.
      
        Core changes:
      
         - Switch the generic pin config argument from 16 to 24 bits, only use
           8 bits for the configuration type. We might need to encode more
           information about a certain setting than we need to encode
           different generic settings.
      
         - Add a cross-talk API to the pin control GPIO back-end, utilizing
           pinctrl_gpio_set_config() from GPIO drivers that want to set up a
           certain pin configuration in the back-end.
      
           This also includes the .set_config() refactoring of the GPIO chips,
           so that they pass a generic configuration for things like
           debouncing and single ended (typically open drain). This change has
           also been merged in an immutable branch to the GPIO tree.
      
         - Take hogs with a delayed work, so that we finalize probing a pin
           controller before trying to get any hogs.
      
         - For pin controllers putting all group and function definitions into
           the device tree, we now have generic code to deal with this and it
           is used in two drivers so far.
      
         - Simplifications of the pin request conflict check.
      
         - Make dt_free_map() optional.
      
        Updates to drivers:
      
         - pinctrl-single now use the generic helpers to generate dynamic
           group and function tables from the device tree.
      
         - Texas Instruments IOdelay configuration driver add-on to
           pinctrl-single.
      
         - i.MX: use radix trees to store groups and functions, use the new
           generic group and function helpers to manage them.
      
         - Intel: add support for hardware debouncing and 1K pull-down. New
           subdriver for the Gemini Lake SoC.
      
         - Renesas SH-PFC: drive strength and bias support, CAN bus muxing,
           MSIOF, SDHI, HSCIF for r8a7796. Gyro-ADC supporton r8a7791.
      
         - Aspeed: use syscon cross-dependencies to set up related bits in the
           LPC host controller and display controller.
      
         - Aspeed: finalize G4 and G5 support. Fix mux configuration on GPIOs.
           Add banks Y, Z, AA, AB and AC.
      
         - AMD: support additional GPIO.
      
         - STM32: set this controller to strict muxing mode. STM32H743 MCU
           support.
      
         - Allwinner sunxi: deep simplifications on how to support subvariants
           of SoCs without adding to much SoC-specific data for each
           subvariant, especially for sun5i variants. New driver for V3s SoCs.
           New driver for the H5 SoC. Support A31/A31s variants with the new
           variant framework.
      
         - Mvebu: simplifications to use a MMIO and regmap abstraction. New
           subdrivers for the 98DX3236, 98DX5241 SoCs.
      
         - Samsung Exynos: delete Exynos4415 support. Add crosstalk to the SoC
           driver to access regmaps. Add infrastructure for pin-bank retention
           control. Clean out the pin retention control from
           arch/arm/mach-exynos and arch/arm/mach-s5p and put it properly in
           the Samsung pin control driver(s).
      
         - Meson: add HDMI HPD/DDC pins. Add pwm_ao_b pin.
      
         - Qualcomm: use raw spinlock variants: this makes the qualcomm driver
           realtime-safe"
      
      * tag 'pinctrl-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (111 commits)
        pinctrl: samsung: Fix return value check in samsung_pinctrl_get_soc_data()
        pinctrl: intel: unlock on error in intel_config_set_pull()
        pinctrl: berlin: make bool drivers explicitly non-modular
        pinctrl: spear: make bool drivers explicitly non-modular
        pinctrl: mvebu: make bool drivers explicitly non-modular
        pinctrl: sunxi: make sun5i explicitly non-modular
        pinctrl: sunxi: Remove stray printk call in sun5i driver's probe function
        pinctrl: samsung: mark PM functions as __maybe_unused
        pinctrl: sunxi: Remove redundant A31s pinctrl driver
        pinctrl: sunxi: Support A31/A31s with pinctrl variants
        pinctrl: Amend bindings for STM32 pinctrl
        pinctrl: Add STM32 pinctrl driver DT bindings
        pinctrl: stm32: Add STM32H743 MCU support
        include: dt-bindings: Add STM32H7 pinctrl DT defines
        gpio: aspeed: Remove dependence on GPIOF_* macros
        pinctrl: stm32: fix bad location of gpiochip_lock_as_irq
        drivers: pinctrl: add driver for Allwinner H5 SoC
        pinctrl: intel: Add Intel Gemini Lake pin controller support
        pinctrl: intel: Add support for 1k additional pull-down
        pinctrl: intel: Add support for hardware debouncer
        ...
      5ab35662
    • J
      HID: rmi: fallback to generic/multitouch if hid-rmi is not built · 2fa299a9
      Jiri Kosina 提交于
      Commit 279967a6 ("HID: rmi: Handle all Synaptics touchpads using hid-rmi")
      unconditionally switches over handling of all Synaptics touchpads to hid-rmi
      (to make use of extended features of the HW); in case CONFIG_HID_RMI is
      disabled though this renders the touchpad unusable, as the
      
      	HID_DEVICE(HID_BUS_ANY, HID_GROUP_RMI, HID_ANY_ID, HID_ANY_ID)
      
      match doesn't exist and generic/multitouch doesn't bind to it either (due
      to hid group mismatch).
      
      Fix this by switching over to hid-rmi only if it has been actually built.
      
      Fixes: 279967a6 ("HID: rmi: Handle all Synaptics touchpads using hid-rmi")
      Reported-by: NLinus Torvalds <torvalds@linux-foundation.org>
      Acked-by: NBenjamin Tissoires <benjamin.tissoires@redhat.com>
      Tested-by: NAndrew Duggan <aduggan@synaptics.com>
      Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      2fa299a9
    • L
      Merge tag 'extable-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux · 6d1c42d9
      Linus Torvalds 提交于
      Pull exception table module split from Paul Gortmaker:
       "Final extable.h related changes.
      
        This completes the separation of exception table content from the
        module.h header file. This is achieved with the final commit that
        removes the one line back compatible change that sourced extable.h
        into the module.h file.
      
        The commits are unchanged since January, with the exception of a
        couple Acks that came in for the last two commits a bit later. The
        changes have been in linux-next for quite some time[1] and have got
        widespread arch coverage via toolchains I have and also from
        additional ones the kbuild bot has.
      
        Maintaners of the various arch were Cc'd during the postings to
        lkml[2] and informed that the intention was to take the remaining arch
        specific changes and lump them together with the final two non-arch
        specific changes and submit for this merge window.
      
        The ia64 diffstat stands out and probably warrants a mention. In an
        earlier review, Al Viro made a valid comment that the original header
        separation of content left something to be desired, and that it get
        fixed as a part of this change, hence the larger diffstat"
      
      * tag 'extable-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (21 commits)
        module.h: remove extable.h include now users have migrated
        core: migrate exception table users off module.h and onto extable.h
        cris: migrate exception table users off module.h and onto extable.h
        hexagon: migrate exception table users off module.h and onto extable.h
        microblaze: migrate exception table users off module.h and onto extable.h
        unicore32: migrate exception table users off module.h and onto extable.h
        score: migrate exception table users off module.h and onto extable.h
        metag: migrate exception table users off module.h and onto extable.h
        arc: migrate exception table users off module.h and onto extable.h
        nios2: migrate exception table users off module.h and onto extable.h
        sparc: migrate exception table users onto extable.h
        openrisc: migrate exception table users off module.h and onto extable.h
        frv: migrate exception table users off module.h and onto extable.h
        sh: migrate exception table users off module.h and onto extable.h
        xtensa: migrate exception table users off module.h and onto extable.h
        mn10300: migrate exception table users off module.h and onto extable.h
        alpha: migrate exception table users off module.h and onto extable.h
        arm: migrate exception table users off module.h and onto extable.h
        m32r: migrate exception table users off module.h and onto extable.h
        ia64: ensure exception table search users include extable.h
        ...
      6d1c42d9
    • L
      Merge tag 'mips_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips · 0f002fdd
      Linus Torvalds 提交于
      Pull MIPS updates from James Hogan:
       "Here's the main MIPS pull request for 4.11.
      
        It contains a few new features such as IRQ stacks, cacheinfo support,
        and KASLR for Octeon CPUs, and a variety of smaller improvements and
        fixes including devicetree additions, kexec cleanups, microMIPS stack
        unwinding fixes, and a bunch of build fixes to clean up continuous
        integration builds.
      
        Its all been in linux-next for at least a couple of days, most of it
        far longer.
      
        Miscellaneous:
         - Add IRQ stacks
         - Add cacheinfo support
         - Add "uzImage.bin" zboot target
         - Unify performance counter definitions
         - Export various (mainly assembly) symbols alongside their
           definitions
         - Audit and remove unnecessary uses of module.h
      
        kexec & kdump:
         - Lots of improvements and fixes
         - Add correct copy_regs implementations
         - Add debug logging of new kernel information
      
        Security:
         - Use Makefile.postlink to insert relocations into vmlinux
         - Provide plat_post_relocation hook (used for Octeon KASLR)
         - Add support for tuning mmap randomisation
         - Relocate DTB
      
        microMIPS:
         - A load of unwind fixes
         - Add some missing .insn to fix link errors
      
        MIPSr6:
         - Fix MULTU/MADDU/MSUBU sign extension in r2 emulation
         - Remove r2_emul_return and use ERETNC unconditionally on MIPSr6
         - Allow pre-r6 emulation on SMP MIPSr6 kernels
      
        Cache management:
         - Treat physically indexed dcache as non-aliasing
         - Add return errors to protected cache ops for KVM
         - CM3: Ensure L1 & L2 cache ECC checking matches
         - CM3: Indicate inclusive caches
         - I6400: Treat dcache as physically indexed
      
        Memory management:
         - Ensure bootmem doesn't corrupt reserved memory
         - Export some TLB exception generation functions for KVM
      
        OF:
         - NULL check initial_boot_params before use in of_scan_flat_dt()
         - Fix unaligned access in of_alias_scan()
      
        SMP:
         - CPS: Don't BUG if a CPU fails to start
      
        Other fixes:
         - Fix longstanding 64-bit IP checksum carry bug
         - Fix KERN_CONT fallout in cpu-bugs64.c and sync-r4k.c
         - Update defconfigs for NF_CT_PROTO_DCCP, DPLITE,
           CPU_FREQ_STAT,SCSI_DH changes
         - Disable certain builtin compiler options, stack-check (whole
           kernel), asynchronous-unwind-tables (VDSO).
         - A bunch of build fixes from kernelci.org testing
         - Various other minor cleanups & corrections
      
        BMIPS:
         - Migrate interrupts during bmips_cpu_disable
         - BCM47xx: Add Luxul devices
         - BCM47xx: Fix Asus WL-500W button inversion
         - BCM7xxx: Add SPI device nodes
      
        Generic (multiplatform):
         - Add kexec DTB passing
         - Fix big endian
         - Add cpp_its_S in ksym_dep_filter to silence build warning
      
        IP22:
         - Reformat inline assembler code to modern standards
         - Fix binutils 2.25 build error
      
        IP27:
         - Fix duplicate CAC_BASE definition build error
         - Disable qlge driver to workaround broken compiler
      
        Lantiq:
         - Refresh defconfig and activate more drivers
         - Lock DMA register access
         - Fix cascading IRQ setup
         - Fix build of VPE loader
         - xway: Fix ethernet packet header corruption over reboot
      
        Loongson1
         - Add watchdog support
         - 1B: Reduce DEFAULT_MEMSIZE to 64MB
         - 1B: Change OSC clock name to match rest of kernel
         - 1C: Remove ARCH_WANT_OPTIONAL_GPIOLIB
      
        Octeon:
         - Add KASLR support
         - Support Octeon III USB controller
         - Fix large copy_from_user corner case
         - Enable devtmpfs in defconfig
      
        Netlogic:
         - Fix non-default XLR build error due to netlogic,xlp-pic code
         - Fix assembler warning from smpboot.S
      
        pic32mzda:
         - Fix linker error when early printk is disabled
      
        Pistachio:
         - Add base device tree
         - Add Ci40 "Marduk" device tree
      
        Ralink:
         - Support raw appended DTB
         - Add missing I2C & I2S clocks
         - Add missing pinmux and fix pinmux function name typo
         - Add missing clk_round_rate()
         - Clean up prom_init()
         - MT7621: Set SoC type
         - MT7621: Support highmem
      
        TXx9:
         - Modernize printing of kernel messages and resolve KERN_CONT fallout
         - 7segled: use permission-specific DEVICE_ATTR variants
      
        XilFPGA:
         - Add IRQ controller and UART IRQ
         - Add AXI I2C and emaclite to DT & defconfig"
      
      * tag 'mips_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips: (148 commits)
        MIPS: VDSO: Explicitly use -fno-asynchronous-unwind-tables
        MIPS: BCM47XX: Fix button inversion for Asus WL-500W
        MIPS: DTS: Add img directory to Makefile
        MIPS: ip27: Disable qlge driver in defconfig
        MIPS: pic32mzda: Fix linker error for pic32_get_pbclk()
        MIPS: Lantiq: Keep ethernet enabled during boot
        MIPS: OCTEON: Fix copy_from_user fault handling for large buffers
        MIPS: Fix special case in 64 bit IP checksumming.
        MIPS: OCTEON: Enable DEVTMPFS
        MIPS: lantiq: Set physical_memsize
        MIPS: sysmips: Remove duplicated include from syscall.c
        Kbuild: Add cpp_its_S in ksym_dep_filter
        MIPS: Audit and remove any unnecessary uses of module.h
        MIPS: Unify perf counter register definitions
        MIPS: Disable stack checks on MIPS kernels
        MIPS: OCTEON: Platform support for OCTEON III USB controller
        MIPS: Lantiq: Fix cascaded IRQ setup
        MIPS: sync-r4k: Fix KERN_CONT fallout
        MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch
        MIPS: Fix distclean with Makefile.postlink
        ...
      0f002fdd
    • L
      Merge tag 'for-linus-4.11-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 252b95c0
      Linus Torvalds 提交于
      Pull xen updates from Juergen Gross:
       "Xen features and fixes:
      
         - a series from Boris Ostrovsky adding support for booting Linux as
           Xen PVH guest
      
         - a series from Juergen Gross streamlining the xenbus driver
      
         - a series from Paul Durrant adding support for the new device model
           hypercall
      
         - several small corrections"
      
      * tag 'for-linus-4.11-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/privcmd: add IOCTL_PRIVCMD_RESTRICT
        xen/privcmd: Add IOCTL_PRIVCMD_DM_OP
        xen/privcmd: return -ENOTTY for unimplemented IOCTLs
        xen: optimize xenbus driver for multiple concurrent xenstore accesses
        xen: modify xenstore watch event interface
        xen: clean up xenbus internal headers
        xenbus: Neaten xenbus_va_dev_error
        xen/pvh: Use Xen's emergency_restart op for PVH guests
        xen/pvh: Enable CPU hotplug
        xen/pvh: PVH guests always have PV devices
        xen/pvh: Initialize grant table for PVH guests
        xen/pvh: Make sure we don't use ACPI_IRQ_MODEL_PIC for SCI
        xen/pvh: Bootstrap PVH guest
        xen/pvh: Import PVH-related Xen public interfaces
        xen/x86: Remove PVH support
        x86/boot/32: Convert the 32-bit pgtable setup code from assembly to C
        xen/manage: correct return value check on xenbus_scanf()
        x86/xen: Fix APIC id mismatch warning on Intel
        xen/netback: set default upper limit of tx/rx queues to 8
        xen/netfront: set default upper limit of tx/rx queues to 8
      252b95c0
    • L
      Merge branch 'stable-4.11' of git://git.infradead.org/users/pcmoore/audit · b8989bcc
      Linus Torvalds 提交于
      Pull audit updates from Paul Moore:
       "The audit changes for v4.11 are relatively small compared to what we
        did for v4.10, both in terms of size and impact.
      
         - two patches from Steve tweak the formatting for some of the audit
           records to make them more consistent with other audit records.
      
         - three patches from Richard record the name of a module on module
           load, fix the logging of sockaddr information when using
           socketcall() on 32-bit systems, and add the ability to reset
           audit's lost record counter.
      
         - my lone patch just fixes an annoying style nit that I was reminded
           about by one of Richard's patches.
      
        All these patches pass our test suite"
      
      * 'stable-4.11' of git://git.infradead.org/users/pcmoore/audit:
        audit: remove unnecessary curly braces from switch/case statements
        audit: log module name on init_module
        audit: log 32-bit socketcalls
        audit: add feature audit_lost reset
        audit: Make AUDIT_ANOM_ABEND event normalized
        audit: Make AUDIT_KERNEL event conform to the specification
      b8989bcc
    • K
      Revert "ath10k: Search SMBIOS for OEM board file extension" · 005c3490
      Kalle Valo 提交于
      This reverts commit f2593cb1.
      
      Paul reported that this patch with older board-2.bin ath10k initialisation
      fails on Dell XPS 13:
      
      ath10k_pci 0000:3a:00.0: failed to fetch board data for bus=pci,vendor=168c,
      device=003e,subsystem-vendor=1a56,subsystem-device=1535,variant=RV_0520 from
      ath10k/QCA6174/hw3.0/board-2.bin
      
      The reason is that the older board-2.bin does not have the variant version of
      the image name and ath10k does not fallback to the older naming scheme.
      Reported-by: NPaul Menzel <pmenzel@molgen.mpg.de>
      Link: https://bugzilla.kernel.org/show_bug.cgi?id=185621#c9
      Fixes: f2593cb1 ("ath10k: Search SMBIOS for OEM board file extension")
      Signed-off-by: NKalle Valo <kvalo@qca.qualcomm.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      005c3490
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · c9341ee0
      Linus Torvalds 提交于
      Pull security layer updates from James Morris:
       "Highlights:
      
         - major AppArmor update: policy namespaces & lots of fixes
      
         - add /sys/kernel/security/lsm node for easy detection of loaded LSMs
      
         - SELinux cgroupfs labeling support
      
         - SELinux context mounts on tmpfs, ramfs, devpts within user
           namespaces
      
         - improved TPM 2.0 support"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (117 commits)
        tpm: declare tpm2_get_pcr_allocation() as static
        tpm: Fix expected number of response bytes of TPM1.2 PCR Extend
        tpm xen: drop unneeded chip variable
        tpm: fix misspelled "facilitate" in module parameter description
        tpm_tis: fix the error handling of init_tis()
        KEYS: Use memzero_explicit() for secret data
        KEYS: Fix an error code in request_master_key()
        sign-file: fix build error in sign-file.c with libressl
        selinux: allow changing labels for cgroupfs
        selinux: fix off-by-one in setprocattr
        tpm: silence an array overflow warning
        tpm: fix the type of owned field in cap_t
        tpm: add securityfs support for TPM 2.0 firmware event log
        tpm: enhance read_log_of() to support Physical TPM event log
        tpm: enhance TPM 2.0 PCR extend to support multiple banks
        tpm: implement TPM 2.0 capability to get active PCR banks
        tpm: fix RC value check in tpm2_seal_trusted
        tpm_tis: fix iTPM probe via probe_itpm() function
        tpm: Begin the process to deprecate user_read_timer
        tpm: remove tpm_read_index and tpm_write_index from tpm.h
        ...
      c9341ee0
    • L
      Merge tag 'dm-4.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 7a771cea
      Linus Torvalds 提交于
      Pull device mapper updates from Mike Snitzer:
      
       - Fix dm-raid transient device failure processing and other smaller
         tweaks.
      
       - Add journal support to the DM raid target to close the 'write hole'
         on raid 4/5/6.
      
       - Fix dm-cache corruption, due to rounding bug, when cache exceeds 2TB.
      
       - Add 'metadata2' feature to dm-cache to separate the dirty bitset out
         from other cache metadata. This improves speed of shutting down a
         large cache device (which implies writing out dirty bits).
      
       - Fix a memory leak during dm-stats data structure destruction.
      
       - Fix a DM multipath round-robin path selector performance regression
         that was caused by less precise balancing across all paths.
      
       - Lastly, introduce a DM core fix for a long-standing DM snapshot
         deadlock that is rooted in the complexity of the device stack used in
         conjunction with block core maintaining bios on current->bio_list to
         manage recursion in generic_make_request(). A more comprehensive fix
         to block core (and its hook in the cpu scheduler) would be wonderful
         but this DM-specific fix is pragmatic considering how difficult it
         has been to make progress on a generic fix.
      
      * tag 'dm-4.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (22 commits)
        dm: flush queued bios when process blocks to avoid deadlock
        dm round robin: revert "use percpu 'repeat_count' and 'current_path'"
        dm stats: fix a leaked s->histogram_boundaries array
        dm space map metadata: constify dm_space_map structures
        dm cache metadata: use cursor api in blocks_are_clean_separate_dirty()
        dm persistent data: add cursor skip functions to the cursor APIs
        dm cache metadata: use dm_bitset_new() to create the dirty bitset in format 2
        dm bitset: add dm_bitset_new()
        dm cache metadata: name the cache block that couldn't be loaded
        dm cache metadata: add "metadata2" feature
        dm cache metadata: use bitset cursor api to load discard bitset
        dm bitset: introduce cursor api
        dm btree: use GFP_NOFS in dm_btree_del()
        dm space map common: memcpy the disk root to ensure it's arch aligned
        dm block manager: add unlikely() annotations on dm_bufio error paths
        dm cache: fix corruption seen when using cache > 2TB
        dm raid: cleanup awkward branching in raid_message() option processing
        dm raid: use mddev rather than rdev->mddev
        dm raid: use read_disk_sb() throughout
        dm raid: add raid4/5/6 journaling support
        ...
      7a771cea
    • L
      Merge tag 'mmc-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc · e67bd12d
      Linus Torvalds 提交于
      Pull MMC updates from Ulf Hansson:
       "MMC core:
         - Add support for Marvell SD8787 Wifi/BT chip
         - Improve UHS support for SDIO
         - Invent MMC_CAP_3_3V_DDR and a DT binding for eMMC DDR 3.3V mode
         - Detect Auto BKOPS enable bit
         - Export eMMC device lifetime information through sysfs
         - First take to slim down the public mmc headers to avoid abuse
         - Re-factoring of the mmc block device driver to prepare for blkmq
         - Cleanup code for the mmc block device driver
         - Clarify and cleanup code dealing with data requests
         - Cleanup some code by converting to ida_simple_ functions
         - Cleanup code dealing with card quirks
         - Cleanup private and public mmc header files
      
        MMC host:
         - Don't rely on public mmc headers to include non-mmc related headers
         - meson: Add support for eMMC HS400 mode
         - meson: Various cleanups and improvements
         - omap_hsmmc: Use the proper provided busy timeout from the core
         - sunxi: Enable new timings for the A64 MMC controllers
         - sunxi: Improvements for clock management
         - tmio: Improvements for SDIO interrupts
         - mxs-mmc: Add CMD23 support
         - sdhci-msm: Enable HS400 enhanced strobe mode support
         - sdhci-msm: Correct HS400 tuning sequence
         - sdhci-acpi: Support deferred probe
         - sdhci-pci: Add support for eMMC HS200 tuning mode on AMD
         - mediatek: Correct the implementation of card busy detection
         - dw_mmc: Initial support for ZX mmc controller
         - sh_mobile_sdhi: Enable support for eMMC HS200 mode
         - sh_mmcif: Various cleanups and improvements"
      
      * tag 'mmc-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (145 commits)
        mmc: core: add mmc prefix for blk_fixups
        mmc: core: move all quirks together into quirks.h
        mmc: core: improve the quirks for sdio devices
        mmc: core: move some sdio IDs out of quirks file
        mmc: core: change quirks.c to be a header file
        mmc: sdhci-cadence: fix bit shift of read data from PHY port
        mmc: Adding AUTO_BKOPS_EN bit set for Auto BKOPS support
        mmc: MAN_BKOPS_EN inverse debug message logic
        mmc: meson-gx: add support for HS400 mode
        mmc: meson-gx: remove unneeded checks in remove
        mmc: meson-gx: reduce bounce buffer size
        mmc: meson-gx: set max block count and request size
        mmc: meson-gx: improve interrupt handling
        mmc: meson-gx: improve meson_mmc_irq_thread
        mmc: meson-gx: improve meson_mmc_clk_set
        mmc: meson-gx: minor improvements in meson_mmc_set_ios
        mmc: meson: Assign the minimum clk rate as close to 400KHz as possible
        mmc: core: start to break apart mmc_start_areq()
        mmc: block: respect bool returned from blk_end_request()
        mmc: block: return errorcode from mmc_sd_num_wr_blocks()
        ...
      e67bd12d
    • K
      usercopy: Add tests for all get_user() sizes · 4c5d7bc6
      Kees Cook 提交于
      The existing test was only exercising native unsigned long size
      get_user(). For completeness, we should check all sizes. But we
      must skip some 32-bit architectures that don't implement a 64-bit
      get_user().
      
      These new tests actually uncovered a bug in ARM's 64-bit get_user()
      zeroing.
      Signed-off-by: NKees Cook <keescook@chromium.org>
      4c5d7bc6
    • L
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · cdc19470
      Linus Torvalds 提交于
      Pull SCSI updates from James Bottomley:
       "This update includes the usual round of major driver updates (ncr5380,
        ufs, lpfc, be2iscsi, hisi_sas, storvsc, cxlflash, aacraid,
        megaraid_sas, ...).
      
        There's also an assortment of minor fixes and the major update of
        switching a bunch of drivers to pci_alloc_irq_vectors from Christoph"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (188 commits)
        scsi: megaraid_sas: handle dma_addr_t right on 32-bit
        scsi: megaraid_sas: array overflow in megasas_dump_frame()
        scsi: snic: switch to pci_irq_alloc_vectors
        scsi: megaraid_sas: driver version upgrade
        scsi: megaraid_sas: Change RAID_1_10_RMW_CMDS to RAID_1_PEER_CMDS and set value to 2
        scsi: megaraid_sas: Indentation and smatch warning fixes
        scsi: megaraid_sas: Cleanup VD_EXT_DEBUG and SPAN_DEBUG related debug prints
        scsi: megaraid_sas: Increase internal command pool
        scsi: megaraid_sas: Use synchronize_irq to wait for IRQs to complete
        scsi: megaraid_sas: Bail out the driver load if ld_list_query fails
        scsi: megaraid_sas: Change build_mpt_mfi_pass_thru to return void
        scsi: megaraid_sas: During OCR, if get_ctrl_info fails do not continue with OCR
        scsi: megaraid_sas: Do not set fp_possible if TM capable for non-RW syspdIO, change fp_possible to bool
        scsi: megaraid_sas: Remove unused pd_index from megasas_build_ld_nonrw_fusion
        scsi: megaraid_sas: megasas_return_cmd does not memset IO frame to zero
        scsi: megaraid_sas: max_fw_cmds are decremented twice, remove duplicate
        scsi: megaraid_sas: update can_queue only if the new value is less
        scsi: megaraid_sas: Change max_cmd from u32 to u16 in all functions
        scsi: megaraid_sas: set pd_after_lb from MR_BuildRaidContext and initialize pDevHandle to MR_DEVHANDLE_INVALID
        scsi: megaraid_sas: latest controller OCR capability from FW before sending shutdown DCMD
        ...
      cdc19470
    • L
      Merge tag 'for-4.11/linus-merge-signed' of git://git.kernel.dk/linux-block · 772c8f6f
      Linus Torvalds 提交于
      Pull block layer updates from Jens Axboe:
      
       - blk-mq scheduling framework from me and Omar, with a port of the
         deadline scheduler for this framework. A port of BFQ from Paolo is in
         the works, and should be ready for 4.12.
      
       - Various fixups and improvements to the above scheduling framework
         from Omar, Paolo, Bart, me, others.
      
       - Cleanup of the exported sysfs blk-mq data into debugfs, from Omar.
         This allows us to export more information that helps debug hangs or
         performance issues, without cluttering or abusing the sysfs API.
      
       - Fixes for the sbitmap code, the scalable bitmap code that was
         migrated from blk-mq, from Omar.
      
       - Removal of the BLOCK_PC support in struct request, and refactoring of
         carrying SCSI payloads in the block layer. This cleans up the code
         nicely, and enables us to kill the SCSI specific parts of struct
         request, shrinking it down nicely. From Christoph mainly, with help
         from Hannes.
      
       - Support for ranged discard requests and discard merging, also from
         Christoph.
      
       - Support for OPAL in the block layer, and for NVMe as well. Mainly
         from Scott Bauer, with fixes/updates from various others folks.
      
       - Error code fixup for gdrom from Christophe.
      
       - cciss pci irq allocation cleanup from Christoph.
      
       - Making the cdrom device operations read only, from Kees Cook.
      
       - Fixes for duplicate bdi registrations and bdi/queue life time
         problems from Jan and Dan.
      
       - Set of fixes and updates for lightnvm, from Matias and Javier.
      
       - A few fixes for nbd from Josef, using idr to name devices and a
         workqueue deadlock fix on receive. Also marks Josef as the current
         maintainer of nbd.
      
       - Fix from Josef, overwriting queue settings when the number of
         hardware queues is updated for a blk-mq device.
      
       - NVMe fix from Keith, ensuring that we don't repeatedly mark and IO
         aborted, if we didn't end up aborting it.
      
       - SG gap merging fix from Ming Lei for block.
      
       - Loop fix also from Ming, fixing a race and crash between setting loop
         status and IO.
      
       - Two block race fixes from Tahsin, fixing request list iteration and
         fixing a race between device registration and udev device add
         notifiations.
      
       - Double free fix from cgroup writeback, from Tejun.
      
       - Another double free fix in blkcg, from Hou Tao.
      
       - Partition overflow fix for EFI from Alden Tondettar.
      
      * tag 'for-4.11/linus-merge-signed' of git://git.kernel.dk/linux-block: (156 commits)
        nvme: Check for Security send/recv support before issuing commands.
        block/sed-opal: allocate struct opal_dev dynamically
        block/sed-opal: tone down not supported warnings
        block: don't defer flushes on blk-mq + scheduling
        blk-mq-sched: ask scheduler for work, if we failed dispatching leftovers
        blk-mq: don't special case flush inserts for blk-mq-sched
        blk-mq-sched: don't add flushes to the head of requeue queue
        blk-mq: have blk_mq_dispatch_rq_list() return if we queued IO or not
        block: do not allow updates through sysfs until registration completes
        lightnvm: set default lun range when no luns are specified
        lightnvm: fix off-by-one error on target initialization
        Maintainers: Modify SED list from nvme to block
        Move stack parameters for sed_ioctl to prevent oversized stack with CONFIG_KASAN
        uapi: sed-opal fix IOW for activate lsp to use correct struct
        cdrom: Make device operations read-only
        elevator: fix loading wrong elevator type for blk-mq devices
        cciss: switch to pci_irq_alloc_vectors
        block/loop: fix race between I/O and set_status
        blk-mq-sched: don't hold queue_lock when calling exit_icq
        block: set make_request_fn manually in blk_mq_update_nr_hw_queues
        ...
      772c8f6f
    • M
      sched/core: Fix build paravirt build on arm and arm64 · fd4a61e0
      Mark Brown 提交于
      Commit 004172bd ("sched/core: Remove unnecessary #include headers")
      removed the inclusion of asm/paravirt.h which is used to get
      declarations of paravirt_steal_rq_enabled and paravirt_steal_clock.
      
      It is implicitly included on x86 but not on arm and arm64 breaking the
      build if paravirtualization is used.  Since things from that header are
      used directly fix the build by putting the direct inclusion back.
      Signed-off-by: NMark Brown <broonie@kernel.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      fd4a61e0
    • M
      net: socket: fix recvmmsg not returning error from sock_error · e623a9e9
      Maxime Jayat 提交于
      Commit 34b88a68 ("net: Fix use after free in the recvmmsg exit path"),
      changed the exit path of recvmmsg to always return the datagrams
      variable and modified the error paths to set the variable to the error
      code returned by recvmsg if necessary.
      
      However in the case sock_error returned an error, the error code was
      then ignored, and recvmmsg returned 0.
      
      Change the error path of recvmmsg to correctly return the error code
      of sock_error.
      
      The bug was triggered by using recvmmsg on a CAN interface which was
      not up. Linux 4.6 and later return 0 in this case while earlier
      releases returned -ENETDOWN.
      
      Fixes: 34b88a68 ("net: Fix use after free in the recvmmsg exit path")
      Signed-off-by: NMaxime Jayat <maxime.jayat@mobile-devices.fr>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e623a9e9
    • T
      bnxt_en: use eth_hw_addr_random() · 1faaa78f
      Tobias Klauser 提交于
      Use eth_hw_addr_random() to set a random MAC address in order to make
      sure bp->dev->addr_assign_type will be properly set to NET_ADDR_RANDOM.
      Signed-off-by: NTobias Klauser <tklauser@distanz.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1faaa78f