1. 05 Nov, 2015 9 commits
    • Marcel Holtmann's avatar
      Bluetooth: Check for supported white list before issuing commands · 2ab216a7
      Marcel Holtmann authored
      The white list commands might not be implemented if the controller does
      not actually support the white list. So check the supported commands
      first before issuing these commands. Not supporting the white list is
      the same as supporting a white list with zero size.
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
      2ab216a7
    • Kuba Pawlak's avatar
      Bluetooth: Fix possible deadlock in btusb · f6fc86f2
      Kuba Pawlak authored
      commit 8f9d02f4 introduced spinlocks
      in btusb_work. This is run in a context of a worqueue and can be interrupted
      by hardware irq. If it happens while spinlock is held, we have a deadlock.
      Solution is to use _irqsave/_resore version of locking
      
      [  466.460560] =================================
      [  466.460565] [ INFO: inconsistent lock state ]
      [  466.460572] 4.3.0-rc6+ #1 Tainted: G        W
      [  466.460576] ---------------------------------
      [  466.460582] inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage.
      [  466.460589] kworker/0:2/94 [HC0[0]:SC0[0]:HE1:SE1] takes:
      [  466.460595]  (&(&data->rxlock)->rlock){?.-...}, at: [<ffffffffa0526923>] btusb_work+0xa3/0x3fd [btusb]
      [  466.460621] {IN-HARDIRQ-W} state was registered at:
      [  466.460625]   [<ffffffff811021b5>] __lock_acquire+0xc45/0x1e80
      [  466.460638]   [<ffffffff811040d5>] lock_acquire+0xe5/0x1f0
      [  466.460646]   [<ffffffff8182f108>] _raw_spin_lock+0x38/0x50
      [  466.460657]   [<ffffffffa0525448>] btusb_recv_intr+0x38/0x170 [btusb]
      [  466.460668]   [<ffffffffa0525626>] btusb_intr_complete+0xa6/0x130 [btusb]
      [  466.460679]   [<ffffffff815d8f1e>] __usb_hcd_giveback_urb+0x8e/0x160
      [  466.460690]   [<ffffffff815d911f>] usb_hcd_giveback_urb+0x3f/0x120
      [  466.460698]   [<ffffffff81606e4d>] uhci_giveback_urb+0xad/0x280
      [  466.460706]   [<ffffffff81608f64>] uhci_scan_schedule.part.33+0x6b4/0xbe0
      [  466.460714]   [<ffffffff81609b50>] uhci_irq+0xd0/0x180
      [  466.460722]   [<ffffffff815d8296>] usb_hcd_irq+0x26/0x40
      [  466.460729]   [<ffffffff81117d40>] handle_irq_event_percpu+0x40/0x300
      [  466.460739]   [<ffffffff81118040>] handle_irq_event+0x40/0x60
      [  466.460746]   [<ffffffff8111af39>] handle_fasteoi_irq+0x89/0x150
      [  466.460754]   [<ffffffff8101e0f3>] handle_irq+0x73/0x120
      [  466.460763]   [<ffffffff81832f11>] do_IRQ+0x61/0x120
      [  466.460772]   [<ffffffff8183084c>] ret_from_intr+0x0/0x31
      [  466.460780]   [<ffffffff81697a77>] cpuidle_enter+0x17/0x20
      [  466.460790]   [<ffffffff810f62c2>] call_cpuidle+0x32/0x60
      [  466.460800]   [<ffffffff810f65a8>] cpu_startup_entry+0x2b8/0x3f0
      [  466.460807]   [<ffffffff818214ca>] rest_init+0x13a/0x140
      [  466.460817]   [<ffffffff81f76029>] start_kernel+0x4a3/0x4c4
      [  466.460827]   [<ffffffff81f75339>] x86_64_start_reservations+0x2a/0x2c
      [  466.460837]   [<ffffffff81f75485>] x86_64_start_kernel+0x14a/0x16d
      [  466.460846] irq event stamp: 754913
      [  466.460851] hardirqs last  enabled at (754913): [<ffffffff8182f4cc>] _raw_spin_unlock_irq+0x2c/0x40
      [  466.460861] hardirqs last disabled at (754912): [<ffffffff8182f28d>] _raw_spin_lock_irq+0x1d/0x60
      [  466.460869] softirqs last  enabled at (753024): [<ffffffff810aeaa0>] __do_softirq+0x380/0x490
      [  466.460880] softirqs last disabled at (753009): [<ffffffff810aedef>] irq_exit+0x10f/0x120
      [  466.460888]
                     other info that might help us debug this:
      [  466.460894]  Possible unsafe locking scenario:
      
      [  466.460899]        CPU0
      [  466.460903]        ----
      [  466.460907]   lock(&(&data->rxlock)->rlock);
      [  466.460915]   <Interrupt>
      [  466.460918]     lock(&(&data->rxlock)->rlock);
      [  466.460926]
                      *** DEADLOCK ***
      
      [  466.460935] 2 locks held by kworker/0:2/94:
      [  466.460939]  #0:  ("events"){.+.+.+}, at: [<ffffffff810c69bb>] process_one_work+0x16b/0x660
      [  466.460958]  #1:  ((&data->work)){+.+...}, at: [<ffffffff810c69bb>] process_one_work+0x16b/0x660
      [  466.460974]
      Signed-off-by: default avatarKuba Pawlak <kubax.t.pawlak@intel.com>
      Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
      f6fc86f2
    • David Ahern's avatar
      net: Fix prefsrc lookups · e1b8d903
      David Ahern authored
      A bug report (https://bugzilla.kernel.org/show_bug.cgi?id=107071) noted
      that the follwoing ip command is failing with v4.3:
      
          $ ip route add 10.248.5.0/24 dev bond0.250 table vlan_250 src 10.248.5.154
          RTNETLINK answers: Invalid argument
      
      021dd3b8 changed the lookup of the given preferred source address to
      use the table id passed in, but this assumes the local entries are in the
      given table which is not necessarily true for non-VRF use cases. When
      validating the preferred source fallback to the local table on failure.
      
      Fixes: 021dd3b8 ("net: Add routes to the table associated with the device")
      Signed-off-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e1b8d903
    • WANG Cong's avatar
      ipv4: fix a potential deadlock in mcast getsockopt() path · 87e9f031
      WANG Cong authored
      Sasha reported the following lockdep warning:
      
        Possible unsafe locking scenario:
      
              CPU0                    CPU1
              ----                    ----
         lock(sk_lock-AF_INET);
                                      lock(rtnl_mutex);
                                      lock(sk_lock-AF_INET);
         lock(rtnl_mutex);
      
      This is due to that for IP_MSFILTER and MCAST_MSFILTER, we take
      rtnl lock before the socket lock in setsockopt() path, but take
      the socket lock before rtnl lock in getsockopt() path. All the
      rest optnames are setsockopt()-only.
      
      Fix this by aligning the getsockopt() path with the setsockopt()
      path, so that all mcast socket path would be locked in the same
      order.
      
      Note, IPv6 part is different where rtnl lock is not held.
      
      Fixes: 54ff9ef3 ("ipv4, ipv6: kill ip_mc_{join, leave}_group and ipv6_sock_mc_{join, drop}")
      Reported-by: default avatarSasha Levin <sasha.levin@oracle.com>
      Cc: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
      Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
      Reviewed-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      87e9f031
    • WANG Cong's avatar
      ipv4: disable BH when changing ip local port range · 4ee3bd4a
      WANG Cong authored
      This fixes the following lockdep warning:
      
       [ INFO: inconsistent lock state ]
       4.3.0-rc7+ #1197 Not tainted
       ---------------------------------
       inconsistent {IN-SOFTIRQ-R} -> {SOFTIRQ-ON-W} usage.
       sysctl/1019 [HC0[0]:SC0[0]:HE1:SE1] takes:
        (&(&net->ipv4.ip_local_ports.lock)->seqcount){+.+-..}, at: [<ffffffff81921de7>] ipv4_local_port_range+0xb4/0x12a
       {IN-SOFTIRQ-R} state was registered at:
         [<ffffffff810bd682>] __lock_acquire+0x2f6/0xdf0
         [<ffffffff810be6d5>] lock_acquire+0x11c/0x1a4
         [<ffffffff818e599c>] inet_get_local_port_range+0x4e/0xae
         [<ffffffff8166e8e3>] udp_flow_src_port.constprop.40+0x23/0x116
         [<ffffffff81671cb9>] vxlan_xmit_one+0x219/0xa6a
         [<ffffffff81672f75>] vxlan_xmit+0xa6b/0xaa5
         [<ffffffff817f2deb>] dev_hard_start_xmit+0x2ae/0x465
         [<ffffffff817f35ed>] __dev_queue_xmit+0x531/0x633
         [<ffffffff817f3702>] dev_queue_xmit_sk+0x13/0x15
         [<ffffffff818004a5>] neigh_resolve_output+0x12f/0x14d
         [<ffffffff81959cfa>] ip6_finish_output2+0x344/0x39f
         [<ffffffff8195bf58>] ip6_finish_output+0x88/0x8e
         [<ffffffff8195bfef>] ip6_output+0x91/0xe5
         [<ffffffff819792ae>] dst_output_sk+0x47/0x4c
         [<ffffffff81979392>] NF_HOOK_THRESH.constprop.30+0x38/0x82
         [<ffffffff8197981e>] mld_sendpack+0x189/0x266
         [<ffffffff8197b28b>] mld_ifc_timer_expire+0x1ef/0x223
         [<ffffffff810de581>] call_timer_fn+0xfb/0x28c
         [<ffffffff810ded1e>] run_timer_softirq+0x1c7/0x1f1
      
      Fixes: b8f1a556 ("udp: Add function to make source port for UDP tunnels")
      Cc: Tom Herbert <tom@herbertland.com>
      Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4ee3bd4a
    • Sergei Shtylyov's avatar
      sh_eth: merge sh_eth_free_dma_buffer() into sh_eth_ring_free() · 8e03a5e7
      Sergei Shtylyov authored
      While the ring allocation is done by a single function, sh_eth_ring_init(),
      the ring deallocation was split into two functions (almost always called
      one after the other) for no good reason. Merge  sh_eth_free_dma_buffer()
      into sh_eth_ring_free() which allows us  to save space not only on the
      direct calls  of the former function but also on the sh_eth_ring_init()'s
      simplified error path...
      Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8e03a5e7
    • Sergei Shtylyov's avatar
      sh_eth: kill 'ret' variable in sh_eth_ring_init() · 91d80683
      Sergei Shtylyov authored
      The 'ret' local variable in sh_eth_ring_init() serves no useful purpose as
      the only  values it gets assigned are 0 and -ENOMEM both of which could be
      returned directly...
      Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      91d80683
    • Markus Brunner's avatar
      drivers: net: cpsw: Add support for fixed-link PHY · 1f71e8c9
      Markus Brunner authored
      Add support for a fixed-link devicetree sub-node in case the the
      cpsw MAC is directly connected to a non-mdio PHY/device.
      Signed-off-by: default avatarMarkus Brunner <systemprogrammierung.brunner@gmail.com>
      Acked-by: default avatarMugunthan V N <mugunthanvnm@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1f71e8c9
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf · d9c7dbc1
      David S. Miller authored
      Conflicts:
      	net/netfilter/xt_TEE.c
      
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter fixes for net
      
      The following patchset contains Netfilter fixes for your net tree,
      they are:
      
      1) Fix crash when TEE target is used with no --oif, from Eric Dumazet.
      
      2) Oneliner to fix a crash on the redirect traffic to localhost
         infrastructure when interface has not yet an address, from
         Munehisa Kamata.
      
      3) Oneliner not to request module all the time from nfnetlink due to
         wrong type value, from Florian Westphal.
      
      I'll make sure these patches 1 and 2 hit -stable.
      ====================
      
      The conflict in net/netfilter/xt_TEE.c was minor, a change
      to the 'oif' selection overlapping a function signature
      change for the nf_dup_ipv{4,6}() routines.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d9c7dbc1
  2. 04 Nov, 2015 18 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · 1b1050cd
      Linus Torvalds authored
      Pull IDE fixlet from David Miller:
       "Just a y2038 fix to the pdc202xx_new IDE driver"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        ide: pdc202xx_new: Replace timeval with ktime_t
      1b1050cd
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · b0f85fa1
      Linus Torvalds authored
      Pull networking updates from David Miller:
      
      Changes of note:
      
       1) Allow to schedule ICMP packets in IPVS, from Alex Gartrell.
      
       2) Provide FIB table ID in ipv4 route dumps just as ipv6 does, from
          David Ahern.
      
       3) Allow the user to ask for the statistics to be filtered out of
          ipv4/ipv6 address netlink dumps.  From Sowmini Varadhan.
      
       4) More work to pass the network namespace context around deep into
          various packet path APIs, starting with the netfilter hooks.  From
          Eric W Biederman.
      
       5) Add layer 2 TX/RX checksum offloading to qeth driver, from Thomas
          Richter.
      
       6) Use usec resolution for SYN/ACK RTTs in TCP, from Yuchung Cheng.
      
       7) Support Very High Throughput in wireless MESH code, from Bob
          Copeland.
      
       8) Allow setting the ageing_time in switchdev/rocker.  From Scott
          Feldman.
      
       9) Properly autoload L2TP type modules, from Stephen Hemminger.
      
      10) Fix and enable offload features by default in 8139cp driver, from
          David Woodhouse.
      
      11) Support both ipv4 and ipv6 sockets in a single vxlan device, from
          Jiri Benc.
      
      12) Fix CWND limiting of thin streams in TCP, from Bendik Rønning
          Opstad.
      
      13) Fix IPSEC flowcache overflows on large systems, from Steffen
          Klassert.
      
      14) Convert bridging to track VLANs using rhashtable entries rather than
          a bitmap.  From Nikolay Aleksandrov.
      
      15) Make TCP listener handling completely lockless, this is a major
          accomplishment.  Incoming request sockets now live in the
          established hash table just like any other socket too.
      
          From Eric Dumazet.
      
      15) Provide more bridging attributes to netlink, from Nikolay
          Aleksandrov.
      
      16) Use hash based algorithm for ipv4 multipath routing, this was very
          long overdue.  From Peter Nørlund.
      
      17) Several y2038 cures, mostly avoiding timespec.  From Arnd Bergmann.
      
      18) Allow non-root execution of EBPF programs, from Alexei Starovoitov.
      
      19) Support SO_INCOMING_CPU as setsockopt, from Eric Dumazet.  This
          influences the port binding selection logic used by SO_REUSEPORT.
      
      20) Add ipv6 support to VRF, from David Ahern.
      
      21) Add support for Mellanox Spectrum switch ASIC, from Jiri Pirko.
      
      22) Add rtl8xxxu Realtek wireless driver, from Jes Sorensen.
      
      23) Implement RACK loss recovery in TCP, from Yuchung Cheng.
      
      24) Support multipath routes in MPLS, from Roopa Prabhu.
      
      25) Fix POLLOUT notification for listening sockets in AF_UNIX, from Eric
          Dumazet.
      
      26) Add new QED Qlogic river, from Yuval Mintz, Manish Chopra, and
          Sudarsana Kalluru.
      
      27) Don't fetch timestamps on AF_UNIX sockets, from Hannes Frederic
          Sowa.
      
      28) Support ipv6 geneve tunnels, from John W Linville.
      
      29) Add flood control support to switchdev layer, from Ido Schimmel.
      
      30) Fix CHECKSUM_PARTIAL handling of potentially fragmented frames, from
          Hannes Frederic Sowa.
      
      31) Support persistent maps and progs in bpf, from Daniel Borkmann.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1790 commits)
        sh_eth: use DMA barriers
        switchdev: respect SKIP_EOPNOTSUPP flag in case there is no recursion
        net: sched: kill dead code in sch_choke.c
        irda: Delete an unnecessary check before the function call "irlmp_unregister_service"
        net: dsa: mv88e6xxx: include DSA ports in VLANs
        net: dsa: mv88e6xxx: disable SA learning for DSA and CPU ports
        net/core: fix for_each_netdev_feature
        vlan: Invoke driver vlan hooks only if device is present
        arcnet/com20020: add LEDS_CLASS dependency
        bpf, verifier: annotate verbose printer with __printf
        dp83640: Only wait for timestamps for packets with timestamping enabled.
        ptp: Change ptp_class to a proper bitmask
        dp83640: Prune rx timestamp list before reading from it
        dp83640: Delay scheduled work.
        dp83640: Include hash in timestamp/packet matching
        ipv6: fix tunnel error handling
        net/mlx5e: Fix LSO vlan insertion
        net/mlx5e: Re-eanble client vlan TX acceleration
        net/mlx5e: Return error in case mlx5e_set_features() fails
        net/mlx5e: Don't allow more than max supported channels
        ...
      b0f85fa1
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · ccc9d4a6
      Linus Torvalds authored
      Pull crypto update from Herbert Xu:
       "API:
      
         - Add support for cipher output IVs in testmgr
         - Add missing crypto_ahash_blocksize helper
         - Mark authenc and des ciphers as not allowed under FIPS.
      
      Algorithms:
      
         - Add CRC support to 842 compression
         - Add keywrap algorithm
         - A number of changes to the akcipher interface:
            + Separate functions for setting public/private keys.
            + Use SG lists.
      
      Drivers:
      
         - Add Intel SHA Extension optimised SHA1 and SHA256
         - Use dma_map_sg instead of custom functions in crypto drivers
         - Add support for STM32 RNG
         - Add support for ST RNG
         - Add Device Tree support to exynos RNG driver
         - Add support for mxs-dcp crypto device on MX6SL
         - Add xts(aes) support to caam
         - Add ctr(aes) and xts(aes) support to qat
         - A large set of fixes from Russell King for the marvell/cesa driver"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (115 commits)
        crypto: asymmetric_keys - Fix unaligned access in x509_get_sig_params()
        crypto: akcipher - Don't #include crypto/public_key.h as the contents aren't used
        hwrng: exynos - Add Device Tree support
        hwrng: exynos - Fix missing configuration after suspend to RAM
        hwrng: exynos - Add timeout for waiting on init done
        dt-bindings: rng: Describe Exynos4 PRNG bindings
        crypto: marvell/cesa - use __le32 for hardware descriptors
        crypto: marvell/cesa - fix missing cpu_to_le32() in mv_cesa_dma_add_op()
        crypto: marvell/cesa - use memcpy_fromio()/memcpy_toio()
        crypto: marvell/cesa - use gfp_t for gfp flags
        crypto: marvell/cesa - use dma_addr_t for cur_dma
        crypto: marvell/cesa - use readl_relaxed()/writel_relaxed()
        crypto: caam - fix indentation of close braces
        crypto: caam - only export the state we really need to export
        crypto: caam - fix non-block aligned hash calculation
        crypto: caam - avoid needlessly saving and restoring caam_hash_ctx
        crypto: caam - print errno code when hash registration fails
        crypto: marvell/cesa - fix memory leak
        crypto: marvell/cesa - fix first-fragment handling in mv_cesa_ahash_dma_last_req()
        crypto: marvell/cesa - rearrange handling for sw padded hashes
        ...
      ccc9d4a6
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 66ef3493
      Linus Torvalds authored
      Pull x86 platform changes from Ingo Molnar:
       "Misc updates to the Intel MID and SGI UV platforms"
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/intel-mid: Make intel_mid_ops static
        arch/x86/intel-mid: Use kmemdup rather than duplicating its implementation
        x86/platform/uv: Implement simple dump failover if kdump fails
        x86/platform/uv: Insert per_cpu accessor function on uv_hub_nmi
      66ef3493
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 639ab3eb
      Linus Torvalds authored
      Pull x86 mm changes from Ingo Molnar:
       "The main changes are: continued PAT work by Toshi Kani, plus a new
        boot time warning about insecure RWX kernel mappings, by Stephen
        Smalley.
      
        The new CONFIG_DEBUG_WX=y warning is marked default-y if
        CONFIG_DEBUG_RODATA=y is already eanbled, as a special exception, as
        these bugs are hard to notice and this check already found several
        live bugs"
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mm: Warn on W^X mappings
        x86/mm: Fix no-change case in try_preserve_large_page()
        x86/mm: Fix __split_large_page() to handle large PAT bit
        x86/mm: Fix try_preserve_large_page() to handle large PAT bit
        x86/mm: Fix gup_huge_p?d() to handle large PAT bit
        x86/mm: Fix slow_virt_to_phys() to handle large PAT bit
        x86/mm: Fix page table dump to show PAT bit
        x86/asm: Add pud_pgprot() and pmd_pgprot()
        x86/asm: Fix pud/pmd interfaces to handle large PAT bit
        x86/asm: Add pud/pmd mask interfaces to handle large PAT bit
        x86/asm: Move PUD_PAGE macros to page_types.h
        x86/vdso32: Define PGTABLE_LEVELS to 32bit VDSO
      639ab3eb
    • Linus Torvalds's avatar
      Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4302d506
      Linus Torvalds authored
      Pull x86 sigcontext header cleanups from Ingo Molnar:
       "This series reorganizes and cleans up various aspects of the main
        sigcontext UAPI headers, such as unifying the data structures and
        updating/adding lots of comments to explain all the ABI details and
        quirks.  The headers can now also be built in user-space standalone"
      
      * 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/headers: Clean up too long lines
        x86/headers: Remove <asm/sigcontext.h> references on the kernel side
        x86/headers: Remove direct sigcontext32.h uses
        x86/headers: Convert sigcontext_ia32 uses to sigcontext_32
        x86/headers: Unify 'struct sigcontext_ia32' and 'struct sigcontext_32'
        x86/headers: Make sigcontext pointers bit independent
        x86/headers: Move the 'struct sigcontext' definitions into the UAPI header
        x86/headers: Clean up the kernel's struct sigcontext types to be ABI-clean
        x86/headers: Convert uses of _fpstate_ia32 to _fpstate_32
        x86/headers: Unify 'struct _fpstate_ia32' and i386 struct _fpstate
        x86/headers: Unify register type definitions between 32-bit compat and i386
        x86/headers: Use ABI types consistently in sigcontext*.h
        x86/headers: Separate out legacy user-space structure definitions
        x86/headers: Clean up and better document uapi/asm/sigcontext.h
        x86/headers: Clean up uapi/asm/sigcontext32.h
        x86/headers: Fix (old) header file dependency bug in uapi/asm/sigcontext32.h
      4302d506
    • Linus Torvalds's avatar
      Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ce4d72fa
      Linus Torvalds authored
      Pull x86 fpu changes from Ingo Molnar:
       "There are two main areas of changes:
      
         - Rework of the extended FPU state code to robustify the kernel's
           usage of cpuid provided xstate sizes - and related changes (Dave
           Hansen)"
      
         - math emulation enhancements: new modern FPU instructions support,
           with testcases, plus cleanups (Denys Vlasnko)"
      
      * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
        x86/fpu: Fixup uninitialized feature_name warning
        x86/fpu/math-emu: Add support for FISTTP instructions
        x86/fpu/math-emu, selftests: Add test for FISTTP instructions
        x86/fpu/math-emu: Add support for FCMOVcc insns
        x86/fpu/math-emu: Add support for F[U]COMI[P] insns
        x86/fpu/math-emu: Remove define layer for undocumented opcodes
        x86/fpu/math-emu, selftests: Add tests for FCMOV and FCOMI insns
        x86/fpu/math-emu: Remove !NO_UNDOC_CODE
        x86/fpu: Check CPU-provided sizes against struct declarations
        x86/fpu: Check to ensure increasing-offset xstate offsets
        x86/fpu: Correct and check XSAVE xstate size calculations
        x86/fpu: Add C structures for AVX-512 state components
        x86/fpu: Rework YMM definition
        x86/fpu/mpx: Rework MPX 'xstate' types
        x86/fpu: Add xfeature_enabled() helper instead of test_bit()
        x86/fpu: Remove 'xfeature_nr'
        x86/fpu: Rework XSTATE_* macros to remove magic '2'
        x86/fpu: Rename XFEATURES_NR_MAX
        x86/fpu: Rename XSAVE macros
        x86/fpu: Remove partial LWP support definitions
        ...
      ce4d72fa
    • Linus Torvalds's avatar
      Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0f25f2c1
      Linus Torvalds authored
      Pull x86 kgdb fixlet from Ingo Molnar:
       "A single debugging related commit: compress the memory usage of a kgdb
        data structure"
      
      * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/kgdb: Replace bool_int_array[NR_CPUS] with bitmap
      0f25f2c1
    • Linus Torvalds's avatar
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f323c49b
      Linus Torvalds authored
      Pull x86 cpu changes from Ingo Molnar:
       "Two changes in this cycle: a Kconfig help text enhancement, and an AMD
        CLZERO instruction capability detection and enumeration"
      
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/cpu: Add CLZERO detection
        x86/Kconfig/cpus: Fix/complete CPU type help texts
      f323c49b
    • Linus Torvalds's avatar
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 33d46f97
      Linus Torvalds authored
      Pull x86 cleanups from Ingo Molnar:
       "An early_printk cleanup plus deinlining enhancements"
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/early_printk: Set __iomem address space for IO
        x86/signal: Deinline get_sigframe, save 240 bytes
        x86: Deinline early_console_register, save 403 bytes
        x86/e820: Deinline e820_type_to_string, save 126 bytes
      33d46f97
    • Linus Torvalds's avatar
      Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 378e4e98
      Linus Torvalds authored
      Pull x86 boot cleanup from Ingo Molnar:
       "A single commit: remove an obsolete kcrash boot flag"
      
      * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/kexec: Remove obsolete 'in_crash_kexec' flag
      378e4e98
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a75a3f6f
      Linus Torvalds authored
      Pull x86 asm changes from Ingo Molnar:
       "The main change in this cycle is another step in the big x86 system
        call interface rework by Andy Lutomirski, which moves most of the low
        level x86 entry code from assembly to C, for all syscall entries
        except native 64-bit system calls:
      
          arch/x86/entry/entry_32.S        | 182 ++++------
          arch/x86/entry/entry_64_compat.S | 547 ++++++++-----------------------
          194 insertions(+), 535 deletions(-)
      
        ... our hope is that the final remaining step (converting native
        64-bit system calls) will be less painful as all the previous steps,
        given that most of the legacies and quirks are concentrated around
        native 32-bit and compat environments"
      
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (47 commits)
        x86/entry/32: Fix FS and GS restore in opportunistic SYSEXIT
        x86/entry/32: Fix entry_INT80_32() to expect interrupts to be on
        um/x86: Fix build after x86 syscall changes
        x86/asm: Remove the xyz_cfi macros from dwarf2.h
        selftests/x86: Style fixes for the 'unwind_vdso' test
        x86/entry/64/compat: Document sysenter_fix_flags's reason for existence
        x86/entry: Split and inline syscall_return_slowpath()
        x86/entry: Split and inline prepare_exit_to_usermode()
        x86/entry: Use pt_regs_to_thread_info() in syscall entry tracing
        x86/entry: Hide two syscall entry assertions behind CONFIG_DEBUG_ENTRY
        x86/entry: Micro-optimize compat fast syscall arg fetch
        x86/entry: Force inlining of 32-bit syscall code
        x86/entry: Make irqs_disabled checks in exit code depend on lockdep
        x86/entry: Remove unnecessary IRQ twiddling in fast 32-bit syscalls
        x86/asm: Remove thread_info.sysenter_return
        x86/entry/32: Re-implement SYSENTER using the new C path
        x86/entry/32: Switch INT80 to the new C syscall path
        x86/entry/32: Open-code return tracking from fork and kthreads
        x86/entry/compat: Implement opportunistic SYSRETL for compat syscalls
        x86/vdso/compat: Wire up SYSENTER and SYSCSALL for compat userspace
        ...
      a75a3f6f
    • Linus Torvalds's avatar
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d2bea739
      Linus Torvalds authored
      Pull x86 apic changes from Ingo Molnar:
       "The main changes in this cycle were:
      
         - Numachip updates: new hardware support, fixes and cleanups.
           (Daniel J Blueman)
      
         - misc smaller cleanups and fixlets"
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/io_apic: Make eoi_ioapic_pin() static
        x86/irq: Drop unlikely before IS_ERR_OR_NULL
        x86/x2apic: Make stub functions available even if !CONFIG_X86_LOCAL_APIC
        x86/apic: Deinline various functions
        x86/numachip: Fix timer build conflict
        x86/numachip: Introduce Numachip2 timer mechanisms
        x86/numachip: Add Numachip IPI optimisations
        x86/numachip: Add Numachip2 APIC support
        x86/numachip: Cleanup Numachip support
      d2bea739
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 53528695
      Linus Torvalds authored
      Pull scheduler changes from Ingo Molnar:
       "The main changes in this cycle were:
      
         - sched/fair load tracking fixes and cleanups (Byungchul Park)
      
         - Make load tracking frequency scale invariant (Dietmar Eggemann)
      
         - sched/deadline updates (Juri Lelli)
      
         - stop machine fixes, cleanups and enhancements for bugs triggered by
           CPU hotplug stress testing (Oleg Nesterov)
      
         - scheduler preemption code rework: remove PREEMPT_ACTIVE and related
           cleanups (Peter Zijlstra)
      
         - Rework the sched_info::run_delay code to fix races (Peter Zijlstra)
      
         - Optimize per entity utilization tracking (Peter Zijlstra)
      
         - ... misc other fixes, cleanups and smaller updates"
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (57 commits)
        sched: Don't scan all-offline ->cpus_allowed twice if !CONFIG_CPUSETS
        sched: Move cpu_active() tests from stop_two_cpus() into migrate_swap_stop()
        sched: Start stopper early
        stop_machine: Kill cpu_stop_threads->setup() and cpu_stop_unpark()
        stop_machine: Kill smp_hotplug_thread->pre_unpark, introduce stop_machine_unpark()
        stop_machine: Change cpu_stop_queue_two_works() to rely on stopper->enabled
        stop_machine: Introduce __cpu_stop_queue_work() and cpu_stop_queue_two_works()
        stop_machine: Ensure that a queued callback will be called before cpu_stop_park()
        sched/x86: Fix typo in __switch_to() comments
        sched/core: Remove a parameter in the migrate_task_rq() function
        sched/core: Drop unlikely behind BUG_ON()
        sched/core: Fix task and run queue sched_info::run_delay inconsistencies
        sched/numa: Fix task_tick_fair() from disabling numa_balancing
        sched/core: Add preempt_count invariant check
        sched/core: More notrace annotations
        sched/core: Kill PREEMPT_ACTIVE
        sched/core, sched/x86: Kill thread_info::saved_preempt_count
        sched/core: Simplify preempt_count tests
        sched/core: Robustify preemption leak checks
        sched/core: Stop setting PREEMPT_ACTIVE
        ...
      53528695
    • Linus Torvalds's avatar
      Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b831ef2c
      Linus Torvalds authored
      Pull RAS changes from Ingo Molnar:
       "The main system reliability related changes were from x86, but also
        some generic RAS changes:
      
         - AMD MCE error injection subsystem enhancements.  (Aravind
           Gopalakrishnan)
      
         - Fix MCE and CPU hotplug interaction bug.  (Ashok Raj)
      
         - kcrash bootup robustness fix.  (Baoquan He)
      
         - kcrash cleanups.  (Borislav Petkov)
      
         - x86 microcode driver rework: simplify it by unmodularizing it and
           other cleanups.  (Borislav Petkov)"
      
      * 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
        x86/mce: Add a default case to the switch in __mcheck_cpu_ancient_init()
        x86/mce: Add a Scalable MCA vendor flags bit
        MAINTAINERS: Unify the microcode driver section
        x86/microcode/intel: Move #ifdef DEBUG inside the function
        x86/microcode/amd: Remove maintainers from comments
        x86/microcode: Remove modularization leftovers
        x86/microcode: Merge the early microcode loader
        x86/microcode: Unmodularize the microcode driver
        x86/mce: Fix thermal throttling reporting after kexec
        kexec/crash: Say which char is the unrecognized
        x86/setup/crash: Check memblock_reserve() retval
        x86/setup/crash: Cleanup some more
        x86/setup/crash: Remove alignment variable
        x86/setup: Cleanup crashkernel reservation functions
        x86/amd_nb, EDAC: Rename amd_get_node_id()
        x86/setup: Do not reserve crashkernel high memory if low reservation failed
        x86/microcode/amd: Do not overwrite final patch levels
        x86/microcode/amd: Extract current patch level read to a function
        x86/ras/mce_amd_inj: Inject bank 4 errors on the NBC
        x86/ras/mce_amd_inj: Trigger deferred and thresholding errors interrupts
        ...
      b831ef2c
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b02ac6b1
      Linus Torvalds authored
      Pull perf updates from Ingo Molnar:
       "Kernel side changes:
      
         - Improve accuracy of perf/sched clock on x86.  (Adrian Hunter)
      
         - Intel DS and BTS updates.  (Alexander Shishkin)
      
         - Intel cstate PMU support.  (Kan Liang)
      
         - Add group read support to perf_event_read().  (Peter Zijlstra)
      
         - Branch call hardware sampling support, implemented on x86 and
           PowerPC.  (Stephane Eranian)
      
         - Event groups transactional interface enhancements.  (Sukadev
           Bhattiprolu)
      
         - Enable proper x86/intel/uncore PMU support on multi-segment PCI
           systems.  (Taku Izumi)
      
         - ... misc fixes and cleanups.
      
        The perf tooling team was very busy again with 200+ commits, the full
        diff doesn't fit into lkml size limits.  Here's an (incomplete) list
        of the tooling highlights:
      
        New features:
      
         - Change the default event used in all tools (record/top): use the
           most precise "cycles" hw counter available, i.e. when the user
           doesn't specify any event, it will try using cycles:ppp, cycles:pp,
           etc and fall back transparently until it finds a working counter.
           (Arnaldo Carvalho de Melo)
      
         - Integration of perf with eBPF that, given an eBPF .c source file
           (or .o file built for the 'bpf' target with clang), will get it
           automatically built, validated and loaded into the kernel via the
           sys_bpf syscall, which can then be used and seen using 'perf trace'
           and other tools.
      
           (Wang Nan)
      
        Various user interface improvements:
      
         - Automatic pager invocation on long help output.  (Namhyung Kim)
      
         - Search for more options when passing args to -h, e.g.: (Arnaldo
           Carvalho de Melo)
      
              $ perf report -h interface
      
              Usage: perf report [<options>]
      
               --gtk    Use the GTK2 interface
               --stdio  Use the stdio interface
               --tui    Use the TUI interface
      
         - Show ordered command line options when -h is used or when an
           unknown option is specified.  (Arnaldo Carvalho de Melo)
      
         - If options are passed after -h, show just its descriptions, not all
           options.  (Arnaldo Carvalho de Melo)
      
         - Implement column based horizontal scrolling in the hists browser
           (top, report), making it possible to use the TUI for things like
           'perf mem report' where there are many more columns than can fit in
           a terminal.  (Arnaldo Carvalho de Melo)
      
         - Enhance the error reporting of tracepoint event parsing, e.g.:
      
             $ oldperf record -e sched:sched_switc usleep 1
             event syntax error: 'sched:sched_switc'
                                  \___ unknown tracepoint
             Run 'perf list' for a list of valid events
      
           Now we get the much nicer:
      
             $ perf record -e sched:sched_switc ls
             event syntax error: 'sched:sched_switc'
                                  \___ can't access trace events
      
             Error: No permissions to read /sys/kernel/debug/tracing/events/sched/sched_switc
             Hint:  Try 'sudo mount -o remount,mode=755 /sys/kernel/debug'
      
           And after we have those mount point permissions fixed:
      
             $ perf record -e sched:sched_switc ls
             event syntax error: 'sched:sched_switc'
                                  \___ unknown tracepoint
      
             Error: File /sys/kernel/debug/tracing/events/sched/sched_switc not found.
             Hint:  Perhaps this kernel misses some CONFIG_ setting to enable this feature?.
      
           I.e.  basically now the event parsing routing uses the strerror_open()
           routines introduced by and used in 'perf trace' work.  (Jiri Olsa)
      
         - Fail properly when pattern matching fails to find a tracepoint,
           i.e. '-e non:existent' was being correctly handled, with a proper
           error message about that not being a valid event, but '-e
           non:existent*' wasn't, fix it.  (Jiri Olsa)
      
         - Do event name substring search as last resort in 'perf list'.
           (Arnaldo Carvalho de Melo)
      
           E.g.:
      
             # perf list clock
      
             List of pre-defined events (to be used in -e):
      
              cpu-clock                                          [Software event]
              task-clock                                         [Software event]
      
              uncore_cbox_0/clockticks/                          [Kernel PMU event]
              uncore_cbox_1/clockticks/                          [Kernel PMU event]
      
              kvm:kvm_pvclock_update                             [Tracepoint event]
              kvm:kvm_update_master_clock                        [Tracepoint event]
              power:clock_disable                                [Tracepoint event]
              power:clock_enable                                 [Tracepoint event]
              power:clock_set_rate                               [Tracepoint event]
              syscalls:sys_enter_clock_adjtime                   [Tracepoint event]
              syscalls:sys_enter_clock_getres                    [Tracepoint event]
              syscalls:sys_enter_clock_gettime                   [Tracepoint event]
              syscalls:sys_enter_clock_nanosleep                 [Tracepoint event]
              syscalls:sys_enter_clock_settime                   [Tracepoint event]
              syscalls:sys_exit_clock_adjtime                    [Tracepoint event]
              syscalls:sys_exit_clock_getres                     [Tracepoint event]
              syscalls:sys_exit_clock_gettime                    [Tracepoint event]
              syscalls:sys_exit_clock_nanosleep                  [Tracepoint event]
              syscalls:sys_exit_clock_settime                    [Tracepoint event]
      
        Intel PT hardware tracing enhancements:
      
         - Accept a zero --itrace period, meaning "as often as possible".  In
           the case of Intel PT that is the same as a period of 1 and a unit
           of 'instructions' (i.e.  --itrace=i1i).  (Adrian Hunter)
      
         - Harmonize itrace's synthesized callchains with the existing
           --max-stack tool option.  (Adrian Hunter)
      
         - Allow time to be displayed in nanoseconds in 'perf script'.
           (Adrian Hunter)
      
         - Fix potential infinite loop when handling Intel PT timestamps.
           (Adrian Hunter)
      
         - Slighly improve Intel PT debug logging.  (Adrian Hunter)
      
         - Warn when AUX data has been lost, just like when processing
           PERF_RECORD_LOST.  (Adrian Hunter)
      
         - Further document export-to-postgresql.py script.  (Adrian Hunter)
      
         - Add option to synthesize branch stack from auxtrace data.  (Adrian
           Hunter)
      
        Misc notable changes:
      
         - Switch the default callchain output mode to 'graph,0.5,caller', to
           make it look like the default for other tools, reducing the
           learning curve for people used to 'caller' based viewing.  (Arnaldo
           Carvalho de Melo)
      
         - various call chain usability enhancements.  (Namhyung Kim)
      
         - Introduce the 'P' event modifier, meaning 'max precision level,
           please', i.e.:
      
              $ perf record -e cycles:P usleep 1
      
           Is now similar to:
      
              $ perf record usleep 1
      
           Useful, for instance, when specifying multiple events.  (Jiri Olsa)
      
         - Add 'socket' sort entry, to sort by the processor socket in 'perf
           top' and 'perf report'.  (Kan Liang)
      
         - Introduce --socket-filter to 'perf report', for filtering by
           processor socket.  (Kan Liang)
      
         - Add new "Zoom into Processor Socket" operation in the perf hists
           browser, used in 'perf top' and 'perf report'.  (Kan Liang)
      
         - Allow probing on kmodules without DWARF.  (Masami Hiramatsu)
      
         - Fix 'perf probe -l' for probes added to kernel module functions.
           (Masami Hiramatsu)
      
         - Preparatory work for the 'perf stat record' feature that will allow
           generating perf.data files with counting data in addition to the
           sampling mode we have now (Jiri Olsa)
      
         - Update libtraceevent KVM plugin.  (Paolo Bonzini)
      
         - ... plus lots of other enhancements that I failed to list properly,
           by: Adrian Hunter, Alexander Shishkin, Andi Kleen, Andrzej Hajda,
           Arnaldo Carvalho de Melo, Dima Kogan, Don Zickus, Geliang Tang, He
           Kuang, Huaitong Han, Ingo Molnar, Jan Stancek, Jiri Olsa, Kan
           Liang, Kirill Tkhai, Masami Hiramatsu, Matt Fleming, Namhyung Kim,
           Paolo Bonzini, Peter Zijlstra, Rabin Vincent, Scott Wood, Stephane
           Eranian, Sukadev Bhattiprolu, Taku Izumi, Vaishali Thakkar, Wang
           Nan, Yang Shi and Yunlong Song"
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (260 commits)
        perf unwind: Pass symbol source to libunwind
        tools build: Fix libiberty feature detection
        perf tools: Compile scriptlets to BPF objects when passing '.c' to --event
        perf record: Add clang options for compiling BPF scripts
        perf bpf: Attach eBPF filter to perf event
        perf tools: Make sure fixdep is built before libbpf
        perf script: Enable printing of branch stack
        perf trace: Add cmd string table to decode sys_bpf first arg
        perf bpf: Collect perf_evsel in BPF object files
        perf tools: Load eBPF object into kernel
        perf tools: Create probe points for BPF programs
        perf tools: Enable passing bpf object file to --event
        perf ebpf: Add the libbpf glue
        perf tools: Make perf depend on libbpf
        perf symbols: Fix endless loop in dso__split_kallsyms_for_kcore
        perf tools: Enable pre-event inherit setting by config terms
        perf symbols: we can now read separate debug-info files based on a build ID
        perf symbols: Fix type error when reading a build-id
        perf tools: Search for more options when passing args to -h
        perf stat: Cache aggregated map entries in extra cpumap
        ...
      b02ac6b1
    • Linus Torvalds's avatar
      atomic: remove all traces of READ_ONCE_CTRL() and atomic*_read_ctrl() · 105ff3cb
      Linus Torvalds authored
      This seems to be a mis-reading of how alpha memory ordering works, and
      is not backed up by the alpha architecture manual.  The helper functions
      don't do anything special on any other architectures, and the arguments
      that support them being safe on other architectures also argue that they
      are safe on alpha.
      
      Basically, the "control dependency" is between a previous read and a
      subsequent write that is dependent on the value read.  Even if the
      subsequent write is actually done speculatively, there is no way that
      such a speculative write could be made visible to other cpu's until it
      has been committed, which requires validating the speculation.
      
      Note that most weakely ordered architectures (very much including alpha)
      do not guarantee any ordering relationship between two loads that depend
      on each other on a control dependency:
      
          read A
          if (val == 1)
              read B
      
      because the conditional may be predicted, and the "read B" may be
      speculatively moved up to before reading the value A.  So we require the
      user to insert a smp_rmb() between the two accesses to be correct:
      
          read A;
          if (A == 1)
              smp_rmb()
              read B
      
      Alpha is further special in that it can break that ordering even if the
      *address* of B depends on the read of A, because the cacheline that is
      read later may be stale unless you have a memory barrier in between the
      pointer read and the read of the value behind a pointer:
      
          read ptr
          read offset(ptr)
      
      whereas all other weakly ordered architectures guarantee that the data
      dependency (as opposed to just a control dependency) will order the two
      accesses.  As a result, alpha needs a "smp_read_barrier_depends()" in
      between those two reads for them to be ordered.
      
      The coontrol dependency that "READ_ONCE_CTRL()" and "atomic_read_ctrl()"
      had was a control dependency to a subsequent *write*, however, and
      nobody can finalize such a subsequent write without having actually done
      the read.  And were you to write such a value to a "stale" cacheline
      (the way the unordered reads came to be), that would seem to lose the
      write entirely.
      
      So the things that make alpha able to re-order reads even more
      aggressively than other weak architectures do not seem to be relevant
      for a subsequent write.  Alpha memory ordering may be strange, but
      there's no real indication that it is *that* strange.
      
      Also, the alpha architecture reference manual very explicitly talks
      about the definition of "Dependence Constraints" in section 5.6.1.7,
      where a preceding read dominates a subsequent write.
      
      Such a dependence constraint admittedly does not impose a BEFORE (alpha
      architecture term for globally visible ordering), but it does guarantee
      that there can be no "causal loop".  I don't see how you could avoid
      such a loop if another cpu could see the stored value and then impact
      the value of the first read.  Put another way: the read and the write
      could not be seen as being out of order wrt other cpus.
      
      So I do not see how these "x_ctrl()" functions can currently be necessary.
      
      I may have to eat my words at some point, but in the absense of clear
      proof that alpha actually needs this, or indeed even an explanation of
      how alpha could _possibly_ need it, I do not believe these functions are
      called for.
      
      And if it turns out that alpha really _does_ need a barrier for this
      case, that barrier still should not be "smp_read_barrier_depends()".
      We'd have to make up some new speciality barrier just for alpha, along
      with the documentation for why it really is necessary.
      
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Paul E McKenney <paulmck@us.ibm.com>
      Cc: Dmitry Vyukov <dvyukov@google.com>
      Cc: Will Deacon <will.deacon@arm.com>
      Cc: Ingo Molnar <mingo@kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      105ff3cb
    • Linus Torvalds's avatar
      Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d63a9788
      Linus Torvalds authored
      Pull locking changes from Ingo Molnar:
       "The main changes in this cycle were:
      
         - More gradual enhancements to atomic ops: new atomic*_read_ctrl()
           ops, synchronize atomic_{read,set}() ordering requirements between
           architectures, add atomic_long_t bitops.  (Peter Zijlstra)
      
         - Add _{relaxed|acquire|release}() variants for inc/dec atomics and
           use them in various locking primitives: mutex, rtmutex, mcs, rwsem.
           This enables weakly ordered architectures (such as arm64) to make
           use of more locking related optimizations.  (Davidlohr Bueso)
      
         - Implement atomic[64]_{inc,dec}_relaxed() on ARM.  (Will Deacon)
      
         - Futex kernel data cache footprint micro-optimization.  (Rasmus
           Villemoes)
      
         - pvqspinlock runtime overhead micro-optimization.  (Waiman Long)
      
         - misc smaller fixlets"
      
      * 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        ARM, locking/atomics: Implement _relaxed variants of atomic[64]_{inc,dec}
        locking/rwsem: Use acquire/release semantics
        locking/mcs: Use acquire/release semantics
        locking/rtmutex: Use acquire/release semantics
        locking/mutex: Use acquire/release semantics
        locking/asm-generic: Add _{relaxed|acquire|release}() variants for inc/dec atomics
        atomic: Implement atomic_read_ctrl()
        atomic, arch: Audit atomic_{read,set}()
        atomic: Add atomic_long_t bitops
        futex: Force hot variables into a single cache line
        locking/pvqspinlock: Kick the PV CPU unconditionally when _Q_SLOW_VAL
        locking/osq: Relax atomic semantics
        locking/qrwlock: Rename ->lock to ->wait_lock
        locking/Documentation/lockstat: Fix typo - lokcing -> locking
        locking/atomics, cmpxchg: Privatize the inclusion of asm/cmpxchg.h
      d63a9788
  3. 03 Nov, 2015 13 commits
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 28142286
      Linus Torvalds authored
      Pull RCU changes from Ingo Molnar:
       "The main changes in this cycle were:
      
         - Improvements to expedited grace periods (Paul E McKenney)
      
         - Performance improvements to and locktorture tests for percpu-rwsem
           (Oleg Nesterov, Paul E McKenney)
      
         - Torture-test changes (Paul E McKenney, Davidlohr Bueso)
      
         - Documentation updates (Paul E McKenney)
      
         - Miscellaneous fixes (Paul E McKenney, Boqun Feng, Oleg Nesterov,
           Patrick Marlier)"
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (54 commits)
        fs/writeback, rcu: Don't use list_entry_rcu() for pointer offsetting in bdi_split_work_to_wbs()
        rcu: Better hotplug handling for synchronize_sched_expedited()
        rcu: Enable stall warnings for synchronize_rcu_expedited()
        rcu: Add tasks to expedited stall-warning messages
        rcu: Add online/offline info to expedited stall warning message
        rcu: Consolidate expedited CPU selection
        rcu: Prepare for consolidating expedited CPU selection
        cpu: Remove try_get_online_cpus()
        rcu: Stop excluding CPU hotplug in synchronize_sched_expedited()
        rcu: Stop silencing lockdep false positive for expedited grace periods
        rcu: Switch synchronize_sched_expedited() to IPI
        locktorture: Fix module unwind when bad torture_type specified
        torture: Forgive non-plural arguments
        rcutorture: Fix unused-function warning for torturing_tasks()
        rcutorture: Fix module unwind when bad torture_type specified
        rcu_sync: Cleanup the CONFIG_PROVE_RCU checks
        locking/percpu-rwsem: Clean up the lockdep annotations in percpu_down_read()
        locking/percpu-rwsem: Fix the comments outdated by rcu_sync
        locking/percpu-rwsem: Make use of the rcu_sync infrastructure
        locking/percpu-rwsem: Make percpu_free_rwsem() after kzalloc() safe
        ...
      28142286
    • Linus Torvalds's avatar
      Merge branch 'core-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f5a8160c
      Linus Torvalds authored
      Pull EFI changes from Ingo Molnar:
       "The main changes in this cycle were:
      
         - further EFI code generalization to make it more workable for ARM64
         - various extensions, such as 64-bit framebuffer address support,
           UEFI v2.5 EFI_PROPERTIES_TABLE support
         - code modularization simplifications and cleanups
         - new debugging parameters
         - various fixes and smaller additions"
      
      * 'core-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
        efi: Fix warning of int-to-pointer-cast on x86 32-bit builds
        efi: Use correct type for struct efi_memory_map::phys_map
        x86/efi: Fix kernel panic when CONFIG_DEBUG_VIRTUAL is enabled
        efi: Add "efi_fake_mem" boot option
        x86/efi: Rename print_efi_memmap() to efi_print_memmap()
        efi: Auto-load the efi-pstore module
        efi: Introduce EFI_NX_PE_DATA bit and set it from properties table
        efi: Add support for UEFIv2.5 Properties table
        efi: Add EFI_MEMORY_MORE_RELIABLE support to efi_md_typeattr_format()
        efifb: Add support for 64-bit frame buffer addresses
        efi/arm64: Clean up efi_get_fdt_params() interface
        arm64: Use core efi=debug instead of uefi_debug command line parameter
        efi/x86: Move efi=debug option parsing to core
        drivers/firmware: Make efi/esrt.c driver explicitly non-modular
        efi: Use the generic efi.memmap instead of 'memmap'
        acpi/apei: Use appropriate pgprot_t to map GHES memory
        arm64, acpi/apei: Implement arch_apei_get_mem_attributes()
        arm64/mm: Add PROT_DEVICE_nGnRnE and PROT_NORMAL_WT
        acpi, x86: Implement arch_apei_get_mem_attributes()
        efi, x86: Rearrange efi_mem_attributes()
        ...
      f5a8160c
    • Linus Torvalds's avatar
      Merge branch 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7eeef2ab
      Linus Torvalds authored
      Pull wchan kernel address hiding from Ingo Molnar:
       "This fixes a wchan related information leak in /proc/PID/stat.
      
        There's a bit of an ABI twist to it: instead of setting the wchan
        field to 0 (which is our usual technique) we set it conditionally to a
        0/1 flag to keep ABI compatibility with older procps versions that
        only fetches /proc/PID/wchan (symbolic names) if the absolute wchan
        address is nonzero"
      
      * 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        fs/proc, core/debug: Don't expose absolute kernel addresses via wchan
      7eeef2ab
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 6aa2fdb8
      Linus Torvalds authored
      Pull irq updates from Thomas Gleixner:
       "The irq departement delivers:
      
         - Rework the irqdomain core infrastructure to accomodate ACPI based
           systems.  This is required to support ARM64 without creating
           artificial device tree nodes.
      
         - Sanitize the ACPI based ARM GIC initialization by making use of the
           new firmware independent irqdomain core
      
         - Further improvements to the generic MSI management
      
         - Generalize the irq migration on CPU hotplug
      
         - Improvements to the threaded interrupt infrastructure
      
         - Allow the migration of "chained" low level interrupt handlers
      
         - Allow optional force masking of interrupts in disable_irq[_nosysnc]
      
         - Support for two new interrupt chips - Sigh!
      
         - A larger set of errata fixes for ARM gicv3
      
         - The usual pile of fixes, updates, improvements and cleanups all
           over the place"
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (71 commits)
        Document that IRQ_NONE should be returned when IRQ not actually handled
        PCI/MSI: Allow the MSI domain to be device-specific
        PCI: Add per-device MSI domain hook
        of/irq: Use the msi-map property to provide device-specific MSI domain
        of/irq: Split of_msi_map_rid to reuse msi-map lookup
        irqchip/gic-v3-its: Parse new version of msi-parent property
        PCI/MSI: Use of_msi_get_domain instead of open-coded "msi-parent" parsing
        of/irq: Use of_msi_get_domain instead of open-coded "msi-parent" parsing
        of/irq: Add support code for multi-parent version of "msi-parent"
        irqchip/gic-v3-its: Add handling of PCI requester id.
        PCI/MSI: Add helper function pci_msi_domain_get_msi_rid().
        of/irq: Add new function of_msi_map_rid()
        Docs: dt: Add PCI MSI map bindings
        irqchip/gic-v2m: Add support for multiple MSI frames
        irqchip/gic-v3: Fix translation of LPIs after conversion to irq_fwspec
        irqchip/mxs: Add Alphascale ASM9260 support
        irqchip/mxs: Prepare driver for hardware with different offsets
        irqchip/mxs: Panic if ioremap or domain creation fails
        irqdomain: Documentation updates
        irqdomain/msi: Use fwnode instead of of_node
        ...
      6aa2fdb8
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7b2a4306
      Linus Torvalds authored
      Pull timer updates from Thomas Gleixner:
       "The timer departement provides:
      
         - More y2038 work in the area of ntp and pps.
      
         - Optimization of posix cpu timers
      
         - New time related selftests
      
         - Some new clocksource drivers
      
         - The usual pile of fixes, cleanups and improvements"
      
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (25 commits)
        timeconst: Update path in comment
        timers/x86/hpet: Type adjustments
        clocksource/drivers/armada-370-xp: Implement ARM delay timer
        clocksource/drivers/tango_xtal: Add new timer for Tango SoCs
        clocksource/drivers/imx: Allow timer irq affinity change
        clocksource/drivers/exynos_mct: Use container_of() instead of this_cpu_ptr()
        clocksource/drivers/h8300_*: Remove unneeded memset()s
        clocksource/drivers/sh_cmt: Remove unneeded memset() in sh_cmt_setup()
        clocksource/drivers/em_sti: Remove unneeded memset()s
        clocksource/drivers/mediatek: Use GPT as sched clock source
        clockevents/drivers/mtk: Fix spurious interrupt leading to crash
        posix_cpu_timer: Reduce unnecessary sighand lock contention
        posix_cpu_timer: Convert cputimer->running to bool
        posix_cpu_timer: Check thread timers only when there are active thread timers
        posix_cpu_timer: Optimize fastpath_timer_check()
        timers, kselftest: Add 'adjtick' test to validate adjtimex() tick adjustments
        timers: Use __fls in apply_slack()
        clocksource: Remove return statement from void functions
        net: sfc: avoid using timespec
        ntp/pps: use y2038 safe types in pps_event_time
        ...
      7b2a4306
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 316dde2f
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "In this ARM merge, we remove more lines than we add.  Changes include:
      
         - Enable imprecise aborts early, so that bus errors aren't masked
           until later in the boot.  This has the side effect that boot
           loaders which provoke these aborts can cause the kernel to crash
           early in boot, so we install a handler to report this event around
           the site where these are enabled.
      
         - Remove the buggy but impossible to enable cmpxchg syscall code.
      
         - Add unwinding annotations to some assembly code.
      
         - Add support for atomic half-word exchange for ARMv6k+.
      
         - Reduce ioremap() alignment for SMP/LPAE cases where we don't need
           the large alignment.
      
         - Addition of an "optimal" 3G configuration for systems with 1G of
           RAM.
      
         - Increase vmalloc space by 128M.
      
         - Constify some SMP operations structures, which have never been
           writable.
      
         - Improve ARMs dma_mmap() support for mapping DMA coherent mappings
           into userspace.
      
         - Fix to the NMI backtrace code in the IPI case on ARM where the
           failing CPU gets stuck for 10s waiting for its own IPI to be
           delivered.
      
         - Removal of legacy PM support from the AMBA bus driver.
      
         - Another fix for the previous fix of vdsomunge"
      
      * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (23 commits)
        ARM: 8449/1: fix bug in vdsomunge swab32 macro
        arm: add missing of_node_put
        ARM: 8447/1: catch pending imprecise abort on unmask
        ARM: 8446/1: amba: Remove unused callbacks for legacy system PM
        ARM: 8443/1: Adding support for atomic half word exchange
        ARM: clean up TWD after previous patch
        ARM: 8441/2: twd: Don't set CLOCK_EVT_FEAT_C3STOP unconditionally
        ARM: 8440/1: remove obsolete documentation
        ARM: make highpte an expert option
        ARM: 8433/1: add a VMSPLIT_3G_OPT config option
        ARM: 8439/1: Fix backtrace generation when IPI is masked
        ARM: 8428/1: kgdb: Fix registers on sleeping tasks
        ARM: 8427/1: dma-mapping: add support for offset parameter in dma_mmap()
        ARM: 8426/1: dma-mapping: add missing range check in dma_mmap()
        ARM: remove user cmpxchg syscall
        ARM: 8438/1: Add unwinding to __clear_user_std()
        ARM: 8436/1: hw_breakpoint: remove unnecessary header
        ARM: 8434/2: Revert "7655/1: smp_twd: make twd_local_timer_of_register() no-op for nosmp"
        ARM: 8432/1: move VMALLOC_END from 0xff000000 to 0xff800000
        ARM: 8430/1: use default ioremap alignment for SMP or LPAE
        ...
      316dde2f
    • Linus Torvalds's avatar
      Merge tag 'arc-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · 2c2b8285
      Linus Torvalds authored
      Pull ARC updates from Vineet Gupta:
      
       - Support for new MM features in ARCv2 cores (THP, PAE40) Some generic
         THP bits are touched - all ACKed by Kirill
      
       - Platform framework updates to prepare for EZChip arrival (still in works)
      
       - ARC Public Mailing list setup finally (linux-snps-arc@lists.infraded.org)
      
      * tag 'arc-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: (42 commits)
        ARC: mm: PAE40 support
        ARC: mm: PAE40: tlbex.S: Explicitify the size of pte_t
        ARC: mm: PAE40: switch to using phys_addr_t for physical addresses
        ARC: mm: HIGHMEM: populate high memory from DT
        ARC: mm: HIGHMEM: kmap API implementation
        ARC: mm: preps ahead of HIGHMEM support #2
        ARC: mm: preps ahead of HIGHMEM support
        ARC: mm: use generic macros _BITUL()/_AC()
        ARC: mm: Improve Duplicate PD Fault handler
        MAINTAINERS: Add public mailing list for ARC
        ARC: Ensure DT mem base is same as what kernel is built with
        ARC: boot: Non Master cpus only need to call EARLY_CPU_SETUP once
        ARCv2: smp: [plat-*]: No need to explicitly call mcip_init_smp()
        ARC: smp: Introduce smp hook @init_irq_cpu called for all cores
        ARC: smp: Rename platform hook @init_smp -> @init_cpu_smp
        ARCv2: smp: [plat-*]: No need to explicitly call mcip_init_early_smp()
        ARC: smp: Introduce smp hook @init_early_smp for Master core
        ARC: remove @init_time, @init_irq platform callbacks
        ARC: smp: irqchip: handle IPI as percpu irq like timer
        ARC: boot: Support Halt-on-reset and Run-on-reset SMP booting modes
        ...
      2c2b8285
    • Linus Torvalds's avatar
      Merge tag 'cris-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris · 0921f1ef
      Linus Torvalds authored
      Pull CRIS changes from Jesper Nilsson:
       "Mostly another batch of code removal due to move to standard
        frameworks for CRISv32, initial devicetree configuration for a couple
        of boards, and some small fixes for kgdb and time handling"
      
      * tag 'cris-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
        cris: Drop reference to get_cmos_time()
        CRIS: Drop code related to obsolete or unused kconfigs
        cris: time: Cleanup of persistent clock stuff
        cris: re-use helpers to dump data in hex format
        CRIS v32: remove old GPIO and LEDs code
        CRIS v32: remove I2C bitbanging driver
        CRIS v32: add ARTPEC-3 and P1343 device trees
        CRIS v32: dev88: add GPIO, LEDs, RTC, temp sensor
        CRIS: add dt-bindings symlink
        CRIS v32: increase NR_IRQS
        cris: arch-v10: kgdb: Add '__used' for static variable is_dyn_brkp
        cris: arch-v10: kgdb: Use BAR instead of DTP0 for register P12
        cris: kgdb: use native hex2bin
      0921f1ef
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32 · 15f93405
      Linus Torvalds authored
      Pull avr32 update from Hans-Christian Noren Egtvedt.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
        avr32: atngw100: remove useless include
      15f93405
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · df91fba5
      Linus Torvalds authored
      Pull m68k update from Geert Uytterhoeven.
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k/sun3: Use %pM format specifier to print ethernet address
      df91fba5
    • Linus Torvalds's avatar
      Merge tag 'leds_for_4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds · e8a2a176
      Linus Torvalds authored
      Pull LED updates from Jacek Anaszewski:
      
       - Move the out-of-LED-tree led-sead3 driver to the LED subsystem.
      
       - Add 'invert' sysfs attribute to the heartbeat trigger.
      
       - Add Device Tree support to the leds-netxbig driver and add related DT
         nodes to the kirkwood-netxbig.dtsi and kirkwood-net5big.dts files.
         Remove static LED setup from the related board files.
      
       - Remove redundant brightness conversion operation from leds-netxbig.
      
       - Improve leds-bcm6328 driver: improve default-state handling, add more
         init configuration options, print invalid LED instead of warning only
         about maximum LED value.
      
       - Add a shutdown function for setting gpio-leds into off state when
         shutting down.
      
       - Fix DT flash timeout property naming in leds-aat1290.txt.
      
       - Switch to using devm prefixed version of led_classdev_register()
         (leds-cobalt-qube, leds-hp6xx, leds-ot200, leds-ipaq-micro,
         leds-netxbig, leds-locomo, leds-menf21bmc, leds-net48xx, leds-wrap).
      
       - Add missing of_node_put (leds-powernv, leds-bcm6358, leds-bcm6328,
         leds-88pm860x).
      
       - Coding style fixes and cleanups: led-class/led-core, leds-ipaq-micro.
      
      * tag 'leds_for_4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds: (27 commits)
        leds: 88pm860x: add missing of_node_put
        leds: bcm6328: add missing of_node_put
        leds: bcm6358: add missing of_node_put
        powerpc/powernv: add missing of_node_put
        leds: leds-wrap.c: Use devm_led_classdev_register
        leds: aat1290: Fix property naming of flash-timeout-us
        leds: leds-net48xx: Use devm_led_classdev_register
        leds: leds-menf21bmc.c: Use devm_led_class_register
        leds: leds-locomo.c: Use devm_led_classdev_register
        leds: leds-gpio: add shutdown function
        Documentation: leds: update DT bindings for leds-bcm6328
        leds-bcm6328: add more init configuration options
        leds-bcm6328: simplify and improve default-state handling
        leds-bcm6328: print invalid LED
        leds: netxbig: set led_classdev max_brightness
        leds: netxbig: convert to use the devm_ functions
        ARM: mvebu: remove static LED setup for netxbig boards
        ARM: Kirkwood: add LED DT entries for netxbig boards
        leds: netxbig: add device tree binding
        leds: triggers: add invert to heartbeat
        ...
      e8a2a176
    • Sergei Shtylyov's avatar
      sh_eth: use DMA barriers · f32bfb9a
      Sergei Shtylyov authored
      Commit  7d7355f5 ("sh_eth: Ensure proper ordering of descriptor active
      bit write/read") did the right thing  but used too "heavy" barriers while
      there were already "lighter" DMA barriers exactly  for this case...
      Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f32bfb9a
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 73186df8
      David S. Miller authored
      Minor overlapping changes in net/ipv4/ipmr.c, in 'net' we were
      fixing the "BH-ness" of the counter bumps whilst in 'net-next'
      the functions were modified to take an explicit 'net' parameter.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      73186df8